Merge branch 'release/2.1.3'

README.md

@@ -1,5 +1,5 @@
-# PrestaShop Classic Rocket
 
+# PrestaShop Classic Rocket
 Classic Rocket is a rework of "classic theme". It has been built keeping in  mind : performance, accessibility and SEO.
 
 Contributed by [Prestarocket](//www.prestarocket.com/blog/) (Twitter: [@prestarocket](https://twitter.com/prestarocket))
@@ -17,6 +17,8 @@ Main features :
 - better responsive
 
 We use [Dareboost](https://www.dareboost.com/) to test and improve our work.
+## Contributing
+PR on branch develop please
 
 ## Main differences with Classic Theme
 ### Performance
@@ -113,17 +115,16 @@ Filter
 ```
 
 ## Compatibility
-PrestaShop 1.7.3.2 to 1.7.5.x
+PrestaShop 1.7.3.2 to 1.7.6.x
 
 ## Download
-- For PrestaShop 1.7.5.x (version 1.0.0): [classic-rocket](https://github.com/PrestaShop/classic-rocket/releases/download/2.1.2/classic-rocket.zip)
+- [classic-rocket](https://github.com/PrestaShop/classic-rocket/releases)
 
 ## Misc
 You can also use gulp to work faster during development (gulpfile.js => gulp watch)
 
 ## To do (you can help!):
 - test rtl
-- form validation
 - more BEM
 - add more custom scss variables
 - more data in jsonld

_dev/css/components/block-social.scss

@@ -52,7 +52,7 @@
   border-radius: 50%;
   transition: box-shadow 0.3s ease-in-out;
   &:hover{
-    @extend .shadow;
+    box-shadow:$card-box-shadow;;
 
   }
 

_dev/css/components/cart.scss

@@ -41,7 +41,7 @@
 .product-line__img{
   margin-right: $spacer;
 }
-@include media-breakpoint-down(md) {
+@include media-breakpoint-mobile {
   .product-line__img{
     width: 100px;
     height: auto;
@@ -89,4 +89,133 @@
     }
 
   }
-}
+}
+.nav-tabs--center{
+  justify-content: center;
+}
+@include media-breakpoint-mobile{
+  .checkout {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    z-index: 2;
+    padding: 1rem;
+    background-color: rgba(0,0,0,.4);
+    a{
+      width: 100%;
+    }
+  }
+}
+.product-line__body{
+  padding-right: $spacer/4;
+}
+
+//order confirmation table
+.total-value{
+  background-color: $gray-300;
+  font-weight: 700;
+}
+.table__title-head{
+  margin-bottom: 0;
+  font-size: $font-size-base;
+
+}
+/* CART */
+.promo-code{
+  margin-left: -$card-spacer-x;
+  margin-right: -$card-spacer-x;
+}
+.promo-code-alert {
+  display: none;
+}
+.cancel-promo{
+  text-align: center;
+}
+.card-body .separator{
+  margin-left: -$card-spacer-x;
+  margin-right: -$card-spacer-x;
+}
+
+.cart-summary-line{
+  display: flex;
+  justify-content: space-between;
+
+}
+.cart-total{
+font-weight: bold;
+}
+.card-body--summary{
+.cart-total{
+  @extend .total-value;
+  padding: $spacer/4;
+  .label{
+    margin-bottom: 0;
+  }
+}
+  &.card-body{
+    padding-bottom: 0;
+  }
+}
+.media-list__item:not(:last-child){
+  margin-bottom: $spacer/2;
+
+}
+
+//cart summary
+.link__showsummary{
+  .material-icons{
+    @extend .icon-collapse;
+  }
+  &[aria-expanded=true] .material-icons{
+    transform: rotateZ(180deg);
+
+  }
+}
+.cart-item:not(:last-child){
+  border-bottom: 1px solid $border-color;
+  margin-bottom: $spacer;
+  padding-bottom: $spacer;
+}
+.product-line-info{
+  margin-bottom: $spacer/2;
+}
+.promo-code-button{
+  text-align: center;
+  .collapse-button[aria-expanded=true] {
+    display: none;
+  }
+}
+.with-discounts{
+
+
+}
+.promo-highlighted{
+  text-align: center;
+  font-size: $font-size-sm;
+  margin-top: $spacer;
+  margin-bottom: $spacer/2;
+}
+.promo-discounts{
+  font-weight: $font-weight-bold;
+  text-align: center;
+  color: $gray-700;
+  .code{
+    color: $tertiary;
+  }
+}
+.form__add-voucher{
+  margin-bottom: $spacer;
+}
+.promo-code{
+  &__content{
+
+    padding: $card-spacer-x;
+    background-color: $promo-code-bg;
+  }
+ .collapse-button{
+   text-align: center;
+   display: block;
+   color: $primary;
+ }
+}

_dev/css/components/categories.scss

@@ -7,44 +7,10 @@
 }
 
 .block-categories {
-  @extend .shadow;
+  box-shadow:$card-box-shadow;;
 }
 
 
-.left-column .search_filters {
-  @extend .card-block;
-}
-
-//facets  colors
-.custom-color{
-  &.custom-control{
-    padding-left: 0;
-  }
-  .custom-control-label:before,
-  .custom-control-label:after
-  {
-    display:none
-  }
-.color{
-  margin-right: $custom-control-gutter - $custom-control-spacer-x;
-
-}
-}
-
-.facet-block:not(:last-child){
-  margin-bottom: $spacer;
-  border-bottom: 1px solid $card-border-color;
-  padding-bottom: $spacer;
-}
-.facet-block{
-  .remove{
-    display: none;
-  }
-}
-
-.active_filters{
-  background-color: $bg-dark;
-}
 
 //block categories
 .block-categories a{

_dev/css/components/customer.scss

@@ -5,7 +5,7 @@
   }
   .link-item{
     @extend .card;
-    @extend .shadow;
+    box-shadow:$card-box-shadow;;
     padding: $spacer;
     text-align: center;
     text-transform: uppercase;
@@ -34,4 +34,9 @@
   display: flex;
   justify-content: space-between;
 
+}
+
+.form--100{
+  min-width: 100%;
+  width: 100%;
 }