diff --git a/assets/styles/style.scss b/assets/styles/style.scss index ca167d5..6b1dfe5 100644 --- a/assets/styles/style.scss +++ b/assets/styles/style.scss @@ -180,4 +180,17 @@ div[layout="ARTICLE_PAGE"] { @apply mt-12 first:mt-0; } -} \ No newline at end of file +} + +@media (max-width: 640px) { + .collection-container { + grid-template-columns: repeat(1, minmax(0, 1fr)) !important; + & > article.basic-article { + flex-direction: row!important; + + & > .basic-article_thumbnail { + width: 50%!important; + } + } + } +} \ No newline at end of file diff --git a/components/dynamic-page/page-component/templates/articles/cards/Audio.vue b/components/dynamic-page/page-component/templates/articles/cards/Audio.vue index d5302ee..95bc08f 100644 --- a/components/dynamic-page/page-component/templates/articles/cards/Audio.vue +++ b/components/dynamic-page/page-component/templates/articles/cards/Audio.vue @@ -21,7 +21,7 @@ const parseData = computed(() => { const result = getInputValue(props.dataResult, "OBJECT"); switch (result?.contentType) { case 1: - type.value = ""; + type.value = "Default"; // type.value = "Image"; break; case 2: @@ -54,8 +54,8 @@ const parseData = computed(() => {
- - diff --git a/components/dynamic-page/page-component/templates/collections/categories/misses/Default.vue b/components/dynamic-page/page-component/templates/collections/categories/misses/Default.vue index 89a16f7..7301a32 100644 --- a/components/dynamic-page/page-component/templates/collections/categories/misses/Default.vue +++ b/components/dynamic-page/page-component/templates/collections/categories/misses/Default.vue @@ -111,6 +111,18 @@ const mapActivesToItems = (index: number) => { -moz-column-count: 4; gap: 16px; + @media (min-width: 640px) and (max-width: 1024px) { + column-count: 2; + -webkit-column-count: 2; + -moz-column-count: 2; + } + + @media (max-width: 640px) { + column-count: 1; + -webkit-column-count: 1; + -moz-column-count: 1; + } + .wrap { position: relative; width: 100%; diff --git a/components/dynamic-page/page-section/layouts/none/Default.vue b/components/dynamic-page/page-section/layouts/none/Default.vue index 0dea638..3a6fa51 100644 --- a/components/dynamic-page/page-section/layouts/none/Default.vue +++ b/components/dynamic-page/page-section/layouts/none/Default.vue @@ -166,8 +166,9 @@ const CLASS_FOR_SECTION = computed(() => { case enumPageSectionLayouts[enumPageSectionTemplate[enumPageSectionKey.NONE]["NONE"]]["VERTICAL_LEFT_TWO"]: _classForSection = { - section_layout: "section_layout three_col_layout", - 0: "col-span-2", + section_layout: "section_layout twelve_col_layout", + 0: "sm:col-span-8 col-span-12", + 1: "sm:col-span-4 col-span-12", }; break; case enumPageSectionLayouts[enumPageSectionTemplate[enumPageSectionKey.NONE]["NONE"]]["VERTICAL_RIGHT_TWO"]: @@ -178,8 +179,9 @@ const CLASS_FOR_SECTION = computed(() => { break; case enumPageSectionLayouts[enumPageSectionTemplate[enumPageSectionKey.NONE]["NONE"]]["VERTICAL_ONE_FIVE"]: _classForSection = { - section_layout: "section_layout six_col_layout", - 1: "col-span-5", + section_layout: "section_layout grid-cols-12", + 0: "lg:col-span-2 lg:block hidden", + 1: "lg:col-span-10 col-span-12", }; break; case enumPageSectionLayouts[enumPageSectionTemplate[enumPageSectionKey.NONE]["NONE"]]["VERTICAL_FIVE_THREE_TWO_TWO"]: @@ -202,7 +204,7 @@ const CLASS_FOR_SECTION = computed(() => { break; case enumPageSectionLayouts[enumPageSectionTemplate[enumPageSectionKey.NONE]["NONE"]]["VERTICAL_TWO_FIVE_THREE_TWO"]: _classForSection = { - section_layout: "section_layout twelve_col_layout", + section_layout: "section_layout grid-cols-12 123", 0: "col-span-2", 1: "col-span-5", 2: "col-span-3", @@ -217,7 +219,10 @@ const CLASS_FOR_SECTION = computed(() => { break; case enumPageSectionLayouts[enumPageSectionTemplate[enumPageSectionKey.NONE]["NONE"]]["VERTICAL_THREE"]: _classForSection = { - section_layout: "section_layout three_col_layout", + section_layout: "section_layout grid-cols-12", + 0: "sm:col-span-4 col-span-12", + 1: "sm:col-span-4 col-span-12", + 2: "sm:col-span-4 col-span-12" }; break; case enumPageSectionLayouts[enumPageSectionTemplate[enumPageSectionKey.NONE]["NONE"]]["VERTICAL_FOUR"]: @@ -239,15 +244,19 @@ const CLASS_FOR_SECTION = computed(() => { break; case enumPageSectionLayouts[enumPageSectionTemplate[enumPageSectionKey.NONE]["NONE"]]["VERTICAL_CENTER_FOUR"]: _classForSection = { - section_layout: "section_layout six_col_layout", - 1: "col-span-4", + section_layout: "section_layout grid-cols-12", + 0: "lg:col-span-2 md:col-span-6 col-span-12 lg:order-1 md:order-2 order-2", + 1: "lg:col-span-8 md:col-span-12 col-span-12 lg:order-2 md:order-1 order-1", + 2: "lg:col-span-2 md:col-span-6 col-span-12 lg:order-3 md:order-3 order-3", + }; break; case enumPageSectionLayouts[enumPageSectionTemplate[enumPageSectionKey.NONE]["NONE"]]["VERTICAL_ONE_TWO_THREE"]: _classForSection = { - section_layout: "section_layout six_col_layout", - 1: "col-span-2", - 2: "col-span-3", + section_layout: "section_layout grid-cols-12", + 0: "col-span-2 lg:block hidden", + 1: "lg:col-span-4 md:col-span-5 col-span-12", + 2: "lg:col-span-6 md:col-span-7 col-span-12", }; break; default: @@ -295,8 +304,6 @@ const mapActivesToItems = (index: number) => { :key="index" :class="['border-custom', CLASS_FOR_SECTION[index]]" :style="mapActivesToItems(index)['div.section_child']" - @dragover.prevent - @drop.stop.prevent="dropPlacementInSection($event, index, position.data)" >
@@ -366,39 +373,39 @@ const mapActivesToItems = (index: number) => { &.twelve_col_layout { grid-template-columns: repeat(12, minmax(0, 1fr)); } - .col-span-2 { - grid-column: span 2 / span 2; - } - .col-span-3 { - grid-column: span 3 / span 3; - } - .col-span-4 { - grid-column: span 4 / span 4; - } - .col-span-5 { - grid-column: span 5 / span 5; - } - .col-span-6 { - grid-column: span 6 / span 6; - } - .col-span-7 { - grid-column: span 7 / span 7; - } - .col-span-8 { - grid-column: span 8 / span 8; - } - .col-span-9 { - grid-column: span 9 / span 9; - } - .col-span-10 { - grid-column: span 10 / span 10; - } - .col-span-11 { - grid-column: span 11 / span 11; - } - .col-span-12 { - grid-column: span 12 / span 12; - } + // .col-span-2 { + // grid-column: span 2 / span 2; + // } + // .col-span-3 { + // grid-column: span 3 / span 3; + // } + // .col-span-4 { + // grid-column: span 4 / span 4; + // } + // .col-span-5 { + // grid-column: span 5 / span 5; + // } + // .col-span-6 { + // grid-column: span 6 / span 6; + // } + // .col-span-7 { + // grid-column: span 7 / span 7; + // } + // .col-span-8 { + // grid-column: span 8 / span 8; + // } + // .col-span-9 { + // grid-column: span 9 / span 9; + // } + // .col-span-10 { + // grid-column: span 10 / span 10; + // } + // .col-span-11 { + // grid-column: span 11 / span 11; + // } + // .col-span-12 { + // grid-column: span 12 / span 12; + // } .border-custom { border-color: #e5e5e5 !important; } diff --git a/components/dynamic-page/page/layouts/Default.vue b/components/dynamic-page/page/layouts/Default.vue index c7dc2b2..a20d453 100644 --- a/components/dynamic-page/page/layouts/Default.vue +++ b/components/dynamic-page/page/layouts/Default.vue @@ -51,6 +51,7 @@ const LAYOUT_PARSE = computed(() => { \ No newline at end of file +