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

update 05.11.13

Browse Source
This commit is contained in:
TMMeilleur
2013-11-05 11:35:24 +02:00
parent de8bd97831
commit 55cd7c4c34
70 changed files with 3931 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default-bootstrap/sass/modules/blockcart/blockcart.scss
+8
View File
@@ -128,6 +128,14 @@
width: 270px;
background:#484848;
color:#fff;
@media (min-width: $screen-xs) and (max-width: $screen-xs-max) { // min 480px max 767px
top:69px;
}
@media (max-width: $screen-xs - 1) { // max 479px
top:44px;
left:50%;
margin-left:270px/2*-1;
}
a {
color:#fff;
themes/default-bootstrap/sass/modules/blocklayered/blocklayered-15.scss
+4
View File
@@ -104,6 +104,10 @@
.layered_filter_ul {
padding:0 20px 5px;
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px
padding-left:0;
padding-right:0;
}
li {
padding-bottom:7px;
themes/default-bootstrap/sass/modules/blocknewsletter/blocknewsletter.scss
+9 -1
View File
@@ -9,6 +9,10 @@
max-width:222px;
display:inline-block;
margin-right:6px;
@media (min-width: $screen-sm) and (max-width: $screen-md-max) { // min 768px max 1199px
margin-bottom:10px;
margin-right:0;
}
}
}
@@ -35,6 +39,10 @@
float:left;
padding:13px 15px 7px 15px;
margin-bottom:0;
@media (max-width: $screen-xs-max) { // max 767px
background:#3F3F3F;
width:100%;
}
h4 {
background:none;
@@ -43,7 +51,7 @@
text-transform:none;
font-size:21px;
line-height:25px;
border:none;
border:none;
}
.block_content {overflow:hidden;}
themes/default-bootstrap/sass/modules/blocksearch/blocksearch.scss
+26 -1
View File
@@ -3,7 +3,23 @@
#search_block_top {
position:absolute;
right: 420px;
top: 50px;
top: 50px;
@media (min-width: $screen-md) and (max-width: $screen-md-max) { // min 992px max 1199px
right:295px;
}
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px
right:207px;
}
@media (min-width: $screen-xs) and (max-width: $screen-xs-max) { // min 480px max 767px
right:0;
top:85px;
}
@media (max-width: $screen-xs - 1) { // max 479px
top:56px;
right:50%;
width:270px;
margin-right:270px/2*-1;
}
.btn.button-search {
background:#333;
@@ -33,6 +49,15 @@
background:#fbfbfb;
float: left;
margin-right:1px;
@media (min-width: $screen-sm) and (max-width: $screen-sm-max) { // min 768px max 991px
width:180px;
}
@media (min-width: $screen-xs) and (max-width: $screen-xs-max) { // min 480px max 767px
width:212px;
}
@media (max-width: $screen-xs - 1) { // max 479px
width:212px;
}
}
}
.ac_results {
themes/default-bootstrap/sass/modules/blocktopmenu/css/superfish-modified.scss
+7 -1
View File
@@ -16,6 +16,12 @@
width: 100%;
border-bottom: 3px solid #e9e9e9;
background: #f6f6f6;
@media (min-width: $screen-xs) and (max-width: $screen-xs-max) { // min 480px max 767px
margin-top:80px;
}
@media (max-width: $screen-xs - 1) { // max 479px
margin-top:70px;
}
}
.sf-menu ul {
position: absolute;
@@ -46,7 +52,7 @@
border-bottom: 3px solid #e9e9e9;
}
&.sfHover > a, > a:hover, &.sfHoverForce a {
&.sfHover > a, > a:hover, &.sfHoverForce > a {
background: #333;
border-bottom-color: #666666;
color: #fff;
themes/default-bootstrap/sass/modules/blockuserinfo/blockuserinfo.scss
+21 -1
View File
@@ -1,3 +1,4 @@
@import '../../_theme_variables';
/* block top user information */
#header_right {
@@ -6,17 +7,36 @@
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:#333333;
min-width: 270px;/* 200 */
min-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
min-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:#fff;