Navigation Menu

Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove bs class and add utilities + make the button more ergonomic on phone #74

Merged
merged 49 commits into from Jul 15, 2019
Merged
Show file tree
Hide file tree
Changes from 39 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
8ce64f1
Add the responsive utilies
Kmoulun Jul 1, 2019
2ee5697
Pull and init
Kmoulun Jul 1, 2019
8b2ee42
Switch to node modules
Kmoulun Jul 1, 2019
34b0fb9
Remove bs class
Kmoulun Jul 1, 2019
13f7ed7
Remove bs class
Kmoulun Jul 1, 2019
8536baa
Remove bs class
Kmoulun Jul 1, 2019
ec36e8d
Remove bs class
Kmoulun Jul 1, 2019
1b8544b
Remove bs class
Kmoulun Jul 1, 2019
69e62a5
Remove bs class
Kmoulun Jul 3, 2019
9ac5bd7
npm install
Kmoulun Jul 4, 2019
9cbb633
Add mixin scss
Kmoulun Jul 4, 2019
aa29c4a
Add responsive utilities
Kmoulun Jul 4, 2019
794946b
Add a d--none utility
Kmoulun Jul 4, 2019
1aaffca
Switch d-md-none and d-none
Kmoulun Jul 4, 2019
d61773b
Remove d-flex justify align BS class
Kmoulun Jul 4, 2019
7e084e2
Add style instead of classes
Kmoulun Jul 4, 2019
fd6638b
Switch for a full width btn on the cart checkout part
Kmoulun Jul 4, 2019
5f3957a
Pull
Kmoulun Jul 5, 2019
5ad8bc2
Fix
Kmoulun Jul 5, 2019
da6ded0
Close tag
Kmoulun Jul 8, 2019
7cc8b7d
Change no script images
Kmoulun Jul 8, 2019
614caed
Remove extra quotation mark
Kmoulun Jul 8, 2019
ac67797
Fix of Overlay problem with megamenu and slider
Kmoulun Jul 8, 2019
3196303
Responsive image banner
Kmoulun Jul 8, 2019
c6be878
Input Validation
Kmoulun Jul 8, 2019
3d36e25
Merge branch 'pull68' into develop
Kmoulun Jul 8, 2019
2d33790
Merge branch 'pull62' into develop
Kmoulun Jul 8, 2019
5de3a39
Merge branch 'pull61' into develop
Kmoulun Jul 8, 2019
035ecc7
Merge branch 'pull58' into develop
Kmoulun Jul 8, 2019
be241d6
Fix class position
Kmoulun Jul 8, 2019
d46c8ae
Change feature product into a slick slider
Kmoulun Jul 8, 2019
2fec238
Add the rows 0 for the featureProduct slider
Kmoulun Jul 9, 2019
b718b87
Fix product.scss
Kmoulun Jul 9, 2019
d8230df
fix git conflict in package
prestarocket Jul 10, 2019
c1d68cc
Fix classes and tested
Kmoulun Jul 11, 2019
226c302
Merge remote-tracking branch 'origin/develop' into develop
Kmoulun Jul 11, 2019
a6d3daa
Merge branch 'f/removeBSflexclass' into develop
Kmoulun Jul 11, 2019
244811c
Switch delivery-address to card-address
Kmoulun Jul 11, 2019
4fe1e90
Add scss for the BS class
Kmoulun Jul 11, 2019
5884bca
Merge branch 'develop' of https://github.com/PrestaShop/classic-rocke…
Kmoulun Jul 11, 2019
c2f86c3
Compile
Kmoulun Jul 11, 2019
352f67b
Merge f/removeBSflexclass into develop
Kmoulun Jul 11, 2019
03b5a5b
Fix class problems and add custom class for form
Kmoulun Jul 11, 2019
75eb88e
Compile CSS
Kmoulun Jul 11, 2019
45c35fd
Add slick slider trigger
Kmoulun Jul 11, 2019
6e1ea6a
Pop
Kmoulun Jul 11, 2019
f309e4c
pop
Kmoulun Jul 11, 2019
5c8ade2
merge
Kmoulun Jul 11, 2019
c9738ae
Add same height js for slick
Kmoulun Jul 11, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 18 additions & 1 deletion _dev/css/components/cart.scss
Expand Up @@ -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;
Expand Down Expand Up @@ -89,4 +89,21 @@
}

}
}
.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%;
}
}
}
5 changes: 5 additions & 0 deletions _dev/css/components/customer.scss
Expand Up @@ -34,4 +34,9 @@
display: flex;
justify-content: space-between;

}

.needs-validation{
min-width: 100%;
width: 100%;
}
30 changes: 29 additions & 1 deletion _dev/css/components/footer.scss
Expand Up @@ -46,7 +46,7 @@
}
}

@include media-breakpoint-down(md) {
@include media-breakpoint-mobile {
.footer__title{
&--desktop{

Expand All @@ -57,3 +57,31 @@
}
}
}
.footer__copyright{
text-align: center;
font-size: $font-size-sm;
}
.header__nav{
align-items: center;
}
.header-nav__nav2{
display: flex;
justify-content: flex-end;
align-items: center;
}
.header-mobile{
display: flex;
justify-content: space-between;
align-items: center;
width: 100%;
}
.header-mobile__user-cart{
display: flex;
justify-content: flex-end;
align-items: center;
}
.header__top{
display: flex;
justify-content: space-between;
position: static;
}
30 changes: 30 additions & 0 deletions _dev/css/components/header.scss
@@ -0,0 +1,30 @@
.displayNav1{
display: flex;
align-items: center;
}
.displayNav2{
display: flex;
align-items: center;
justify-content: flex-end;
}
.mobile{
display: flex;
justify-content: space-between;
align-items: center;
width: 100%;
}
.top-logo{
text-align: center;
}
.mobile-user{
display: flex;
justify-content: flex-end;
align-items: center;
}
.displayTop{
display: flex;
justify-content: space-between;
position: static;
}

//checkout part
103 changes: 103 additions & 0 deletions _dev/css/components/products.scss
Expand Up @@ -302,3 +302,106 @@
}
}

.products-selection{
justify-content: space-between;
align-items: center;
}
.pack-miniature-item{
margin-bottom: $spacer * 2;
}
<<<<<<< HEAD
.ratio1_1{
display: block;
}
.pack-product-name{
margin: 0 $spacer * 4;
flex-grow: 1;
}
.product-miniature{
margin-bottom: $spacer * 3;
}
.product__card-img{
position: relative;
}
.highlighted-informations{
text-align: center;
padding: $spacer * 2;
}
.active_filters{
display: flex;
align-items: center;
padding: $spacer * 3;
margin-bottom: $spacer * 3;
}
.active_filters_title{
margin: 0;
margin-right: $spacer * 2;
}
.active_filters_item{
margin-right: $spacer;
}
.facets__title{
text-transform: uppercase;
}
.facet__title{
justify-content: space-between;
}
.qty{
margin: 0 $spacer * 3;
margin-top: $spacer * 2;
}
.add{
margin-top: $spacer * 2;
}
.product-customization{
margin-bottom: $spacer * 4;
}
.product-discounts{
margin-bottom: $spacer * 4;
}
.product__quantity{
margin-bottom: 0;
}
=======
>>>>>>> f/removeBSflexclass
.sort-by-row{
display: flex;
width: 100%;
justify-content: space-between;
align-items: center;
}
.total__item-show{
text-align: center;
font-size: $font-size-sm;
margin-top: $spacer;
}
.variant-links{
display: flex;
justify-content: center;
}
.product__download{
text-transform: uppercase;
}
<<<<<<< HEAD
.delivery-address{
=======
.card--address{
>>>>>>> f/removeBSflexclass
height: 100%;
text-align: center;
justify-content: center;
}
.invoice__address{
margin-top: $spacer * 3;
}
.invoice-address{
height: 100%;
text-align: center;
justify-content: center;
}
.step-number{
padding: $spacer * 2;
}
.nav-tabs{
justify-content: center;
}
2 changes: 1 addition & 1 deletion _dev/css/components/slick-theme.scss
Expand Up @@ -7,7 +7,7 @@
justify-content: center;
padding-top: 0;
padding-bottom: 0;
z-index: 2;
z-index: 1;

& > i{
font-size: 2*$font-size-base;
Expand Down
37 changes: 36 additions & 1 deletion _dev/css/components/utilities.scss
Expand Up @@ -6,4 +6,39 @@ img[data-lazy] {
}
.cursor-pointer{
cursor: pointer;
}
}
@mixin media-breakpoint-desktop() {

@include media-breakpoint-up(lg) {
@content;
}
}
@mixin media-breakpoint-mobile() {

@include media-breakpoint-down(md) {
@content;
}
}
.visible--desktop{
@include media-breakpoint-mobile(){
display: none;
}
}
.visible--mobile{
@include media-breakpoint-desktop(){
display: none;
}
}
.d--none{
display: none;
}
.header-nav__container{
display: flex;
justify-content: space-between;
}

.full-bleed {
width: 100vw;
margin-left: 50%;
transform: translateX(-50%);
}
12 changes: 12 additions & 0 deletions _dev/css/partials/mixin.scss
@@ -0,0 +1,12 @@
@mixin media-breakpoint-desktop() {

@include media-breakpoint-up(lg) {
@content;
}
}
@mixin media-breakpoint-mobile() {

@include media-breakpoint-down(sm) {
@content;
}
}
2 changes: 2 additions & 0 deletions _dev/css/theme.scss
@@ -1,5 +1,6 @@
@import "partials/variables";
@import "bootstrap";
@import "partials/mixin.scss";
@import "partials/custom_variables";
@import "partials/fonts";
@import "partials/commons";
Expand All @@ -17,6 +18,7 @@
@import "components/products";
@import "components/slick";
@import "components/slick-theme";
@import "components/header.scss";
@import "components/utilities";

@import "partials/bs_alpha";
Expand Down
2 changes: 1 addition & 1 deletion _dev/gulpfile.js
Expand Up @@ -24,4 +24,4 @@ gulp.task('move',function(){

gulp.task('watch', function(){
gulp.watch('css/**/*.scss', gulp.series('sass','move'))
});
});