minhnt/NSG_PORTAL_V2
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://work.gct.com.vn/minhnt/NSG_PORTAL_V2

Browse Source
This commit is contained in:
MoreStrive
2024-05-30 22:54:47 +07:00
parent c36a985b88 dd09434deb
commit a7d4781a81
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/dynamic-page/page-component/templates/articles/individuals/Card.vue
+3 -3
View File
@@ -56,12 +56,12 @@ const drop = (e: any) => {
<div> <div>
<template v-if="parseData"> <template v-if="parseData">
<nuxt-link :to="`/bai-viet/${parseData.slug}`"> <nuxt-link :to="`/bai-viet/${parseData.slug}`">
<h3 v-if="!LAYOUT_PARSE['HIDE'] || !LAYOUT_PARSE['HIDE'].includes('title')" class="mb-1 line-clamp-2 text-base font-600 hover:text-primary-100 transition-all duration-300"> <h3 v-if="!LAYOUT_PARSE['HIDE'] || !LAYOUT_PARSE['HIDE'].includes('title')" class="mb-1 line-clamp-2 text-base font-700 hover:text-primary-100 transition-all duration-300">
{{ parseData.title?.replace(/<[^>]+>/g, '') }} {{ parseData.title?.replace(/<[^>]+>/g, '') }}
</h3> </h3>
</nuxt-link> </nuxt-link>
</template> </template>
<p v-if="!LAYOUT_PARSE['HIDE'] || !LAYOUT_PARSE['HIDE'].includes('paragraph')" class="mb-0 line-clamp-2"> <p v-if="!LAYOUT_PARSE['HIDE'] || !LAYOUT_PARSE['HIDE'].includes('paragraph')" class="mb-0 line-clamp-3 sm:line-clamp-5 text-[14px]">
<template v-if="parseData"> <template v-if="parseData">
<template v-if="parseData.intro"> <template v-if="parseData.intro">
{{ parseData.intro?.replace(/<[^>]+>/g, '') }} {{ parseData.intro?.replace(/<[^>]+>/g, '') }}
@@ -82,7 +82,7 @@ const drop = (e: any) => {
height: 100%; height: 100%;
&.vertical { &.vertical {
grid-template-columns: repeat(1, minmax(0, 1fr)); @apply lg:grid-cols-1 sm:grid-cols-2;
.basic-article_content { .basic-article_content {
padding: 10px 0px; padding: 10px 0px;
} }
components/dynamic-page/page-component/templates/categories/BasicCategories.vue
+1 -1
View File
@@ -25,7 +25,7 @@ const _dataResult = computed(() => {
<div> <div>
<div class="flex gap-4 items-end py-2"> <div class="flex gap-4 items-end py-2">
<template v-for="(component, index) in _dataResult"> <template v-for="(component, index) in _dataResult">
<nuxt-link v-if="component" :key="index" :to="`/${component.code}`" class="font-medium text-[18px] first:font-600 first:text-[24px]"> <nuxt-link v-if="component" :key="index" :to="`/${component.code}`" class=" py-1 font-400 text-[16px] first:font-600 first:text-[20px] sm:block hidden first:block first:border-b-[1px] first:border-b-solid first:border-b-[#409eff]">
<h3 class="m-0 leading-none hover:text-primary-100 transition-all duration-300">{{ component.title }}</h3> <h3 class="m-0 leading-none hover:text-primary-100 transition-all duration-300">{{ component.title }}</h3>
</nuxt-link> </nuxt-link>
</template> </template>
components/dynamic-page/page-section/layouts/Default.vue
+4 -3
View File
@@ -141,7 +141,7 @@ const CLASS_FOR_SECTION = computed(() => {
</script> </script>
<template> <template>
<div class="section_layout grid gap-x-5 gap-y-2.5" :class="[CLASS_FOR_SECTION.section_layout]"> <div class="section_layout grid sm:gap-x-5 sm:gap-y-2.5 gap-[10px] lg:grid-cols-2" :class="[CLASS_FOR_SECTION.section_layout]">
<div <div
v-for="(position, index) in props.content || Array(SETTING_OPTIONS.MAX_ELEMENT).fill({})" v-for="(position, index) in props.content || Array(SETTING_OPTIONS.MAX_ELEMENT).fill({})"
:key="index" :key="index"
@@ -159,11 +159,12 @@ const CLASS_FOR_SECTION = computed(() => {
} }
&.two_col_layout { &.two_col_layout {
grid-template-columns: repeat(2, minmax(0, 1fr)); @apply md:grid-cols-2 grid-cols-1;
} }
&.three_col_layout { &.three_col_layout {
grid-template-columns: repeat(3, minmax(0, 1fr)); @apply lg:grid-cols-3 grid-cols-1;
// grid-template-columns: repeat(3, minmax(0, 1fr));
} }
&.four_col_layout { &.four_col_layout {
grid-template-columns: repeat(4, minmax(0, 1fr)); grid-template-columns: repeat(4, minmax(0, 1fr));
components/dynamic-page/page/layouts/Default.vue
+3 -3
View File
@@ -8,13 +8,13 @@ const CLASS_FOR_LAYOUT = computed(() => {
switch (props.layout) { switch (props.layout) {
case 'Full_Page': case 'Full_Page':
_classForLayout = { _classForLayout = {
page_container: 'page_container w-full', page_container: 'page_container w-full px-2',
layout_container: 'layout_container px-5', layout_container: 'layout_container px-5',
}; };
break; break;
case 'Center_Page': case 'Center_Page':
_classForLayout = { _classForLayout = {
page_container: 'page_container w-full', page_container: 'page_container w-full px-2',
layout_container: 'layout_container container mx-auto', layout_container: 'layout_container container mx-auto',
}; };
break; break;
@@ -26,7 +26,7 @@ const CLASS_FOR_LAYOUT = computed(() => {
break; break;
default: default:
_classForLayout = { _classForLayout = {
page_container: 'page_container', page_container: 'page_container px-2',
layout_container: 'layout_container', layout_container: 'layout_container',
}; };
break; break;