diff --git a/assets/styles/app.sass b/assets/styles/app.sass index 68b978d..f7c1290 100644 --- a/assets/styles/app.sass +++ b/assets/styles/app.sass @@ -1,6 +1,4 @@ @import custom.css -body - @apply font-beVietnam text-black-500 // video // max-width: 100% !important diff --git a/assets/styles/custom.css b/assets/styles/custom.css index ea09184..f7e38d6 100644 --- a/assets/styles/custom.css +++ b/assets/styles/custom.css @@ -1,8 +1,8 @@ -@import url('https://fonts.googleapis.com/css2?family=Nunito:ital,wght@0,200..1000;1,200..1000&display=swap'); +/* @import url('https://fonts.googleapis.com/css2?family=Nunito:ital,wght@0,200..1000;1,200..1000&display=swap'); @import url('https://fonts.googleapis.com/css2?family=Be+Vietnam+Pro:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap'); @import url('https://fonts.googleapis.com/css2?family=Archivo:ital,wght@0,100..900;1,100..900&display=swap'); -@import url('https://fonts.googleapis.com/css2?family=Archivo:ital,wght@0,100..900;1,100..900&family=Merriweather:ital,wght@0,300;0,400;0,700;0,900;1,300;1,400;1,700;1,900&display=swap'); +@import url('https://fonts.googleapis.com/css2?family=Archivo:ital,wght@0,100..900;1,100..900&family=Merriweather:ital,wght@0,300;0,400;0,700;0,900;1,300;1,400;1,700;1,900&display=swap'); */ .custom_scrollbar { white-space: nowrap; diff --git a/assets/styles/style.scss b/assets/styles/style.scss index 949f442..6376ccd 100644 --- a/assets/styles/style.scss +++ b/assets/styles/style.scss @@ -16,6 +16,12 @@ $color-line: #EDEDED; // Mixins // extends + +body { + font-size: 14px; + font-family: $font-raleway; +} + %headings { color: $color-text; font-family: $font-gelasio; @@ -37,6 +43,10 @@ $color-line: #EDEDED; font-weight: 500; } +h1, h2, h3, h4, h5, h6 { + font-family: $font-gelasio; +} + h1 a { @extend %headings; font-size: 64px; @@ -154,3 +164,7 @@ div[layout="ARTICLE_PAGE"] { @apply md:gap-20px } } + +.container { + max-width: 1385px; +} \ No newline at end of file diff --git a/components/dynamic-page/page/layouts/Default.vue b/components/dynamic-page/page/layouts/Default.vue index c26f8c7..c7dc2b2 100644 --- a/components/dynamic-page/page/layouts/Default.vue +++ b/components/dynamic-page/page/layouts/Default.vue @@ -61,18 +61,16 @@ const LAYOUT_PARSE = computed(() => { } .layout_container { - padding-top: 40px; - padding-bottom: 40px; + padding-top: 20px; &.center-layout { - max-width: 1300px; + max-width: 1385px; margin: auto; } } .grid-container { display: grid; - grid-template-columns: repeat(1, minmax(0, 1fr)); - /* gap: 40px; */ + grid-template-columns: repeat(1, minmax(0, 1fr)); } diff --git a/components/dynamic-page/page/templates/components/footers/FooterHomeTemplate.vue b/components/dynamic-page/page/templates/components/footers/FooterHomeTemplate.vue index d6373be..c562bff 100644 --- a/components/dynamic-page/page/templates/components/footers/FooterHomeTemplate.vue +++ b/components/dynamic-page/page/templates/components/footers/FooterHomeTemplate.vue @@ -102,13 +102,13 @@ import { enumPageComponentLayouts, enumPageComponentTemplate, enumPageComponentK