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

Added changes from eb94b51 TMMeilleur/PrestaShop

Browse Source
This commit is contained in:
alexey-svistunov
2013-11-08 21:00:00 +02:00
parent d3100acef2
commit 6f5c9044d3
87 changed files with 4285 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default-bootstrap/sass/_theme_variables.scss
+2
View File
@@ -15,6 +15,7 @@ $base-border-color: #d6d4d4;
$main_border: 1px solid $base-border-color;
$dark-border-color: #333;
$light-border-color: #fff;
$homepage-footer-border: #d9d9d9;
//--------- BACKGROUNDS
// -------------------------
@@ -23,6 +24,7 @@ $base-box-bg: #fbfbfb;
$table-background: $base-box-bg;
$dark-background: #333;
$light-background: #fff;
$homepage-footer-bg: #f2f2f2;
//--------- COLORS
themes/default-bootstrap/sass/global.scss
+196 -40
View File
@@ -818,7 +818,8 @@ table.table_block td {
#index {
.tab-content {
margin-top:35px;
margin-top:35px;
margin-bottom:34px;
}
}
.block {margin-bottom:30px}
@@ -924,6 +925,58 @@ table.table_block td {
}
}
/*************** Block CATEGORIES ***************/
#categories_block_top{
clear:both;
position: relative;
top: 30px;
.sf-menu{
position: relative;
>li{
position: static;
>ul{
width: 100%;
top: 60px;
margin: 0 20px;
>li{
display: block;
float: left;
width: 20%;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
padding: 0 10px;
}
>.category_thumb{
display: block;
clear: both;
overflow: hidden;
width: 100%;
img{
display: inline-block;
width: 33%;
}
}
}
h4{
a{
font-size: 1.1em;
&:before{display: none;}
}
}
.main-level-submenus{
position: relative;
display: block !important;
visibility: visible !important;
top: 0;
background: none;
box-shadow: none;
padding: 0;
left: 0;
}
}
.category_thumb{display: none;}
}
}
#categories_block_left {
.block_content > ul {
@@ -1220,8 +1273,12 @@ ul.footer_links {
background:none;
display:block;
padding:4px 0;
@media (max-width: $screen-xs-max) { // max 767px
b {display:none;}
}
span { border:none; padding:0; background:none;}
b {font-weight:bold;}
}
}
@@ -2521,10 +2578,9 @@ p.cheque-indent {
.mansup-container {
border-top:1px solid $base-border-color;
padding:31px 0 30px 0;
/* < 768 */
@media (max-width: $screen-xs-max){
text-align:center;
}
@media (max-width: $screen-xs-max){ // < 768
text-align:center;
}
}
&:first-child {
@@ -2543,35 +2599,30 @@ p.cheque-indent {
.middle-side {
padding-left:0;
/* < 768 */
@media (max-width: $screen-xs-max){
padding-right:15px;
padding-left:15px;
}
@media (max-width: $screen-xs-max){ // < 768
padding-right:15px;
padding-left:15px;
}
}
.right-side-content {
border-left:1px solid $base-border-color;
padding:0 0 32px 31px;
min-height:108px;
/* < 768 */
@media (max-width: $screen-xs-max){
min-height:1px;
padding:0;
border:none;
}
@media (max-width: $screen-xs-max){ // < 768
min-height:1px;
padding:0;
border:none;
}
.product-counter {
position:relative;
top:-6px;
margin-bottom:12px;
/* < 768 */
@media (max-width: $screen-xs-max){
top:0;
}
@media (max-width: $screen-xs-max){ // < 768
top:0;
}
}
}
}
@@ -2594,20 +2645,17 @@ p.cheque-indent {
.product-counter { margin-bottom:12px;}
}
}
/* > 1199 */
@media (min-width: $screen-lg) {
@media (min-width: $screen-lg) { // > 1199
li.first-in-line { clear:left;}
li.last-line { .product-container {border-bottom:none;}}
}
/*768 -> 1199*/
@media (min-width: $screen-sm) and (max-width: $screen-md-max) {
@media (min-width: $screen-sm) and (max-width: $screen-md-max) { //768 -> 1199
li.first-item-of-tablet-line {clear:left;}
li.last-tablet-line { .product-container {border-bottom:none;}}
}
/*< 768 */
@media (max-width: $screen-xs-max) {
@media (max-width: $screen-xs-max) { // < 768
li.item-last { .product-container {border-bottom:none;}}
}
}
@@ -2628,11 +2676,9 @@ p.cheque-indent {
.showall {
margin-right:0;
/* > 1199 */
@media (min-width: $screen-lg) {
margin-right:201px;
}
@media (min-width: $screen-lg) { // > 1199
margin-right:201px;
}
}
}
}
@@ -2667,8 +2713,7 @@ table.discount {
.form-control {
max-width:271px;
}
/* > 1200px */
@media (min-width: $screen-lg) {
@media (min-width: $screen-lg) { // > 1200px
.form-group {
overflow:hidden;
i { padding-left:10px;}
@@ -2732,11 +2777,10 @@ table.discount {
display:inline-block;
margin-right:5px;
/* max 767px */
@media (max-width: $screen-xs-max) {
margin:0 auto 15px auto;
display:block;
}
@media (max-width: $screen-xs-max) { // max 767px
margin:0 auto 15px auto;
display:block;
}
}
.buttons {
@@ -2937,4 +2981,116 @@ div.star_hover a, div.star a:hover { background-position: 0 -13px }
content:"";
font-family:$font-icon;
}
}
/********************************************* Homepage pre-footer *****************************************/
#facebook_block, #cmsinfo_block {
margin-top:40px;
overflow:hidden;
background:$homepage-footer-bg;
min-height:344px;
padding-right:29px;
padding-left:29px;
@media (max-width: $screen-sm-max) { // max 991px
padding-left:15px;
padding-right:15px;
}
@media (max-width: $screen-xs-max) { // max 767px
width:100%;
min-height:1px;
}
h4 {
font:600 21px/25px $font-custom;
color:$base-heading-color;
margin-bottom:26px;
@media (max-width: $screen-sm-max) { // max 991px
font-size:16px;
}
@media (max-width: $screen-xs-max) { // max 767px
padding-top:20px !important;
}
}
}
#facebook_block {
h4 {
padding-top:44px;
}
.facebook-fanbox {
background:$light-background;
border:1px solid #aaaaaa;
padding-bottom:10px;
}
}
#cmsinfo_block {
border-left:1px solid $homepage-footer-border;
@media (max-width: $screen-xs-max) { // max 767px
border:none;
margin-top:10px;
}
> div {
padding-top:45px;
padding-left:0;
@media (max-width: $screen-xs-max) { // max 767px
padding-top:20px;
}
@media (max-width: $screen-xs - 1) { // max 479px
width:100%;
border-top:1px solid $homepage-footer-border;
}
}
> div + div {
border-left:1px solid $homepage-footer-border;
min-height:344px;
padding-left:29px;
@media (max-width: $screen-xs - 1) { // max 479px
border-left:none;
padding-left:10px;
min-height:1px;
padding-bottom:15px;
}
h3 {
margin-bottom:12px;
}
}
em {
float:left;
font-size:35px;
color:$light-text-color;
width:59px;
height:59px;
line-height:59px;
text-align:center;
background:$dark-background;
@include border-radius(100px);
margin:3px 10px 0 0;
@media (max-width: $screen-sm-max) { // max 991px
width:30px;
height:30px;
line-height:30px;
font-size:20px;
}
}
.type-text {
overflow:hidden;
}
h3 {
font:600 21px/25px $font-custom;
color:$base-heading-color;
@media (max-width: $screen-md-max) { // max 1199px
font-size:18px;
}
}
ul {
li {
padding-bottom:22px;
@media (max-width: $screen-md-max) { // max 1199px
padding-bottom:10px;
}
@media (max-width: $screen-sm-max) { // max 991px
padding-bottom:0;
}
}
}
}
themes/default-bootstrap/sass/modules/blocklayered/blocklayered-15.scss
+1 -1
View File
@@ -11,7 +11,7 @@
}
li {
padding:1px 0;
padding:1px 15px 1px 0;
color:#9c9b9b;
cursor:pointer;
position:relative;
themes/default-bootstrap/sass/modules/homeslider/bx_styles.scss
+9 -2
View File
@@ -19,11 +19,18 @@
#homepage-slider {
padding-left:0;
padding-right:0;
padding-top:29px;
margin-bottom:35px;
padding-top:50px;
margin-bottom:14px;
width:66.6%;
max-width:779px;
position:relative;
z-index:1;
float:left;
@media (max-width: $screen-xs-max) { // max 767px
width:100%;
max-width:100%;
padding-top:20px;
}
#homeslider {
margin:0 auto;
themes/default-bootstrap/sass/modules/tmhtmlcontent/views/css/hooks.scss
+75
View File
@@ -0,0 +1,75 @@
@import '../../../../_theme_variables';
/* Home hook CSS */
#htmlcontent_home {
ul {
margin:0 -5px;
li {
padding:0 5px 10px;
@media (max-width: $screen-xs - 1) { // max 479px
width:100%;
}
img {
max-width:100%;
@media (max-width: $screen-xs - 1) { // max 479px
min-width:100%;
}
height:auto;
}
&.htmlcontent-item-4 {
width:66.6667%;
@media (max-width: $screen-xs - 1) { // max 479px
width:100%;
}
}
}
}
}
/* Top hook CSS */
#htmlcontent_top {
float:left;
padding-top:40px;
width:33.4%;
max-width:391px;
padding-left:10px;
@media (max-width: $screen-xs-max) { // max 767px
width:100%;
max-width:100%;
padding-left:0;
padding-top:0px;
}
ul {
@media (max-width: $screen-xs-max) { // max 767px
margin:0 -5px;
}
li {
padding-top:10px;
width:100%;
@media (max-width: $screen-xs-max) { // max 767px
float:left;
padding-left:5px;
padding-right:5px;
width:50%;
}
img {
max-width:100%;
height:auto;
}
}
}
}
/* Left hook CSS */
#htmlcontent_left {
}
/* Right hook CSS */
#htmlcontent_right {
}
/* Footer hook CSS */
#htmlcontent_footer {
}