diff --git a/assets/images/tienphong/ads_full.png b/assets/images/tienphong/ads_full.png new file mode 100644 index 0000000..9848632 Binary files /dev/null and b/assets/images/tienphong/ads_full.png differ diff --git a/assets/images/tienphong/logo.png b/assets/images/tienphong/logo.png index 88376e4..7ab2f97 100644 Binary files a/assets/images/tienphong/logo.png and b/assets/images/tienphong/logo.png differ diff --git a/assets/images/tienphong/user.png b/assets/images/tienphong/user.png new file mode 100644 index 0000000..fef56c4 Binary files /dev/null and b/assets/images/tienphong/user.png differ diff --git a/assets/styles/style.scss b/assets/styles/style.scss index 6376ccd..b116555 100644 --- a/assets/styles/style.scss +++ b/assets/styles/style.scss @@ -22,99 +22,103 @@ body { font-family: $font-raleway; } -%headings { - color: $color-text; - font-family: $font-gelasio; - line-height: 130%; - font-weight: 700; -} +// %headings { +// color: $color-text; +// font-family: $font-gelasio; +// line-height: 130%; +// font-weight: 700; +// } -%label { - color: $color-text; - font-family: $font-raleway; - line-height: 130%; - font-weight: 700; -} +// %label { +// color: $color-text; +// font-family: $font-raleway; +// line-height: 130%; +// font-weight: 700; +// } -%paragraph { - color: $color-paragraph; - font-family: $font-raleway; - line-height: 180%; - font-weight: 500; -} +// %paragraph { +// color: $color-paragraph; +// font-family: $font-raleway; +// line-height: 180%; +// font-weight: 500; +// } -h1, h2, h3, h4, h5, h6 { - font-family: $font-gelasio; -} +// h1, h2, h3, h4, h5, h6 { +// font-family: $font-gelasio; +// } -h1 a { - @extend %headings; - font-size: 64px; -} +// h1 a { +// @extend %headings; +// font-size: 64px; +// } -h2 a{ - @extend %headings; - font-size: 44px; -} +// h2 a{ +// @extend %headings; +// font-size: 44px; +// } -h3 a{ - @extend %headings; - font-size: 24px; -} +// h3 a{ +// @extend %headings; +// font-size: 24px; +// } -h4 a{ - @extend %headings; - font-size: 20px; -} +// h4 a{ +// @extend %headings; +// font-size: 20px; +// } -h5 a{ - @extend %headings; - font-size: 18px; -} +// h5 a{ +// @extend %headings; +// font-size: 18px; +// } -h6 a{ - @extend %headings; - font-size: 16px; -} +// h6 a{ +// @extend %headings; +// font-size: 16px; +// } -h6.h6-plus a { - @extend %headings; - font-size: 14px; - font-weight: 500; -} +// h6.h6-plus a { +// @extend %headings; +// font-size: 14px; +// font-weight: 500; +// } -label { - &.label-l1 { - @extend %label; - font-size: 18px; - } +// label { +// &.label-l1 { +// @extend %label; +// font-size: 18px; +// } - &.label-l2 { - @extend %label; - font-size: 16px; - } +// &.label-l2 { +// @extend %label; +// font-size: 16px; +// } - &.label-l3 { - @extend %label; - font-size: 14px; - } -} +// &.label-l3 { +// @extend %label; +// font-size: 14px; +// } +// } -p { - &.paragraph-p1 { - font-size: 18px; - } +// p { +// &.paragraph-p1 { +// font-size: 18px; +// } - &.paragraph-p2 { - font-size: 16px; - } +// &.paragraph-p2 { +// font-size: 16px; +// } - &.paragraph-p2 { - font-size: 14px; - } +// &.paragraph-p2 { +// font-size: 14px; +// } +// } + +a { + @apply hover:text-primary font-gelasio font-700 leading-130%; } figure { @@ -125,27 +129,27 @@ img { object-fit: cover!important; } -.content { - & p { - @apply mb-2 font-arial leading-160%; - } +// .content { +// & p { +// @apply mb-2 font-arial leading-160%; +// } - & #title { - @apply font-merriweather font-bold leading-150%; - } +// & #title { +// @apply font-merriweather font-bold leading-150%; +// } - & #intro, & #sub { - @apply font-arial font-medium leading-160%; - } +// & #intro, & #sub { +// @apply font-arial font-medium leading-160%; +// } - & audio { - @apply w-full; - } +// & audio { +// @apply w-full; +// } - & document, & a, & custom-figure, & author { - @apply cursor-pointer text-primary-600; - } -} +// & document, & a, & custom-figure, & author { +// @apply cursor-pointer text-primary; +// } +// } div[layout="TYPE:Detail-LAYOUT:image"] { & p,& figure.align-center-image, & #sub, & #title, & #intro, & #breadcrumb, & #navigation__bottom { diff --git a/components/article/Event.vue b/components/article/Event.vue index 50c0dbb..b46c1ae 100644 --- a/components/article/Event.vue +++ b/components/article/Event.vue @@ -6,7 +6,7 @@ const props = defineProps<{ events: any[] }>()

Sự kiện

diff --git a/components/article/immerse/Quiz.vue b/components/article/immerse/Quiz.vue index 23ec612..ad3858a 100644 --- a/components/article/immerse/Quiz.vue +++ b/components/article/immerse/Quiz.vue @@ -274,7 +274,7 @@ async function submitSend() {}
  • diff --git a/components/dynamic-page/page-component/templates/advertisings/advertisings/Main.vue b/components/dynamic-page/page-component/templates/advertisings/advertisings/Main.vue index 1d8fe3b..12fdd45 100644 --- a/components/dynamic-page/page-component/templates/advertisings/advertisings/Main.vue +++ b/components/dynamic-page/page-component/templates/advertisings/advertisings/Main.vue @@ -1,15 +1,13 @@ diff --git a/components/dynamic-page/page-component/templates/advertisings/advertisings/index.vue b/components/dynamic-page/page-component/templates/advertisings/advertisings/index.vue index d9e3be3..cd28de2 100644 --- a/components/dynamic-page/page-component/templates/advertisings/advertisings/index.vue +++ b/components/dynamic-page/page-component/templates/advertisings/advertisings/index.vue @@ -13,7 +13,6 @@ const definedDynamicComponent: Record = { }; const getCurrentComponent = computed(() => _props.settings.layout); - const GET_PROPS = computed(() => { return () => { let props: any = {}; diff --git a/components/dynamic-page/page-component/templates/advertisings/index.vue b/components/dynamic-page/page-component/templates/advertisings/index.vue index 114a0e3..f25e66c 100644 --- a/components/dynamic-page/page-component/templates/advertisings/index.vue +++ b/components/dynamic-page/page-component/templates/advertisings/index.vue @@ -11,7 +11,7 @@ const definedDynamicComponent: Record = { [enumPageComponentTemplate[enumPageComponentKey.ADVERTISING]["ADVERTISING"]]: Advertisings, }; -const getCurrentComponent = computed(() => `${_props.settings.layout}`); +const getCurrentComponent = computed(() => `${_props.settings.template}`); const GET_PROPS = computed(() => { return () => { let props: any = {}; @@ -26,6 +26,7 @@ const GET_PROPS = computed(() => { } }; }); +// console.log(getCurrentComponent.value, 'quảng caosd ád')