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

updates and fixes 14.11.2013

Browse Source
This commit is contained in:
TMMeilleur committed 2013-11-14 18:08:05 +02:00
1 parent 051ed32133
commit 0d1c113be1
39 files changed
+999 -194
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

themes/default-bootstrap/sass/global.scss
+68 -6
View File
@@ -240,6 +240,9 @@ input.button_large, input.button_large_disabled, input.exclusive_large, input.ex
/*width: 180px;
background-image: url('../img/button-large.png')*/
}
.btn.disabled, .btn[disabled]:hover {
opacity:0.3;
}
.button.button-small {
font:bold 13px/17px $font-famaly;
color:$button-text-color;
@@ -824,8 +827,20 @@ table.table_block td {
margin-bottom:34px;
}
}
.block {margin-bottom:30px}
.block {
.block {
margin-bottom:30px;
@media (max-width: $screen-xs-max) { // max 767px
margin-bottom:0px;
}
.block_content {
@media (max-width: $screen-xs-max) { // max 767px
margin-bottom:20px;
}
}
}
.block {
.title_block, h4 {
font:600 18px/22px $font-custom;
@@ -837,7 +852,27 @@ table.table_block td {
margin-bottom:20px;
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
font-size:14px;
}
}
// heading style for devices smaller that 767px width
@media (max-width: $screen-xs-max) { // max 767px
position:relative;
&:after {
display:block;
font-family:$font-icon;
content:"";
position:absolute;
right:0;
top:15px;
height:36px;
width:36px;
font-size:26px;
font-weight:normal;
}
&.active:after {
content:"";
}
}
a {
color:$base-heading-color;
@@ -860,6 +895,9 @@ table.table_block td {
}
.list-block {
margin-top:-8px;
@media (max-width: $screen-xs-max) { // max 767px
margin-top:0;
}
li {
padding:5px 0 6px 20px;
@@ -888,9 +926,13 @@ table.table_block td {
.form-group {
padding-top:20px;
border-top:1px solid $base-border-color;
margin-bottom:0;
select {
max-width:270px;
max-width:270px;
@media (max-width: $screen-xs-max) { // max 767px
width:270px;
}
}
}
@@ -1858,7 +1900,10 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
color:#777;
position:relative;
.footer-block {
margin-top:45px;
margin-top:45px;
@media (max-width: $screen-xs-max) { // max 767px
margin-top:20px;
}
}
a {
@@ -1873,6 +1918,23 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
font:600 18px/22px $font-custom;
color:$light-text-color;
margin:0 0 13px 0;
@media (max-width: $screen-xs-max) { // max 767px
position:relative;
margin-bottom:0;
padding-bottom:13px;
&:after {
display:block;
content:"";
font-family:$font-icon;
position:absolute;
right:0;
top:1px;
}
&.active:after {
content:"";
}
}
a {color:$light-text-color;}
}
@@ -2946,7 +3008,7 @@ div.star_hover a, div.star a:hover { background-position: 0 -13px }
input, textarea {
border:1px solid #46a74e;
color:#35b33f;
background: url(../img/icon/form-ok.png) 98% 5px no-repeat #87f590;
background: url(../img/icon/form-ok.png) 98% 5px no-repeat #ddf9e1;
}
}
&.form-error, &.form-ok {
themes/default-bootstrap/sass/modules/blockcontact/blockcontact.scss
+3 -1
View File
@@ -1,7 +1,9 @@
@import '../../_theme_variables';
/* block CONTACT ******************************************************************************* */
#contact_block {
@media (max-width: $screen-xs-max) { // max 767px
margin-bottom:20px;
}
.label {display: none}
.block_content {
themes/default-bootstrap/sass/modules/blocknewsletter/blocknewsletter.scss
+1
View File
@@ -52,6 +52,7 @@
font-size:21px;
line-height:25px;
border:none;
&:after {display:none;}
}
.block_content {
themes/default-bootstrap/sass/modules/blockwishlist/blockwishlist.scss
+4 -1
View File
@@ -77,7 +77,10 @@
margin-bottom:20px;
select {
max-width:192px;
max-width:192px;
@media (max-width: $screen-xs-max) { // max 767px
width:192px;
}
}
}
}