+
@@ -13,12 +9,32 @@ const ROW_HEIGHT = 2
const ROW_GAP = 2
export default {
+ props: {
+ singleColumn: {
+ type: Boolean,
+ default: false,
+ },
+ },
data() {
return {
measuring: false,
childCount: 0,
}
},
+ computed: {
+ gridStyle() {
+ return {
+ gridAutoRows: `${ROW_HEIGHT}px`,
+ rowGap: `${ROW_GAP}px`,
+ ...(this.singleColumn ? { gridTemplateColumns: '1fr' } : {}),
+ }
+ },
+ },
+ watch: {
+ singleColumn() {
+ this.$nextTick(() => this.batchRecalculate())
+ },
+ },
mounted() {
this.$nextTick(() => this.batchRecalculate())
this._resizeTimer = null
@@ -76,10 +92,16 @@ export default {
.ds-grid {
grid-template-columns: repeat(auto-fit, minmax(min(300px, 100%), 1fr));
column-gap: 16px;
+ min-width: 0;
+ max-width: 100%;
@media (max-width: 810px) {
column-gap: 8px;
}
+
+ > * {
+ min-width: 0;
+ }
}
.reset-grid-height {
diff --git a/webapp/components/ProgressBar/ProgressBar.vue b/webapp/components/ProgressBar/ProgressBar.vue
index 25c9a5a0a..73dfd70af 100644
--- a/webapp/components/ProgressBar/ProgressBar.vue
+++ b/webapp/components/ProgressBar/ProgressBar.vue
@@ -117,9 +117,15 @@ export default {
.progress-bar-button {
position: relative;
margin-left: $space-x-small;
+}
- @media (max-width: 810px) {
+@media (max-width: 639px) {
+ .progress-bar {
display: none;
}
+
+ .progress-bar-button {
+ margin-left: 0;
+ }
}
diff --git a/webapp/constants/filter.js b/webapp/constants/filter.js
index 00332053b..b629dc300 100644
--- a/webapp/constants/filter.js
+++ b/webapp/constants/filter.js
@@ -1,2 +1,2 @@
-export const SHOW_CONTENT_FILTER_HEADER_MENU = false
-export const SHOW_CONTENT_FILTER_MASONRY_GRID = true
+export const SHOW_CONTENT_FILTER_HEADER_MENU = true
+export const SHOW_CONTENT_FILTER_MASONRY_GRID = false
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 871b44f1f..a3724800c 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -698,6 +698,13 @@
"redeemed-count": "{count} mal eingelöst",
"redeemed-count-0": "Noch von niemandem eingelöst"
},
+ "layout": {
+ "toggle": {
+ "label": "Layout",
+ "multiColumn": "Mehrspaltig",
+ "singleColumn": "Einspaltig"
+ }
+ },
"localeSwitch": {
"tooltip": "Sprache wählen"
},
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index cf13bc4ee..a535ad4a8 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -698,6 +698,13 @@
"redeemed-count": "This code has been used {count} times.",
"redeemed-count-0": "No one has used this code yet."
},
+ "layout": {
+ "toggle": {
+ "label": "Layout",
+ "multiColumn": "Multi-column",
+ "singleColumn": "Single column"
+ }
+ },
"localeSwitch": {
"tooltip": "Choose language"
},
diff --git a/webapp/locales/es.json b/webapp/locales/es.json
index a80d3c95f..462b858a8 100644
--- a/webapp/locales/es.json
+++ b/webapp/locales/es.json
@@ -698,6 +698,13 @@
"redeemed-count": null,
"redeemed-count-0": null
},
+ "layout": {
+ "toggle": {
+ "label": "Diseño",
+ "multiColumn": "Varias columnas",
+ "singleColumn": "Una columna"
+ }
+ },
"localeSwitch": {
"tooltip": null
},
diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json
index ae61ea920..6423811aa 100644
--- a/webapp/locales/fr.json
+++ b/webapp/locales/fr.json
@@ -698,6 +698,13 @@
"redeemed-count": null,
"redeemed-count-0": null
},
+ "layout": {
+ "toggle": {
+ "label": "Mise en page",
+ "multiColumn": "Plusieurs colonnes",
+ "singleColumn": "Une colonne"
+ }
+ },
"localeSwitch": {
"tooltip": null
},
diff --git a/webapp/locales/it.json b/webapp/locales/it.json
index 4b94aa09e..88dcec9da 100644
--- a/webapp/locales/it.json
+++ b/webapp/locales/it.json
@@ -698,6 +698,13 @@
"redeemed-count": null,
"redeemed-count-0": null
},
+ "layout": {
+ "toggle": {
+ "label": "Layout",
+ "multiColumn": "Più colonne",
+ "singleColumn": "Colonna singola"
+ }
+ },
"localeSwitch": {
"tooltip": null
},
diff --git a/webapp/locales/nl.json b/webapp/locales/nl.json
index ff3543cc7..5c9a26dea 100644
--- a/webapp/locales/nl.json
+++ b/webapp/locales/nl.json
@@ -698,6 +698,13 @@
"redeemed-count": null,
"redeemed-count-0": null
},
+ "layout": {
+ "toggle": {
+ "label": "Weergave",
+ "multiColumn": "Meerdere kolommen",
+ "singleColumn": "Eén kolom"
+ }
+ },
"localeSwitch": {
"tooltip": null
},
diff --git a/webapp/locales/pl.json b/webapp/locales/pl.json
index 48b7e6be4..142cea180 100644
--- a/webapp/locales/pl.json
+++ b/webapp/locales/pl.json
@@ -698,6 +698,13 @@
"redeemed-count": null,
"redeemed-count-0": null
},
+ "layout": {
+ "toggle": {
+ "label": "Układ",
+ "multiColumn": "Wiele kolumn",
+ "singleColumn": "Jedna kolumna"
+ }
+ },
"localeSwitch": {
"tooltip": null
},
diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json
index 1cf487d21..754760c1b 100644
--- a/webapp/locales/pt.json
+++ b/webapp/locales/pt.json
@@ -698,6 +698,13 @@
"redeemed-count": null,
"redeemed-count-0": null
},
+ "layout": {
+ "toggle": {
+ "label": "Layout",
+ "multiColumn": "Várias colunas",
+ "singleColumn": "Coluna única"
+ }
+ },
"localeSwitch": {
"tooltip": null
},
diff --git a/webapp/locales/ru.json b/webapp/locales/ru.json
index 58ca74134..989658f09 100644
--- a/webapp/locales/ru.json
+++ b/webapp/locales/ru.json
@@ -698,6 +698,13 @@
"redeemed-count": null,
"redeemed-count-0": null
},
+ "layout": {
+ "toggle": {
+ "label": "Макет",
+ "multiColumn": "Несколько колонок",
+ "singleColumn": "Одна колонка"
+ }
+ },
"localeSwitch": {
"tooltip": null
},
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 058e5d2aa..26d3a4aea 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -17,6 +17,7 @@
"
variant="primary"
appearance="filled"
+ size="sm"
@click="showFilter = !showFilter"
>
@@ -64,12 +65,20 @@
:titleRemove="$t('filter-menu.deleteFilter')"
:clickRemove="resetByGroups"
/>
+
+
+
+
+