From b3e808723a3eafac6b77e8e2c05b5114abf16148 Mon Sep 17 00:00:00 2001 From: Tony Yang Date: Wed, 20 Jan 2021 16:09:31 +0800 Subject: [PATCH] [Style] font size px -> pt Change fint size from px to pt --- src/assets/scss/news/agenda.scss | 106 +++++++++++++++-------------- src/assets/scss/news/schedule.scss | 22 +++--- 2 files changed, 66 insertions(+), 62 deletions(-) diff --git a/src/assets/scss/news/agenda.scss b/src/assets/scss/news/agenda.scss index 394eac7..a0e7693 100644 --- a/src/assets/scss/news/agenda.scss +++ b/src/assets/scss/news/agenda.scss @@ -4,55 +4,59 @@ // .info-container @mixin infoContainer() { - width: 80%; + max-width: 80%; // padding-left: 7%; @media only screen and (max-width: $max-width-small-0) { - width: 89%; - padding-left: 0; + // width: 89%; + max-width: 100%; + padding-left: 40px; + padding-right: 40px; } @media only screen and (max-width: $max-width-small-1) { - width: 89%; - padding-left: 0; + // width: 89%; + max-width: 100%; + padding-left: 40px; + padding-right: 40px; } } // .info-section @mixin sectionH1Fontsize() { - font-size: 44px; + font-size: 32pt; @media only screen and (min-width: $max-width-big-0) { - font-size: 48px; + font-size: 36pt; margin-bottom: 50px; } @media only screen and (max-width: $max-width-medium-0) { - font-size: 38px; + font-size: 28pt; } @media only screen and (max-width: $max-width-medium-1) { - font-size: 32px; + font-size: 24pt; } @media only screen and (max-width: $max-width-small-0) { - font-size: 28px; + font-size: 21pt; } @media only screen and (max-width: $max-width-small-1) { - font-size: 26px; + font-size: 19pt; } } @mixin sectionH2Fontsize() { - font-size: 32px; + font-size: 24pt; @media only screen and (min-width: $max-width-big-0) { - font-size: 36px; + font-size: 27pt; } @media only screen and (max-width: $max-width-medium-0) { - font-size: 30px; + font-size: 22pt; } @media only screen and (max-width: $max-width-medium-1) { - font-size: 26px; + font-size: 19pt; } @media only screen and (max-width: $max-width-small-0) { - font-size: 24px; + font-size: 18pt; } @media only screen and (max-width: $max-width-small-1) { - font-size: 24px; + font-size: 18pt; } } @@ -70,21 +74,21 @@ } @mixin sectionContentParagraphFontsize() { - font-size: 20px; + font-size: 15pt; @media only screen and (max-width: $max-width-big-0) { - font-size: 18.5px; + font-size: 14pt; } @media only screen and (max-width: $max-width-medium-0) { - font-size: 17px; + font-size: 13pt; } @media only screen and (max-width: $max-width-medium-1) { - font-size: 16px; + font-size: 12pt; } @media only screen and (max-width: $max-width-small-0) { - font-size: 15px; + font-size: 11pt; } @media only screen and (max-width: $max-width-small-1) { - font-size: 14px; + font-size: 10pt; } } @@ -141,46 +145,46 @@ } @mixin kindTitleFontsize() { - font-size: 36px; + font-size: 27pt; @media only screen and (max-width: $max-width-big-0) { - font-size: 28px; + font-size: 21pt; } @media only screen and (max-width: $max-width-big) { - font-size: 25px; + font-size: 19pt; } @media only screen and (max-width: $max-width-medium-0) { - font-size: 20px; + font-size: 15pt; } @media only screen and (max-width: $max-width-medium-1) { - font-size: 16px; + font-size: 12pt; } @media only screen and (max-width: $max-width-small-0) { - font-size: 28px; + font-size: 21pt; } @media only screen and (max-width: $max-width-small-1) { - font-size: 20px; + font-size: 15pt; } } @mixin kindTextFontsize() { - font-size: 20px; + font-size: 15pt; @media only screen and (max-width: $max-width-big-0) { - font-size: 17px; + font-size: 13pt; } @media only screen and (max-width: $max-width-big) { - font-size: 16px; + font-size: 12pt; } @media only screen and (max-width: $max-width-medium-0) { - font-size: 14px; + font-size: 11pt; } @media only screen and (max-width: $max-width-medium-1) { - font-size: 12px; + font-size: 9pt; } @media only screen and (max-width: $max-width-small-0) { - font-size: 17px; + font-size: 13pt; } @media only screen and (max-width: $max-width-small-1) { - font-size: 14px; + font-size: 11pt; } } @@ -199,46 +203,46 @@ } @mixin qaTitleFontsize() { - font-size: 24px; + font-size: 18pt; @media only screen and (max-width: $max-width-medium-0) { - font-size: 22px; + font-size: 17pt; } @media only screen and (max-width: $max-width-medium-1) { - font-size: 20px; + font-size: 15pt; } @media only screen and (max-width: $max-width-small-0) { - font-size: 15px; + font-size: 11pt; } @media only screen and (max-width: $max-width-small-1) { - font-size: 12px; + font-size: 9pt; } @media only screen and (max-width: $max-width-small-2) { - font-size: 11px; + font-size: 8pt; } @media only screen and (max-width: $max-width-small-3) { - font-size: 9.3px; + font-size: 7pt; } } @mixin qaTextFontsize() { - font-size: 20px; + font-size: 15pt; @media only screen and (max-width: $max-width-medium-1) { - font-size: 18px; + font-size: 14pt; } @media only screen and (max-width: $max-width-medium-0) { - font-size: 16px; + font-size: 12pt; } @media only screen and (max-width: $max-width-small-0) { - font-size: 14px; + font-size: 11pt; } @media only screen and (max-width: $max-width-small-1) { - font-size: 12px; + font-size: 9pt; } @media only screen and (max-width: $max-width-small-2) { - font-size: 10px; + font-size: 8pt; } @media only screen and (max-width: $max-width-small-3) { - font-size: 8.5px; + font-size: 6.5pt; } } diff --git a/src/assets/scss/news/schedule.scss b/src/assets/scss/news/schedule.scss index f198f2b..6064d10 100644 --- a/src/assets/scss/news/schedule.scss +++ b/src/assets/scss/news/schedule.scss @@ -9,7 +9,7 @@ margin: 0 auto; font-family: $fontFamily; - font-size: 20px; + font-size: 15pt; line-height: 2.1em; letter-spacing: 0.2px; color: $mid-blue; @@ -24,19 +24,19 @@ } h1 { - font-size: 48px; - line-height: 70px; + font-size: 36pt; + line-height: 1.45em; margin: 15px 0; } h2 { - font-size: 36px; - line-height: 70px; + font-size: 27pt; + line-height: 2em; } h3 { - font-size: 24px; - line-height: 30px; + font-size: 18pt; + line-height: 1.25em; } h1, @@ -92,17 +92,17 @@ @include md { #news-schedule { margin: 0 auto; - font-size: 14px; + font-size: 11pt; h1, h2 { - font-size: 26px; + font-size: 20pt; line-height: 2.69em; } h3 { - font-size: 20px; - line-height: 30px; + font-size: 15pt; + line-height: 1.5em; } h1,