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

improved scss variables

Browse Source
This commit is contained in:
TMMeilleur
2013-11-06 15:41:00 +02:00
parent fcb225ac5a
commit 211c36c7a3
63 changed files with 1073 additions and 1241 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default-bootstrap/sass/modules/blockcart/blockcart.scss
+17 -17
View File
@@ -20,7 +20,7 @@
&:before {
display:inline-block;
content:"";
font-family:"FontAwesome";
font-family:$font-icon;
font-size:18px;
line-height:18px;
}
@@ -127,7 +127,7 @@
height: auto;
width: 270px;
background:#484848;
color:#fff;
color:$light-text-color;
@media (min-width: $screen-xs) and (max-width: $screen-xs-max) { // min 480px max 767px
top:69px;
}
@@ -138,7 +138,7 @@
}
a {
color:#fff;
color:$light-text-color;
&:hover {color:#9c9b9b;}
}
@@ -146,7 +146,7 @@
#cart_block_list {
.remove_link a, .ajax_cart_block_remove_link {
color:#fff;
color:$light-text-color;
outline:none;
text-decoration:none;
@@ -155,7 +155,7 @@
}
.price {
color:#fff;
color:$light-text-color;
}
dt {
@@ -173,7 +173,7 @@
a {
color:#9c9b9b;
&:hover {color:#fff;}
&:hover {color:$light-text-color;}
}
}
@@ -183,7 +183,7 @@
}
#cart-buttons {
background:url(../../../img/cart-shadow.png) repeat-x #333333;
background:url(../../../img/cart-shadow.png) repeat-x $dark-background;
}
}
}
@@ -239,7 +239,7 @@
margin-left:-160px;
}
#layer_cart {
background-color:#fff;
background-color:$light-background;
position:absolute;
display:none;
z-index:99;
@@ -254,7 +254,7 @@
position:static;
h2 {
font:400 23px/29px Arial, Helvetica, sans-serif;
font:400 23px/29px $font-famaly;
color:#46a74e;
margin-bottom:22px;
padding-right:100px;
@@ -323,8 +323,8 @@
}
h2 {
font:400 23px/29px Arial, Helvetica, sans-serif;
color:#333;
font:400 23px/29px $font-famaly;
color:$base-text-color;
border-bottom:1px solid $base-border-color;
padding-bottom:13px;
margin-bottom:17px;
@@ -363,13 +363,13 @@
width:25px;
height:25px;
cursor:pointer;
color:#333;
color:$base-text-color;
z-index:2;
&:before {
content:"";
display:block;
font-family:"FontAwesome";
font-family:$font-icon;
font-size:25px;
line-height:25px;
}
@@ -397,8 +397,8 @@
}
h2 {
font:400 23px/26px Arial, Helvetica, sans-serif;
color:#333333;
font:400 23px/26px $font-famaly;
color:$base-text-color;
margin-bottom:25px;
}
@@ -435,12 +435,12 @@
a.bx-prev, a.bx-next {
display:block;
font-family:"FontAwesome";
font-family:$font-icon;
font-size:20px;
line-height:20px;
width:20px;
height:20px;
color:#333;
color:$base-text-color;
text-indent:-5000px;
position:absolute;
top:45%;
themes/default-bootstrap/sass/modules/blockcontact/blockcontact.scss
+3 -2
View File
@@ -1,3 +1,4 @@
@import '../../_theme_variables';
/* block CONTACT ******************************************************************************* */
#contact_block {
@@ -11,8 +12,8 @@
p {margin-bottom:4px;}
p.tel {
font:400 17px/21px Arial, Helvetica, sans-serif;
color:#fff;
font:400 17px/21px $font-famaly;
color:$light-text-color;
margin-bottom:6px;
i {
themes/default-bootstrap/sass/modules/blocklayered/blocklayered-15.scss
+9 -9
View File
@@ -5,7 +5,7 @@
margin-bottom:16px;
span.layered_subtitle {
color:#fff;
color:$light-text-color;
display:block;
padding-bottom:11px;
}
@@ -17,7 +17,7 @@
position:relative;
&:hover, &:hover a {
color:#fff;
color:$light-text-color;
}
a {
@@ -32,7 +32,7 @@
&:before {
content:"";
display:block;
font-family:"FontAwesome";
font-family:$font-icon;
width:12px;
height:12px;
@@ -49,7 +49,7 @@
margin-bottom:8px;
font-weight:bold;
position:relative;
color:#333333;
color:$base-text-color;
.layered_close {
position:absolute;
@@ -77,7 +77,7 @@
position:absolute;
top:0px;
left:0;
font-family:'FontAwesome';
font-family:$font-icon;
vertical-align:1px;
}
@@ -119,7 +119,7 @@
a {
font-weight:normal;
&:hover {color:#333;}
&:hover {color:$base-text-color;}
}
}
}
@@ -183,15 +183,15 @@
Range Slider Styles
***************************************************************************************/
.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
background:#fbfbfb;
border-color:#d6d4d4;
background:$base-box-bg;
border-color:$base-border-color;
@include border-radius(0px);
width:15px;
height:15px;
&.ui-state-hover {
background:#555454;
border-color:#333;
border-color:$dark-border-color;
}
}
.ui-slider .ui-slider-range {
themes/default-bootstrap/sass/modules/blocknewsletter/blocknewsletter.scss
+3 -3
View File
@@ -64,7 +64,7 @@
max-width:267px;
background:#3c3c3c;
border-color:#515151;
color:#fff;
color:$light-text-color;
padding:5px 43px 5px 12px;
display:inline-block;
@@ -82,13 +82,13 @@
&:before {
content:"";
font-family:'FontAwesome';
font-family:$font-icon;
font-size:28px;
line-height:28px;
}
&:hover {
color:#fff !important;
color:$light-text-color !important;
}
span{display:none;}
themes/default-bootstrap/sass/modules/blocksearch/blocksearch.scss
+8 -8
View File
@@ -22,10 +22,10 @@
}
.btn.button-search {
background:#333;
background:$dark-background;
float: left;
border:none;
color:#fff;
color:$light-text-color;
width:57px;
text-align:center;
padding:10px 0 11px 0;
@@ -35,7 +35,7 @@
&:before {
content:"";
display:block;
font-family:"FontAwesome";
font-family:$font-icon;
font-size:17px;
}
@@ -46,7 +46,7 @@
padding:0 13px;
height:45px;
width:271px;
background:#fbfbfb;
background:$base-box-bg;
float: left;
margin-right:1px;
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px
@@ -61,7 +61,7 @@
}
}
.ac_results {
background:#fff;
background:$light-background;
border:1px solid $base-border-color;
width:271px;
margin-top:-1px;
@@ -74,18 +74,18 @@
line-height:22px;
&.ac_odd {
background:#fff;
background:$light-background;
}
&:hover, &.ac_over {
background:#fbfbfb;
background:$base-box-bg;
}
}
}
form#searchbox {
label{
color:#333;
color:$base-text-color;
margin-bottom:1px
}
themes/default-bootstrap/sass/modules/blocktags/blocktags.scss
+1 -1
View File
@@ -15,7 +15,7 @@
margin:0 3px 3px 0;
&:hover {
color:#333;
color:$base-text-color;
background:#f6f6f6;
}
}
themes/default-bootstrap/sass/modules/blocktopmenu/css/superfish-modified.scss
+7 -7
View File
@@ -27,7 +27,7 @@
position: absolute;
top: -999em;
width: 10em; /* left offset of submenus need to match (see below) */
background: #fff;
background: $light-background;
}
.sf-menu ul li {
width: 100%;
@@ -40,11 +40,11 @@
}
.sf-menu > li {
float: left;
border-right: 1px solid #d6d4d4;
border-right: 1px solid $base-border-color;
margin-bottom: -3px;
> a {
font: 600 18px/22px 'Open Sans', sans-serif;
font: 600 18px/22px $font-custom;
text-transform: uppercase;
color: #484848;
display: block;
@@ -53,9 +53,9 @@
}
&.sfHover > a, > a:hover, &.sfHoverForce > a {
background: #333;
background: $dark-background;
border-bottom-color: #666666;
color: #fff;
color: $light-text-color;
}
}
.sf-menu li li a {
@@ -70,12 +70,12 @@
&:before {
content: "";
display: inline-block;
font-family: "FontAwesome";
font-family: $font-icon;
padding-right: 10px;
}
&:hover {
color: #333;
color: $base-text-color;
}
}
.sf-menu li ul {
themes/default-bootstrap/sass/modules/blockuserinfo/blockuserinfo.scss
+6 -6
View File
@@ -22,7 +22,7 @@
a {
padding:7px 10px 14px 16px;
background:#333333;
background:$dark-background;
min-width: 270px;
display:block;
font-weight:bold;
@@ -39,24 +39,24 @@
}
b {
color:#fff;
font:600 18px/22px 'Open Sans', sans-serif;
color:$light-text-color;
font:600 18px/22px $font-custom;
padding-right:5px;
}
&:before {
content:"";
font-family:"FontAwesome";
font-family:$font-icon;
display:inline-block;
font-size:23px;
line-height:23px;
color:#fff;
color:$light-text-color;
padding-right:15px;
}
&:after {
content:"";
font-family:"FontAwesome";
font-family:$font-icon;
display:inline-block;
float:right;
font-size:18px;
themes/default-bootstrap/sass/modules/blockwishlist/blockwishlist.scss
+3 -3
View File
@@ -7,8 +7,8 @@
&:before{
content:"";
font-family:FontAwesome;
color:#fff;
font-family:$font-icon;
color:$light-text-color;
font-size:15px;
line-height:31px;
border-radius:50px;
@@ -129,7 +129,7 @@
a {
display:inline-block;
color: #333;
color: $base-text-color;
margin:10px 10px 10px 0px;
font-weight:bold;
themes/default-bootstrap/sass/modules/carriercompare/style.scss
+3 -2
View File
@@ -1,3 +1,4 @@
@import '../../_theme_variables';
#compare_shipping {
.form-group {
@@ -17,14 +18,14 @@
}
.table {
background:#fff;
background:$light-background;
thead {
tr {
th {
background:#fff;
background:$light-background;
padding:4px 10px 3px 10px;
}
}
themes/default-bootstrap/sass/modules/favoriteproducts/favoriteproducts.scss
+7 -5
View File
@@ -1,13 +1,15 @@
@import '../../_theme_variables';
#favoriteproducts_block_account .favoriteproduct {
position:relative;
margin-bottom: 14px;
padding: 12px 8px;
border: 1px solid #eee;
border-radius: 3px 3px 3px 3px;
margin-bottom: 14px;
padding: 12px 8px;
border: 1px solid $base-border-color;
border-radius: 3px 3px 3px 3px;
}
.favoriteproduct a.product_img_link {
border: 1px solid #CCCCCC;
border: 1px solid $base-border-color;
display: block;
float: left;
margin-right: 14px;
themes/default-bootstrap/sass/modules/homeslider/bx_styles.scss
+10 -9
View File
@@ -1,3 +1,4 @@
@import '../../_theme_variables';
/**
* BxSlider v4.0 - Fully loaded, responsive content slider
* http://bxslider.com
@@ -68,7 +69,7 @@
.bx-wrapper .bx-loading {
min-height: 50px;
background: url(images/bx_loader.gif) center center no-repeat #fff;
background: url(images/bx_loader.gif) center center no-repeat $light-background;
height: 100%;
width: 100%;
position: absolute;
@@ -82,7 +83,7 @@
.bx-wrapper .bx-pager {
text-align: center;
font-size: .85em;
font-family: Arial;
font-family: $font-famaly;
font-weight: bold;
color: #666;
padding-top: 20px;
@@ -139,13 +140,13 @@
height: 52px;
text-indent: -9999px;
z-index: 9999;
border:2px solid #fff;
border:2px solid $light-border-color;
&:before {
height:48px;
width:48px;
display:block;
background:#fff;
background:$light-background;
content:".";
opacity:0.14;
text-indent:-9999px;
@@ -159,11 +160,11 @@
display:block;
width:48px;
height:48px;
color:#fff;
color:$light-text-color;
text-indent:0;
text-align:center;
font-size:21px;
font-family:"FontAwesome";
font-family:$font-icon;
position:absolute;
top:0;
left:0;
@@ -174,7 +175,7 @@
&:hover {
&:before {
background:#333;
background:$dark-background;
opacity:0.83;
}
}
@@ -244,8 +245,8 @@
}
.bx-wrapper .bx-caption span {
color: #fff;
font-family: Arial;
color: $light-text-color;
font-family: $font-famaly;
display: block;
font-size: .85em;
padding: 10px;
themes/default-bootstrap/sass/modules/productcomments/productcomments.scss
+15 -15
View File
@@ -4,8 +4,8 @@
padding:8px 10px 10px;
font-weight: bold;
line-height:18px;
border:1px solid #d6d4d4;
background:#fbfbfb;
border:1px solid $base-border-color;
background:$base-box-bg;
margin:39px 0 22px
}
.comments_advices {
@@ -42,7 +42,7 @@ padding-top:2px;
-webkit-border-radius:50px;
color: white;
display: inline-block;
font-family: FontAwesome;
font-family: $font-icon;
font-size: 15px;
font-weight: normal;
height: 30px;
@@ -61,9 +61,9 @@ padding-top:2px;
}
a.reviews:before{content:""}
a.open-comment-form:before{content:""}
a:hover {color:#333}
a:hover {color:$base-text-color}
a.reviews{
border-right:1px solid #d6d4d4;
border-right:1px solid $base-border-color;
padding-right:30px;
margin-right:9px;
@@ -80,7 +80,7 @@ padding-top:2px;
#product_comments_block_extra{
.comments_note {margin-bottom:5px}
.comments_note span,
.star_content {float:left;color:#333}
.star_content {float:left;color:$base-text-color}
.star_content {margin-top:1px}
div.star {background: url(img/star.png) no-repeat 0 0}
div.star_on {background: url(img/star.png) no-repeat 0 -13px}
@@ -103,7 +103,7 @@ padding-top:2px;
#new_comment_form {
width:465px;
overflow:hidden;
color: #333;
color: $base-text-color;
text-align: left;
/*max 767px*/
@@ -115,9 +115,9 @@ padding-top:2px;
.title {
padding:10px;
font-size: 13px;
color: #fff;
color: $light-text-color;
text-transform: uppercase;
background: #333
background: $dark-background
}
ul.grade_content {list-style-type:none}
@@ -128,7 +128,7 @@ padding-top:2px;
}
.product .product_desc {
line-height:18px;
color:#666
color:$description-color;
}
.product .product_desc .product_name {
padding:10px 0 5px;
@@ -161,7 +161,7 @@ padding-top:2px;
height: 28px;
width: 100%;
border: 1px solid #ccc;
background: #fff;
background: $light-background;
}
textarea {
height: 80px;
@@ -204,7 +204,7 @@ padding-top:2px;
div.comment {
margin:0 0 14px;
padding-top:14px;
border-top: 1px solid #d6d4d4;
border-top: 1px solid $base-border-color;
}
div.comment:first-child{padding:0;border:none}
@@ -225,7 +225,7 @@ padding-top:2px;
div.star_on {background-position: 0 -13px}
.comment_author_infos {clear:both;
padding-top:9px;
strong{display:block;color:#333}
strong{display:block;color:$base-text-color}
em {color:#adadad}
}
@@ -248,9 +248,9 @@ padding-top:2px;
div.comment_details li {
padding:2px 0 2px;
&:before{
font-family:$font1;
font-family:$font-icon;
content:"";
color:#333;
color:$base-text-color;
margin-right:8px
}