diff --git a/src/assets/scss/footer.scss b/src/assets/scss/footer.scss index 769b053..02ffff3 100644 --- a/src/assets/scss/footer.scss +++ b/src/assets/scss/footer.scss @@ -3,7 +3,7 @@ // varible declare $fontColor: white; $backgroundColor: #1f4163; -$fontFamily: 'Noto Sans CJK TC', monospace; +$fontFamily: 'Noto Sans TC', monospace; @mixin fontSize() { font-size: 14pt; diff --git a/src/assets/scss/main.scss b/src/assets/scss/main.scss index 5d1877b..cf12d53 100644 --- a/src/assets/scss/main.scss +++ b/src/assets/scss/main.scss @@ -32,7 +32,7 @@ body { flex-direction: column; font-size: 13pt; - font-family: 'Noto Sans CJK TC', sans-serif; + font-family: 'Noto Sans TC', sans-serif; } #app { diff --git a/src/assets/scss/news/agenda.scss b/src/assets/scss/news/agenda.scss index 063dba8..ce72cca 100644 --- a/src/assets/scss/news/agenda.scss +++ b/src/assets/scss/news/agenda.scss @@ -22,12 +22,29 @@ $max-width-small-3: 360px; // .info-container @mixin infoContainer() { max-width: 80%; +<<<<<<< HEAD // padding-left: 7%; @media only screen and (max-width: 1030px){ max-width: 100%; padding-left: 40px; padding-right: 40px; } +======= + @media screen and (max-width: 1365px) { + margin: 0 120px; + } + + @media screen and (max-width: 1023px) { + margin: 0 100px; + } + + @media screen and (max-width: $max-width-small-0) { + margin: 0; + max-width: 100%; + padding-left: 40px; + padding-right: 40px; + } +>>>>>>> dev2 } // .info-section @@ -215,10 +232,10 @@ $max-width-small-3: 360px; @mixin qaTitleFontsize() { font-size: 18pt; @media only screen and (max-width: $max-width-medium-0) { - font-size: 17pt; + font-size: 16pt; } @media only screen and (max-width: $max-width-medium-1) { - font-size: 15pt; + font-size: 14pt; } @media only screen and (max-width: $max-width-small-0) { font-size: 11pt; @@ -360,7 +377,7 @@ $max-width-small-3: 360px; &-container { @include infoContainer(); - margin: 0 auto; + margin: 0 280px; // float: left; } diff --git a/src/assets/scss/news/header.scss b/src/assets/scss/news/header.scss index 245f2c8..924e5d2 100644 --- a/src/assets/scss/news/header.scss +++ b/src/assets/scss/news/header.scss @@ -346,82 +346,3 @@ $fontFamily: Noto Sans TC, monospace; } } } - -.news-nav { - position: fixed; - text-align: end; - top: 25px; - right: 50px; - display: flex; - flex-direction: column; - border-radius: 15px; - padding: 10px; - box-shadow: 3px 3px 15px $mid-blue; - background: white; - z-index: 5; - &-item { - margin: 0 8px; - padding: 5px 1em; - color: $mid-blue; - font-family: $fontFamily; - cursor: point; - border-right: 3px solid $sky-blue; - - &.active { - font-weight: 900; - border-right: 3px solid $mid-blue; - } - } - &-button { - color: $mid-blue; - border: none; - background: transparent; - font-size: 20px; - cursor: point; - &:focus { - outline: none; - } - } - &-contribute-button { - display: inline-block; - border-radius: 6px; - background: $mid-blue; - color: $white; - font-weight: 900; - padding: 0.5em 1em; - font-size: 1.2em; - margin: 1em auto; - } -} - -.nav-control-button { - color: $mid-blue; - position: fixed; - z-index: 5; - top: 25px; - right: 50px; - border-radius: 5px; - border: none; - font-size: 24px; - position: flex; - flex-direction: column; - width: 55px; - background-color: white; - box-shadow: -2px 0 15px $mid-blue; - padding: 0 15px; - cursor: pointer; - p { - text-align: end; - } -} - -@media screen and (max-width: 1024px) { - .nav-control-button { - top: 250px; - right: 0; - width: 35px; - font-size: 16px; - text-align: left; - padding: 0 10px; - } -} \ No newline at end of file diff --git a/src/assets/scss/news/navbar.scss b/src/assets/scss/news/navbar.scss new file mode 100644 index 0000000..c31e249 --- /dev/null +++ b/src/assets/scss/news/navbar.scss @@ -0,0 +1,114 @@ +@import '../color'; +@import '../font'; + +$mobileView: 1024px; + +#news-nav { + font-size: 13pt; + line-height: 1em; + z-index: 2; + + position: sticky; + top: 25px; + + &.fixed { + position: fixed; + top: 25px; + right: 50px; + } + + a { + text-decoration: none; + } + + .news-nav { + float: right; + text-align: end; + display: flex; + flex-direction: column; + border-radius: 15px; + padding: 10px; + box-shadow: 3px 3px 15px $mid-blue; + background: white; + z-index: 5; + + transform: translateX(0); + transition: transform 0.5s ease-in-out; + + &-item { + margin: 0 8px; + padding: 5px 1em; + color: $mid-blue; + font-family: $fontFamily; + cursor: point; + border-right: 3px solid $sky-blue; + + &.active { + font-weight: 900; + border-right: 3px solid $mid-blue; + } + } + &-button { + color: $mid-blue; + border: none; + background: transparent; + padding: 0.5em 0; + font-size: 20px; + cursor: pointer; + &:focus { + outline: none; + } + } + &-contribute-button { + display: inline-block; + border-radius: 6px; + background: $mid-blue; + color: $white; + font-weight: 900; + padding: 0.5em 1em; + font-size: 1.2em; + margin: 1em auto; + } + } + + .nav-control-button { + color: $mid-blue; + position: fixed; + z-index: 5; + top: 25px; + right: 50px; + border-radius: 5px; + border: none; + font-size: 24px; + position: flex; + flex-direction: column; + width: 55px; + background-color: white; + box-shadow: -2px 0 15px $mid-blue; + padding: 0 15px; + cursor: pointer; + p { + text-align: end; + } + } + + @media screen and (max-width: $mobileView) { + .nav-control-button { + top: 250px; + right: 0; + width: 35px; + font-size: 16px; + text-align: left; + padding: 0 10px; + } + } +} + +@media screen and (max-width: $mobileView) { + #news-nav, + #news-nav.fixed { + position: fixed; + top: 25px; + right: 20px; + } +} \ No newline at end of file diff --git a/src/assets/scss/news/schedule.scss b/src/assets/scss/news/schedule.scss index 735ddac..f4d06fc 100644 --- a/src/assets/scss/news/schedule.scss +++ b/src/assets/scss/news/schedule.scss @@ -1,15 +1,13 @@ @import "../breakpoint"; @import "../color"; -@import "../font.scss"; +@import "../font"; // No need to import font; the fonts have been imported in App.vue // @import '@/assets/scss/font'; -$fontFamily: 'Noto Sans CJK TC', monospace; - #news-schedule { position: relative; max-width: 80vw; - margin: 0 auto; + margin: 0 280px; font-family: $fontFamily; font-size: 15pt; @@ -96,8 +94,16 @@ $fontFamily: 'Noto Sans CJK TC', monospace; font-weight: 900; } -@include md { +@media screen and (max-width: 1365px) { #news-schedule { + margin: 0 120px; + } +} + +@media screen and (max-width: 1023px) { + #news-schedule { + margin: 0 100px; + #presentation-example, #espresso-example { margin-bottom: unset; @@ -112,6 +118,7 @@ $fontFamily: 'Noto Sans CJK TC', monospace; @media screen and (max-width: $max-width-small-0) { #news-schedule { + margin: 0; max-width: 100vw; padding: 0 40px; font-size: 11pt; diff --git a/src/components/news/Header.vue b/src/components/news/Header.vue index 980d0b1..baa92ee 100644 --- a/src/components/news/Header.vue +++ b/src/components/news/Header.vue @@ -46,30 +46,11 @@ - - + + \ No newline at end of file diff --git a/src/components/news/Schedule.vue b/src/components/news/Schedule.vue index cbcb88e..a66da06 100644 --- a/src/components/news/Schedule.vue +++ b/src/components/news/Schedule.vue @@ -1,5 +1,6 @@