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

// css fixs

Browse Source
This commit is contained in:
Kevin Granger committed 2013-12-11 12:18:18 +01:00
1 parent 0af76e01fb
commit 8f71f36be9
10 files changed
+69 -3364
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

themes/default-bootstrap/css/global.css
+21 -21
View File
@@ -3856,7 +3856,7 @@ p.info-account {
text-shadow: 1px 1px rgba(0, 0, 0, 0.1); } text-shadow: 1px 1px rgba(0, 0, 0, 0.1); }
.alert.alert-success:before { .alert.alert-success:before {
font-family: "FontAwesome"; font-family: "FontAwesome";
content: ""; content: "\f058";
font-size: 20px; font-size: 20px;
vertical-align: -2px; vertical-align: -2px;
padding-right: 7px; } padding-right: 7px; }
@@ -3864,7 +3864,7 @@ p.info-account {
text-shadow: 1px 1px rgba(0, 0, 0, 0.1); } text-shadow: 1px 1px rgba(0, 0, 0, 0.1); }
.alert.alert-danger:before { .alert.alert-danger:before {
font-family: "FontAwesome"; font-family: "FontAwesome";
content: ""; content: "\f057";
font-size: 20px; font-size: 20px;
vertical-align: -2px; vertical-align: -2px;
padding-right: 7px; padding-right: 7px;
@@ -4744,7 +4744,7 @@ table.table_block td {
font-family: "FontAwesome"; font-family: "FontAwesome";
font-size: 14px; } font-size: 14px; }
#categories_block_left li span.grower.OPEN:before, #categories_block_left li span.grower.CLOSE:before { #categories_block_left li span.grower.OPEN:before, #categories_block_left li span.grower.CLOSE:before {
content: ""; content: "\f068";
display: block; display: block;
vertical-align: middle; vertical-align: middle;
width: 30px; width: 30px;
@@ -4753,7 +4753,7 @@ table.table_block td {
line-height: 30px; line-height: 30px;
text-align: center; } text-align: center; }
#categories_block_left li span.grower.CLOSE:before { #categories_block_left li span.grower.CLOSE:before {
content: ""; content: "\f067";
color: silver; } color: silver; }
#categories_block_left li span.grower:hover + a, #categories_block_left li span.grower:hover + a,
#categories_block_left li a:hover, #categories_block_left li a:hover,
@@ -4763,7 +4763,7 @@ table.table_block td {
font-weight: normal; font-weight: normal;
color: #777777; } color: #777777; }
#categories_block_left li li a:before { #categories_block_left li li a:before {
content: ""; content: "\f105";
font-family: "FontAwesome"; font-family: "FontAwesome";
line-height: 29px; line-height: 29px;
padding-right: 8px; } padding-right: 8px; }
@@ -5294,8 +5294,11 @@ div.star a:hover {
position: relative; position: relative;
background: white; } background: white; }
#header .header-row { #header .header-row {
background: #333333; } position: relative; }
#header .header-row.container {background:none; position:relative; z-index:1;} #header .header-row:first-child {
background-color: #333333; }
#header .header-row .container {
position: relative; }
#header .header-row .shop-phone { #header .header-row .shop-phone {
display: block; display: block;
padding: 5px 0 10px; } padding: 5px 0 10px; }
@@ -5327,9 +5330,6 @@ div.star a:hover {
@media (max-width: 479px) { @media (max-width: 479px) {
#header .header-row .header_user_info a { #header .header-row .header_user_info a {
font-size: 11px; } } font-size: 11px; } }
#header .header-row-2 {
position: relative;
z-index: 1; }
#header #header_logo { #header #header_logo {
position: absolute; position: absolute;
left: 0; left: 0;
@@ -5379,7 +5379,7 @@ div.star a:hover {
color: #777777; } color: #777777; }
#header #currencies-block-top div.current:after, #header #currencies-block-top div.current:after,
#header #languages-block-top div.current:after { #header #languages-block-top div.current:after {
content: ""; content: "\f0d7";
font-family: "FontAwesome"; font-family: "FontAwesome";
font-size: 18px; font-size: 18px;
line-height: 18px; line-height: 18px;
@@ -5560,13 +5560,13 @@ div.star a:hover {
padding-bottom: 13px; } padding-bottom: 13px; }
.footer-container #footer h4:after { .footer-container #footer h4:after {
display: block; display: block;
content: ""; content: "\f055";
font-family: "FontAwesome"; font-family: "FontAwesome";
position: absolute; position: absolute;
right: 0; right: 0;
top: 1px; } top: 1px; }
.footer-container #footer h4.active:after { .footer-container #footer h4.active:after {
content: ""; } } content: "\f056"; } }
.footer-container #footer h4 a { .footer-container #footer h4 a {
color: white; } color: white; }
.footer-container #footer ul li { .footer-container #footer ul li {
@@ -5632,11 +5632,11 @@ div.star a:hover {
.footer-container #footer #social_block ul li a:hover { .footer-container #footer #social_block ul li a:hover {
color: white; } color: white; }
.footer-container #footer #social_block ul li.facebook a:before { .footer-container #footer #social_block ul li.facebook a:before {
content: ""; } content: "\f09a"; }
.footer-container #footer #social_block ul li.twitter a:before { .footer-container #footer #social_block ul li.twitter a:before {
content: ""; } content: "\f099"; }
.footer-container #footer #social_block ul li.rss a:before { .footer-container #footer #social_block ul li.rss a:before {
content: ""; } content: "\f09e"; }
.footer-container #footer #social_block h4 { .footer-container #footer #social_block h4 {
float: right; float: right;
margin-bottom: 0; margin-bottom: 0;
@@ -6039,7 +6039,7 @@ p.payment_module {
background: url(../img/cheque.png) 15px 15px no-repeat #fbfbfb; } background: url(../img/cheque.png) 15px 15px no-repeat #fbfbfb; }
p.payment_module a.cheque:after, p.payment_module a.bankwire:after { p.payment_module a.cheque:after, p.payment_module a.bankwire:after {
display: block; display: block;
content: ""; content: "\f054";
position: absolute; position: absolute;
right: 0px; right: 0px;
margin-top: -11px; margin-top: -11px;
@@ -6495,7 +6495,7 @@ form#sendComment h3 {
text-indent: -5000px; } text-indent: -5000px; }
div.star:after { div.star:after {
content: ""; content: "\f006";
font-family: "FontAwesome"; font-family: "FontAwesome";
display: inline-block; display: inline-block;
color: #777676; } color: #777676; }
@@ -6503,13 +6503,13 @@ div.star:after {
div.star.star_on { div.star.star_on {
display: block; } display: block; }
div.star.star_on:after { div.star.star_on:after {
content: ""; content: "\f005";
font-family: "FontAwesome"; font-family: "FontAwesome";
display: inline-block; display: inline-block;
color: #ef8743; } color: #ef8743; }
div.star.star_hover:after { div.star.star_hover:after {
content: ""; content: "\f005";
font-family: "FontAwesome"; font-family: "FontAwesome";
display: inline-block; display: inline-block;
color: #ef8743; } color: #ef8743; }
@@ -6561,7 +6561,7 @@ div.star.star_hover:after {
.fancybox-skin .fancybox-close:hover { .fancybox-skin .fancybox-close:hover {
color: #515151; } color: #515151; }
.fancybox-skin .fancybox-close:after { .fancybox-skin .fancybox-close:after {
content: ""; content: "\f057";
font-family: "FontAwesome"; } font-family: "FontAwesome"; }
#facebook_block, #facebook_block,
themes/default-bootstrap/header.tpl
+3 -1
View File
@@ -110,12 +110,14 @@
</nav> </nav>
</div> </div>
</div> </div>
<div class="container header-row"> <div class="header-row">
<div class="container">
<a id="header_logo" href="{$base_dir}" title="{$shop_name|escape:'html':'UTF-8'}"> <a id="header_logo" href="{$base_dir}" title="{$shop_name|escape:'html':'UTF-8'}">
<img class="logo img-responsive" src="{$logo_url}" alt="{$shop_name|escape:'html':'UTF-8'}"{if $logo_image_width} width="{$logo_image_width}"{/if}{if $logo_image_height} height="{$logo_image_height}"{/if}/> <img class="logo img-responsive" src="{$logo_url}" alt="{$shop_name|escape:'html':'UTF-8'}"{if $logo_image_width} width="{$logo_image_width}"{/if}{if $logo_image_height} height="{$logo_image_height}"{/if}/>
</a> </a>
{if isset($HOOK_TOP)}{$HOOK_TOP}{/if} {if isset($HOOK_TOP)}{$HOOK_TOP}{/if}
</div> </div>
</div>
</header> </header>
</div> </div>
<div class="columns-container"> <div class="columns-container">
themes/default-bootstrap/sass/_theme_variables.scss
+2 -2
View File
@@ -1,8 +1,8 @@
@import 'bootstrap_lib/_variables'; @import 'bootstrap_lib/_variables';
//------- FONTS //------- FONTS
$font-famaly: Arial, Helvetica, sans-serif; $font-family: Arial, Helvetica, sans-serif;
$font: normal 13px/18px $font-famaly; $font: normal 13px/18px $font-family;
$font-custom: 'Open Sans', sans-serif; $font-custom: 'Open Sans', sans-serif;
$font-icon: "FontAwesome"; $font-icon: "FontAwesome";
themes/default-bootstrap/sass/global.sass
+34 -44
View File
@@ -48,8 +48,6 @@ textarea
h3 h3
@include sub-heading @include sub-heading
//text //text
p.info-title p.info-title
font-weight: bold font-weight: bold
@@ -77,7 +75,7 @@ p.info-account
text-shadow: 1px 1px rgba(0,0,0,0.1) text-shadow: 1px 1px rgba(0,0,0,0.1)
&:before &:before
font-family: $font-icon font-family: $font-icon
content: "" content: "\f058"
font-size: 20px font-size: 20px
vertical-align: -2px vertical-align: -2px
padding-right: 7px padding-right: 7px
@@ -85,7 +83,7 @@ p.info-account
text-shadow: 1px 1px rgba(0,0,0,0.1) text-shadow: 1px 1px rgba(0,0,0,0.1)
&:before &:before
font-family: $font-icon font-family: $font-icon
content: "" content: "\f057"
font-size: 20px font-size: 20px
vertical-align: -2px vertical-align: -2px
padding-right: 7px padding-right: 7px
@@ -236,7 +234,7 @@ span.exclusive
opacity: 0.3 opacity: 0.3
.button.button-small .button.button-small
font: bold 13px/17px $font-famaly font: bold 13px/17px $font-family
color: $button-text-color color: $button-text-color
background: $button-small-bg background: $button-small-bg
border: 1px solid border: 1px solid
@@ -415,7 +413,7 @@ span.exclusive
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e7e7e7', endColorstr='#e7e7e7',GradientType=0) filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e7e7e7', endColorstr='#e7e7e7',GradientType=0)
.button.ajax_add_to_cart_button .button.ajax_add_to_cart_button
font: 700 17px/21px $font-famaly font: 700 17px/21px $font-family
color: $button-text-color color: $button-text-color
text-shadow: 1px 1px rgba(0,0,0,0.2) text-shadow: 1px 1px rgba(0,0,0,0.2)
padding: 0 padding: 0
@@ -441,7 +439,7 @@ span.exclusive
background: #0084bf background: #0084bf
.button.lnk_view .button.lnk_view
font: 700 17px/21px $font-famaly font: 700 17px/21px $font-family
color: $base-text-color color: $base-text-color
text-shadow: 1px 1px rgba(255,255,255,1) text-shadow: 1px 1px rgba(255,255,255,1)
padding: 0 padding: 0
@@ -566,7 +564,7 @@ table.table_block td
padding: 0 5px 0 3px padding: 0 5px 0 3px
display: inline-block display: inline-block
&.small &.small
font: 700 14px/17px $font-famaly font: 700 14px/17px $font-family
padding: 1px 6px padding: 1px 6px
@@ -588,7 +586,7 @@ table.table_block td
right: -5px right: -5px
.new-label .new-label
font: 700 15px/18px $font-famaly font: 700 15px/18px $font-family
color: $light-text-color color: $light-text-color
background: #6ad4ff background: #6ad4ff
text-transform: uppercase text-transform: uppercase
@@ -628,7 +626,7 @@ table.table_block td
@include rotate(145deg) @include rotate(145deg)
.sale-label .sale-label
font: 700 15px/18px $font-famaly font: 700 15px/18px $font-family
color: $light-text-color color: $light-text-color
background: #f13340 background: #f13340
text-transform: uppercase text-transform: uppercase
@@ -885,7 +883,7 @@ table.table_block td
.product-description .product-description
margin-bottom: 14px margin-bottom: 14px
.price-percent-reduction .price-percent-reduction
font: 700 14px/17px $font-famaly font: 700 14px/17px $font-family
padding: 1px 6px padding: 1px 6px
//Block CATEGORIES //Block CATEGORIES
@@ -959,7 +957,7 @@ table.table_block td
&.OPEN, &.OPEN,
&.CLOSE &.CLOSE
&:before &:before
content: "" content: "\f068"
display: block display: block
vertical-align: middle vertical-align: middle
width: 30px width: 30px
@@ -968,7 +966,7 @@ table.table_block td
line-height: 30px line-height: 30px
text-align: center text-align: center
&.CLOSE:before &.CLOSE:before
content: "" content: "\f067"
color: #c0c0c0 color: #c0c0c0
& span.grower:hover + a, & span.grower:hover + a,
a:hover, a:hover,
@@ -979,7 +977,7 @@ table.table_block td
font-weight: normal font-weight: normal
color: #777777 color: #777777
&:before &:before
content: "" content: "\f105"
font-family: $font-icon font-family: $font-icon
line-height: 29px line-height: 29px
padding-right: 8px padding-right: 8px
@@ -995,7 +993,7 @@ table.table_block td
overflow: hidden overflow: hidden
span.heading-counter span.heading-counter
font: bold 13px/22px $font-famaly font: bold 13px/22px $font-family
float: right float: right
color: $base-text-color color: $base-text-color
text-transform: none text-transform: none
@@ -1463,7 +1461,11 @@ div.star a:hover
position: relative position: relative
background: $light-background background: $light-background
.header-row .header-row
background: $dark-background position: relative
&:first-child
background-color: $dark-background
.container
position: relative
.shop-phone .shop-phone
display: block display: block
padding: 5px 0 10px padding: 5px 0 10px
@@ -1477,9 +1479,10 @@ div.star a:hover
padding-right: 7px padding-right: 7px
strong strong
color: $light-text-color color: $light-text-color
nav
#header_user_info
float: right float: right
.header_user_info
float: left
border-left: 1px solid #515151 border-left: 1px solid #515151
border-right: 1px solid #515151 border-right: 1px solid #515151
// max 479px // max 479px
@@ -1494,10 +1497,6 @@ div.star a:hover
// max 479px // max 479px
@media (max-width: $screen-xs - 1) @media (max-width: $screen-xs - 1)
font-size: 11px font-size: 11px
.header-row-2
position: relative
z-index: 1
#header_logo #header_logo
position: absolute position: absolute
left: 0 left: 0
@@ -1518,8 +1517,6 @@ div.star a:hover
left: 50% left: 50%
margin-left: -100px margin-left: -100px
top: 20px top: 20px
#header_right
position: relative
//languages/currencies //languages/currencies
#currencies-block-top, #currencies-block-top,
@@ -1530,10 +1527,8 @@ div.star a:hover
// max 479px // max 479px
@media (max-width: $screen-xs - 1) @media (max-width: $screen-xs - 1)
width: 25% width: 25%
span.firstWord span.firstWord
display: none display: none
div.current div.current
font-weight: bold font-weight: bold
padding: 8px 10px 10px 10px padding: 8px 10px 10px 10px
@@ -1547,7 +1542,7 @@ div.star a:hover
strong strong
color: #777777 color: #777777
&:after &:after
content: "" content: "\f0d7"
font-family: $font-icon font-family: $font-icon
font-size: 18px font-size: 18px
line-height: 18px line-height: 18px
@@ -1583,10 +1578,6 @@ div.star a:hover
color: $light-text-color color: $light-text-color
&.selected, &:hover a &.selected, &:hover a
background: #484848 background: #484848
#contact-link #contact-link
float: right float: right
border-left: 1px solid #515151 border-left: 1px solid #515151
@@ -1606,7 +1597,7 @@ div.star a:hover
padding-left: 5px padding-left: 5px
padding-right: 5px padding-right: 5px
#contact-link a, #contact-link a,
.header-row #header_user_info a, .header-row .header_user_info a,
#currencies-block-top div.current, #currencies-block-top div.current,
#languages-block-top div.current #languages-block-top div.current
cursor: pointer cursor: pointer
@@ -1616,7 +1607,6 @@ div.star a:hover
.ie8 #header #header_logo .ie8 #header #header_logo
width: 350px width: 350px
// BREADCRUMB // BREADCRUMB
.breadcrumb .breadcrumb
display: inline-block display: inline-block
@@ -1713,13 +1703,13 @@ div.star a:hover
&:after &:after
display: block display: block
content: "" content: "\f055"
font-family: $font-icon font-family: $font-icon
position: absolute position: absolute
right: 0 right: 0
top: 1px top: 1px
&.active:after &.active:after
content: "" content: "\f056"
a a
color: $light-text-color color: $light-text-color
ul ul
@@ -1789,15 +1779,15 @@ div.star a:hover
&.facebook &.facebook
a a
&:before &:before
content: "" content: "\f09a"
&.twitter &.twitter
a a
&:before &:before
content: "" content: "\f099"
&.rss &.rss
a a
&:before &:before
content: "" content: "\f09e"
h4 h4
float: right float: right
margin-bottom: 0 margin-bottom: 0
@@ -2208,7 +2198,7 @@ p.payment_module
&.cheque, &.bankwire &.cheque, &.bankwire
&:after &:after
display: block display: block
content: "" content: "\f054"
position: absolute position: absolute
right: 0px right: 0px
margin-top: -11px margin-top: -11px
@@ -2349,7 +2339,7 @@ p.cheque-indent
opacity: 1 opacity: 1
line-height: inherit line-height: inherit
text-transform: none text-transform: none
font-family: $font-famaly font-family: $font-family
&:hover &:hover
color: $link-hover-color color: $link-hover-color
@@ -2612,7 +2602,7 @@ form#sendComment h3
text-indent: -5000px text-indent: -5000px
div.star div.star
&:after &:after
content: "" content: "\f006"
font-family: $font-icon font-family: $font-icon
display: inline-block display: inline-block
color: #777676 color: #777676
@@ -2620,14 +2610,14 @@ div.star
div.star.star_on div.star.star_on
display: block display: block
&:after &:after
content: "" content: "\f005"
font-family: $font-icon font-family: $font-icon
display: inline-block display: inline-block
color: #ef8743 color: #ef8743
div.star.star_hover div.star.star_hover
&:after &:after
content: "" content: "\f005"
font-family: $font-icon font-family: $font-icon
display: inline-block display: inline-block
color: #ef8743 color: #ef8743
@@ -2691,7 +2681,7 @@ div.star.star_hover
&:hover &:hover
color: $link-hover-color color: $link-hover-color
&:after &:after
content: "" content: "\f057"
font-family: $font-icon font-family: $font-icon
//Homepage pre-footer //Homepage pre-footer
themes/default-bootstrap/sass/global.scss
-3287
View File
File diff suppressed because it is too large. Load diff
themes/default-bootstrap/sass/jquery/jquery.bxslider.scss
+2 -2
View File
@@ -61,7 +61,7 @@
.bx-wrapper .bx-pager { .bx-wrapper .bx-pager {
text-align: center; text-align: center;
font-size: .85em; font-size: .85em;
font-family: $font-famaly; font-family: $font-family;
font-weight: bold; font-weight: bold;
color: #666; color: #666;
padding-top: 20px; padding-top: 20px;
@@ -200,7 +200,7 @@
.bx-wrapper .bx-caption span { .bx-wrapper .bx-caption span {
color: $light-text-color; color: $light-text-color;
font-family: $font-famaly; font-family: $font-family;
display: block; display: block;
font-size: .85em; font-size: .85em;
padding: 10px; padding: 10px;
themes/default-bootstrap/sass/modules/blockcart/blockcart.scss
+3 -3
View File
@@ -265,7 +265,7 @@
position:static; position:static;
h2 { h2 {
font:400 23px/29px $font-famaly; font:400 23px/29px $font-family;
color:#46a74e; color:#46a74e;
margin-bottom:22px; margin-bottom:22px;
padding-right:100px; padding-right:100px;
@@ -334,7 +334,7 @@
} }
h2 { h2 {
font:400 23px/29px $font-famaly; font:400 23px/29px $font-family;
color:$base-text-color; color:$base-text-color;
border-bottom:1px solid $base-border-color; border-bottom:1px solid $base-border-color;
padding-bottom:13px; padding-bottom:13px;
@@ -408,7 +408,7 @@
} }
h2 { h2 {
font:400 23px/26px $font-famaly; font:400 23px/26px $font-family;
color:$base-text-color; color:$base-text-color;
margin-bottom:25px; margin-bottom:25px;
} }
themes/default-bootstrap/sass/modules/blockcontact/blockcontact.scss
+1 -1
View File
@@ -14,7 +14,7 @@
p {margin-bottom:4px;} p {margin-bottom:4px;}
p.tel { p.tel {
font:400 17px/21px $font-famaly; font:400 17px/21px $font-family;
color:$light-text-color; color:$light-text-color;
margin-bottom:6px; margin-bottom:6px;
themes/default-bootstrap/sass/modules/homeslider/bx_styles.scss
+2 -2
View File
@@ -90,7 +90,7 @@
.bx-wrapper .bx-pager { .bx-wrapper .bx-pager {
text-align: center; text-align: center;
font-size: .85em; font-size: .85em;
font-family: $font-famaly; font-family: $font-family;
font-weight: bold; font-weight: bold;
color: #666; color: #666;
padding-top: 20px; padding-top: 20px;
@@ -252,7 +252,7 @@
.bx-wrapper .bx-caption span { .bx-wrapper .bx-caption span {
color: $light-text-color; color: $light-text-color;
font-family: $font-famaly; font-family: $font-family;
display: block; display: block;
font-size: .85em; font-size: .85em;
padding: 10px; padding: 10px;
themes/default-bootstrap/sass/product_list.scss
+1 -1
View File
@@ -52,7 +52,7 @@ ul.product_list {
} }
.quick-view { .quick-view {
font:700 13px/16px $font-famaly; font:700 13px/16px $font-family;
color:#777676; color:#777676;
position:absolute; position:absolute;
left:50%; left:50%;