dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[*] FO : Move header modules to new hook, first part 1/2

Browse Source
This commit is contained in:
gRoussac
2013-12-10 20:52:22 +01:00
parent 78df7f52f4
commit 1dcc5e288c
41 changed files with 306 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default-bootstrap/sass/global.scss
+8 -7
View File
@@ -1648,6 +1648,8 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
.header-row {
background:$dark-background;
.container {background:none; position:relative; z-index:1;}
.shop-phone {
display:block;
@@ -1665,9 +1667,12 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
strong {color:$light-text-color;}
}
.header-row nav {
float: right; }
#header_user_info {
float:right;
.header_user_info {
float:left;
border-left:1px solid #515151;
border-right:1px solid #515151;
@media (max-width: $screen-xs - 1) { // max 479px
@@ -1685,7 +1690,6 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
}
}
}
.header-row-2 { position:relative; z-index:1;}
#header_logo {
position: absolute;
left:0;
@@ -1707,9 +1711,6 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
top:20px;
}
}
#header_right {
position:relative;
}
/* languages/currencies */
#currencies-block-top, #languages-block-top {
float:right;
@@ -1803,7 +1804,7 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
}
}
}
#contact-link a, .header-row #header_user_info a, #currencies-block-top div.current, #languages-block-top div.current {
#contact-link a, .header-row .header_user_info a, #currencies-block-top div.current, #languages-block-top div.current {
cursor:pointer;
&:hover, &.active {
themes/default-bootstrap/sass/modules/blockuserinfo/blockuserinfo.scss
+60 -62
View File
@@ -1,71 +1,69 @@
@import '../../_theme_variables';
/* block top user information */
#header_right {
#header_user {
#header_user {
clear:both;
float: right;
margin-top:50px;
@media (min-width: $screen-xs) and (max-width: $screen-xs-max) { // min 480px max 767px
margin-top:25px;
}
@media (max-width: $screen-xs - 1) { // max 479px
float: none;
margin-left: auto;
margin-right: auto;
margin-top: 95px;
width: 270px;
}
#shopping_cart {
clear:both;
float: right;
margin-top:50px;
@media (min-width: $screen-xs) and (max-width: $screen-xs-max) { // min 480px max 767px
margin-top:25px;
}
@media (max-width: $screen-xs - 1) { // max 479px
float: none;
margin-left: auto;
margin-right: auto;
margin-top: 95px;
width: 270px;
}
#shopping_cart {
a {
padding:7px 10px 14px 16px;
background:$dark-background;
width: 270px;
display:block;
font-weight:bold;
color:#777777;
text-shadow:1px 1px rgba(0,0,0,0.2);
overflow:hidden;
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px
width:190px;
}
span.ajax_cart_product_txt, span.ajax_cart_product_txt_s {
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px
display:none !important;
}
}
b {
color:$light-text-color;
font:600 18px/22px $font-custom;
padding-right:5px;
}
&:before {
content:"";
font-family:$font-icon;
display:inline-block;
font-size:23px;
line-height:23px;
color:$light-text-color;
padding-right:15px;
}
&:after {
content:"";
font-family:$font-icon;
display:inline-block;
float:right;
font-size:18px;
color:#686666;
padding:6px 0 0 0;
}
a {
padding:7px 10px 14px 16px;
background:$dark-background;
width: 270px;
display:block;
font-weight:bold;
color:#777777;
text-shadow:1px 1px rgba(0,0,0,0.2);
overflow:hidden;
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px
width:190px;
}
span.ajax_cart_product_txt, span.ajax_cart_product_txt_s {
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px
display:none !important;
}
}
.ajax_cart_total { display:none !important; }
b {
color:$light-text-color;
font:600 18px/22px $font-custom;
padding-right:5px;
}
&:before {
content:"";
font-family:$font-icon;
display:inline-block;
font-size:23px;
line-height:23px;
color:$light-text-color;
padding-right:15px;
}
&:after {
content:"";
font-family:$font-icon;
display:inline-block;
float:right;
font-size:18px;
color:#686666;
padding:6px 0 0 0;
}
}
.ajax_cart_total { display:none !important; }
}
}