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.

Sign up for GitHub

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

Add mobile/tablet grid settings #1352

Merged
merged 50 commits into from
Feb 25, 2022
Merged

Add mobile/tablet grid settings #1352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
068dcb7
Add mobile/tablet grid settings
Feb 11, 2022
b716910
Fix content feat collection
Feb 14, 2022
a10fee0
Content collection
Feb 14, 2022
357375a
Fix content prod rec
Feb 14, 2022
b76ca3f
content search
Feb 14, 2022
173e5ab
multicolumn content
Feb 14, 2022
fded919
content blog
Feb 14, 2022
c911745
Collection content
Feb 14, 2022
f6233fb
Fix mobile enable swipe
Feb 14, 2022
170bdd0
Fix slider
Feb 14, 2022
8ef3457
Fix media query
Feb 14, 2022
a100fcc
Update 12 translation files
translation-platform[bot] Feb 15, 2022
80a5d58
Update 8 translation files
translation-platform[bot] Feb 16, 2022
fdc78c3
Fix blog
Feb 16, 2022
3e303e4
Fix multicolumn
Feb 16, 2022
2cc7bad
fix classes
Feb 16, 2022
cad7f5d
revert
Feb 16, 2022
dd994fe
Update 1 translation file
translation-platform[bot] Feb 17, 2022
7370d00
feedback
Feb 17, 2022
3093436
feedback
Feb 17, 2022
6fb4c0b
fix class
Feb 17, 2022
9d05863
fix class
Feb 17, 2022
72ef591
fix class
Feb 17, 2022
05859d3
Update slider scroll paging method (#1297)
kmeleta Feb 15, 2022
4cee53c
fix classes
Feb 16, 2022
d0eda5a
fix repetition
Feb 17, 2022
9be0712
Revert main classes
Feb 17, 2022
14cd40e
revert class as on main for grid peak
Feb 17, 2022
d8294d1
Fix feat collection mobile
Feb 18, 2022
286f37f
Clean up
sofiamatulis Feb 18, 2022
280f6ea
Fix collection list and multicolimn
Feb 18, 2022
0aee929
Fix feat collection
Feb 18, 2022
4f568ec
Fix vars
Feb 18, 2022
82a3cd4
remove padding
Feb 18, 2022
76d3f57
Update multucolumn default
Feb 22, 2022
147793b
Update logic
Feb 22, 2022
03f7bdc
Clean up
Feb 22, 2022
c6a5ce1
simplify
Feb 22, 2022
4bcd061
feedbacl
Feb 22, 2022
886d73e
clean up
Feb 22, 2022
c9b7144
Clean up collection list
Feb 22, 2022
01d184d
fix multicolumn
Feb 22, 2022
39465ae
Cleanup
Feb 23, 2022
8776eac
Cleanup
Feb 23, 2022
671e785
feedback
Feb 23, 2022
51fefe7
feedback
Feb 23, 2022
7ebe18a
feedback
Feb 23, 2022
5d2122b
Clean up
Feb 23, 2022
b54e039
clean up
Feb 24, 2022
17f17d0
Clean up grid tablet
Feb 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 37 additions & 10 deletions assets/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,6 +1057,23 @@ summary::-webkit-details-marker {
}
}

@media screen and (max-width: 989px) {
.grid--1-col-tablet-down .grid__item {
width: 100%;
max-width: 100%;
}

.slider--tablet.grid--peek {
margin: 0;
width: 100%;
}

.slider--tablet.grid--peek .grid__item {
box-sizing: content-box;
margin: 0;
}
}

@media screen and (min-width: 990px) {
.grid--6-col-desktop .grid__item {
width: calc(16.66% - var(--grid-desktop-horizontal-spacing) * 5 / 6);
Expand Down Expand Up @@ -1108,7 +1125,6 @@ summary::-webkit-details-marker {
}

.grid--peek .grid__item {
width: calc(50% - var(--grid-mobile-horizontal-spacing) - 3rem);
min-width: 35%;
}

Expand All @@ -1119,6 +1135,20 @@ summary::-webkit-details-marker {
.grid--peek.slider .grid__item:last-of-type {
margin-right: 1.5rem;
}

.grid--2-col-tablet-down .grid__item {
width: calc(50% - var(--grid-mobile-horizontal-spacing) / 2);
}

.slider--tablet.grid--peek.grid--2-col-tablet-down .grid__item,
.grid--peek .grid__item {
width: calc(50% - var(--grid-mobile-horizontal-spacing) - 3rem);
}

.slider--tablet.grid--peek.grid--1-col-tablet-down .grid__item,
.slider--mobile.grid--peek.grid--1-col-tablet-down .grid__item {
width: calc(100% - var(--grid-mobile-horizontal-spacing) - 3rem);
}
}

@media screen and (min-width: 750px) and (max-width: 989px) {
Expand All @@ -1130,7 +1160,8 @@ summary::-webkit-details-marker {
width: calc(33.33% - var(--grid-desktop-horizontal-spacing) - 3rem);
}

.slider--tablet.grid--peek.grid--2-col-tablet .grid__item {
.slider--tablet.grid--peek.grid--2-col-tablet .grid__item,
.slider--tablet.grid--peek.grid--2-col-tablet-down .grid__item {
width: calc(50% - var(--grid-desktop-horizontal-spacing) - 3rem);
}

Expand All @@ -1141,17 +1172,13 @@ summary::-webkit-details-marker {
.slider--tablet.grid--peek .grid__item:last-of-type {
margin-right: 1.5rem;
}
}

@media screen and (max-width: 989px) {
.slider--tablet.grid--peek {
margin: 0;
width: 100%;
.grid--2-col-tablet-down .grid__item {
width: calc(50% - var(--grid-desktop-horizontal-spacing) / 2);
}

.slider--tablet.grid--peek .grid__item {
box-sizing: content-box;
margin: 0;
.grid--1-col-tablet-down.grid--peek .grid__item {
width: calc(100% - var(--grid-desktop-horizontal-spacing) - 3rem);
}
}

Expand Down
4 changes: 0 additions & 4 deletions assets/section-collection-list.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@
}

@media screen and (max-width: 749px) {
.collection-list .collection-list__item {
width: calc(100% - 3rem);
}

.slider.collection-list--1-items {
padding-bottom: 0;
}
Expand Down
4 changes: 0 additions & 4 deletions assets/section-multicolumn.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,6 @@
padding-left: 1.5rem;
padding-right: 1.5rem;
}

.multicolumn-list.slider .multicolumn-list__item {
width: calc(100% - 3rem);
}
}


Expand Down
72 changes: 72 additions & 0 deletions locales/cs.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,18 @@
},
"columns_desktop": {
"label": "Počet sloupců na počítači"
},
"header_mobile": {
"content": "Mobilní rozvržení"
},
"columns_mobile": {
"label": "Počet sloupců na mobilu",
"options__1": {
"label": "1 sloupec"
},
"options__2": {
"label": "2 sloupce"
}
}
},
"blocks": {
Expand Down Expand Up @@ -612,6 +624,18 @@
},
"columns_desktop": {
"label": "Počet sloupců na počítači"
},
"header_mobile": {
"content": "Mobilní rozvržení"
},
"columns_mobile": {
"label": "Počet sloupců na mobilu",
"options__1": {
"label": "1 sloupec"
},
"options__2": {
"label": "2 sloupce"
}
}
},
"presets": {
Expand Down Expand Up @@ -1328,6 +1352,18 @@
},
"columns_desktop": {
"label": "Počet sloupců na počítači"
},
"header_mobile": {
"content": "Mobilní rozvržení"
},
"columns_mobile": {
"label": "Počet sloupců na mobilu",
"options__1": {
"label": "1 sloupec"
},
"options__2": {
"label": "2 sloupce"
}
}
}
},
Expand Down Expand Up @@ -1772,6 +1808,18 @@
},
"columns_desktop": {
"label": "Počet sloupců na počítači"
},
"header_mobile": {
"content": "Mobilní rozvržení"
},
"columns_mobile": {
"label": "Počet sloupců na mobilu",
"options__1": {
"label": "1 sloupec"
},
"options__2": {
"label": "2 sloupce"
}
}
}
},
Expand Down Expand Up @@ -1837,6 +1885,18 @@
},
"columns_desktop": {
"label": "Počet sloupců na počítači"
},
"header_mobile": {
"content": "Mobilní rozvržení"
},
"columns_mobile": {
"label": "Počet sloupců na mobilu",
"options__1": {
"label": "1 sloupec"
},
"options__2": {
"label": "2 sloupce"
}
}
},
"blocks": {
Expand Down Expand Up @@ -1965,6 +2025,18 @@
},
"columns_desktop": {
"label": "Počet sloupců na počítači"
},
"header_mobile": {
"content": "Mobilní rozvržení"
},
"columns_mobile": {
"label": "Počet sloupců na mobilu",
"options__1": {
"label": "1 sloupec"
},
"options__2": {
"label": "2 sloupce"
}
}
}
},
Expand Down
72 changes: 72 additions & 0 deletions locales/da.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,18 @@
},
"columns_desktop": {
"label": "Antallet af kolonner på computer"
},
"header_mobile": {
"content": "Mobillayout"
},
"columns_mobile": {
"label": "Antallet af kolonner på mobil",
"options__1": {
"label": "1 kolonne"
},
"options__2": {
"label": "2 kolonner"
}
}
},
"blocks": {
Expand Down Expand Up @@ -612,6 +624,18 @@
},
"columns_desktop": {
"label": "Antallet af kolonner på computer"
},
"header_mobile": {
"content": "Mobillayout"
},
"columns_mobile": {
"label": "Antallet af kolonner på mobil",
"options__1": {
"label": "1 kolonne"
},
"options__2": {
"label": "2 kolonner"
}
}
},
"presets": {
Expand Down Expand Up @@ -1328,6 +1352,18 @@
},
"columns_desktop": {
"label": "Antallet af kolonner på computer"
},
"header_mobile": {
"content": "Mobillayout"
},
"columns_mobile": {
"label": "Antallet af kolonner på mobil",
"options__1": {
"label": "1 kolonne"
},
"options__2": {
"label": "2 kolonner"
}
}
}
},
Expand Down Expand Up @@ -1772,6 +1808,18 @@
},
"columns_desktop": {
"label": "Antallet af kolonner på computer"
},
"header_mobile": {
"content": "Mobillayout"
},
"columns_mobile": {
"label": "Antallet af kolonner på mobil",
"options__1": {
"label": "1 kolonne"
},
"options__2": {
"label": "2 kolonner"
}
}
}
},
Expand Down Expand Up @@ -1837,6 +1885,18 @@
},
"columns_desktop": {
"label": "Antallet af kolonner på computer"
},
"header_mobile": {
"content": "Mobillayout"
},
"columns_mobile": {
"label": "Antallet af kolonner på mobil",
"options__1": {
"label": "1 kolonne"
},
"options__2": {
"label": "2 kolonner"
}
}
},
"blocks": {
Expand Down Expand Up @@ -1965,6 +2025,18 @@
},
"columns_desktop": {
"label": "Antallet af kolonner på computer"
},
"header_mobile": {
"content": "Mobillayout"
},
"columns_mobile": {
"label": "Antallet af kolonner på mobil",
"options__1": {
"label": "1 kolonne"
},
"options__2": {
"label": "2 kolonner"
}
}
}
},
Expand Down
Loading