antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket-14698-sensefuel' into develop

Browse Source
This commit is contained in:
Michael RICOIS 2017-11-23 11:44:04 +01:00
commit 3d2feabfca
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/sensefuel/sensefuel.php
View File

@ -46,17 +46,17 @@ class SenseFuel extends Module
if (null !== $site_version &&
null !== $page_name &&
in_array($site_version, self::$ACTIVE_VERSION_ARRAY, true) &&
in_array($page_name, array('index', 'category', 'product'), true)
in_array($site_version, self::$ACTIVE_VERSION_ARRAY, true) /*&&
in_array($page_name, array('index', 'category', 'product'), true)*/
) {
return self::display(__FILE__, 'views/top-sensefuel.tpl');
}
if (null !== $site_version &&
null !== $page_name &&
in_array($site_version, self::$SETUP_VERSION_ARRAY, true) &&
in_array($site_version, self::$SETUP_VERSION_ARRAY, true) /*&&
in_array($page_name, array('index', 'category', 'product'), true) &&
Tools::isConnectedToBackOffice()
Tools::isConnectedToBackOffice()*/
) {
return self::display(__FILE__, 'views/top-sensefuel.tpl');
}
@ -72,17 +72,17 @@ class SenseFuel extends Module
global $site_version, $page_name;
if (null !== $site_version &&
null !== $page_name &&
in_array($site_version, self::$ACTIVE_VERSION_ARRAY , true) &&
in_array($page_name, array('index', 'category', 'product'), true)
in_array($site_version, self::$ACTIVE_VERSION_ARRAY , true) /*&&
in_array($page_name, array('index', 'category', 'product'), true)*/
) {
return self::display(__FILE__, 'views/top-sensefuel.tpl');
}
if (null !== $site_version &&
null !== $page_name &&
in_array($site_version, self::$SETUP_VERSION_ARRAY , true) &&
in_array($site_version, self::$SETUP_VERSION_ARRAY , true) /*&&
in_array($page_name, array('index', 'category', 'product'), true) &&
Tools::isConnectedToBackOffice()
Tools::isConnectedToBackOffice()*/
) {
return self::display(__FILE__, 'views/top-sensefuel.tpl');
}

10
themes/site/css/style.css
View File

@ -1759,7 +1759,7 @@ body#page-404 .footer_links {
box-shadow: 0px 4px 4px #bfbcb4;
}
#header > .content > .top {
clear: both;
/*clear: both;*/
background: #fff;
}
#header > .content > .top .block ul li {
@ -1792,7 +1792,7 @@ body#page-404 .footer_links {
#header > .content > .top > .content .logo_block {
float: left;
height: 70px;
/*margin: 5px 0;*/
margin: 5px 0;
}
.content_menu {
background: #fff;
@ -5548,6 +5548,8 @@ body.logged #header_user {
font-family: tahoma,arial,sans-serif;
float: right;
padding-left: 25px;
position: relative;
z-index: 10000;
}
.help_contact a { color: #6e6e6e;}
#login_form_top {
@ -5676,7 +5678,7 @@ body.nav_active #header_nav .inner a.submenu_top_btn { z-index: 2;}
cursor: pointer;
height: 32px;
line-height: 32px;
margin-top: 24px;
margin-top: 10px;
padding-top: 6px;
padding-bottom: 5px;
padding-left: 45px;
@ -7584,7 +7586,7 @@ div.addresses ul.address.item {
font-family: 'Source Sans Pro', Helvetica, Arial, sans-serif;
}
#sensefuel .search .search_form {
padding-top: 32px;
padding-top: 18px;
}
#sensefuel .search .search_form .search_input {
display: block;