From 7342db4ead3fe9d78b5fbc0d958fbc389c42ae21 Mon Sep 17 00:00:00 2001 From: xdavidwu Date: Thu, 24 Sep 2020 20:51:24 +0800 Subject: [PATCH] sass cleanup --- _sass/minimal-mistakes/_archive.scss | 3 -- _sass/minimal-mistakes/_base.scss | 28 +------------------ _sass/minimal-mistakes/_buttons.scss | 2 -- _sass/minimal-mistakes/_footer.scss | 26 ++--------------- _sass/minimal-mistakes/_forms.scss | 1 - _sass/minimal-mistakes/_masthead.scss | 4 +-- _sass/minimal-mistakes/_mixins.scss | 3 -- _sass/minimal-mistakes/_navigation.scss | 7 ----- _sass/minimal-mistakes/_notices.scss | 1 - _sass/minimal-mistakes/_page.scss | 5 ---- _sass/minimal-mistakes/_sidebar.scss | 4 --- _sass/minimal-mistakes/_syntax.scss | 1 - _sass/minimal-mistakes/_tables.scss | 1 - _sass/minimal-mistakes/_utilities.scss | 1 - _sass/minimal-mistakes/_variables.scss | 17 ----------- .../magnific-popup/_magnific-popup.scss | 1 - .../vendor/magnific-popup/_settings.scss | 1 - 17 files changed, 4 insertions(+), 102 deletions(-) diff --git a/_sass/minimal-mistakes/_archive.scss b/_sass/minimal-mistakes/_archive.scss index 38fdc9c..d942acf 100644 --- a/_sass/minimal-mistakes/_archive.scss +++ b/_sass/minimal-mistakes/_archive.scss @@ -42,7 +42,6 @@ .archive__item-title { margin-bottom: 0.25em; - font-family: $sans-serif-narrow; line-height: initial; overflow: hidden; text-overflow: ellipsis; @@ -64,7 +63,6 @@ bottom: 0; } -a:link { text-decoration: none; } a:visited { text-decoration: none; } a:hover { text-decoration: underline; } a:active { text-decoration: underline; } a + a { opacity: 0.5; } @@ -108,7 +106,6 @@ a:link { text-decoration: none; } a:visited { text-decoration: none; } a:hover { margin: 0 auto; padding: 2px 5px; color: #fff; - font-family: $caption-font-family; font-size: $type-size-8; background: #000; text-align: right; diff --git a/_sass/minimal-mistakes/_base.scss b/_sass/minimal-mistakes/_base.scss index 1c612e6..3014c5d 100644 --- a/_sass/minimal-mistakes/_base.scss +++ b/_sass/minimal-mistakes/_base.scss @@ -14,7 +14,6 @@ body { margin: 0; padding: 0; color: $text-color; - font-family: $global-font-family; line-height: 1.5; &.overflow--hidden { @@ -31,13 +30,11 @@ h5, h6 { margin: 1.5em 0 0.5em; line-height: 1.2; - font-family: $header-font-family; font-weight: bold; scroll-margin-top: 2.75rem; } h1 { - margin-top: 0; font-size: $h-size-1; } @@ -149,16 +146,6 @@ button:focus { @extend %tab-focus; } -/* code */ - -tt, -code, -kbd, -samp, -pre { - font-family: $monospace; -} - pre { overflow-x: auto; /* add scrollbars to wide code blocks*/ scrollbar-width: thin; @@ -169,17 +156,10 @@ a > code, li > code, figcaption > code, td > code { - padding-top: 0.1rem; - padding-bottom: 0.1rem; + padding: 0.1em 0.25em; font-size: 0.8em; background: $code-background-color; border-radius: $border-radius; - - &:before, - &:after { - letter-spacing: -0.2em; - content: "\00a0"; /* non-breaking space*/ - } } /* horizontal rule */ @@ -264,7 +244,6 @@ figure { figcaption { margin-bottom: 0.5em; color: $muted-text-color; - font-family: $caption-font-family; font-size: $type-size-6; a { @@ -276,11 +255,6 @@ figcaption { } } -/* Fix IE9 SVG bug */ - -svg:not(:root) { - overflow: hidden; -} /* Navigation lists diff --git a/_sass/minimal-mistakes/_buttons.scss b/_sass/minimal-mistakes/_buttons.scss index cb5c98c..606173c 100644 --- a/_sass/minimal-mistakes/_buttons.scss +++ b/_sass/minimal-mistakes/_buttons.scss @@ -11,9 +11,7 @@ display: inline-block; margin-bottom: 0.25em; padding: 0.5em 1em; - font-family: $sans-serif; font-size: $type-size-6; - font-weight: bold; text-align: center; text-decoration: none; border-width: 0; diff --git a/_sass/minimal-mistakes/_footer.scss b/_sass/minimal-mistakes/_footer.scss index 7a9e490..e14028c 100644 --- a/_sass/minimal-mistakes/_footer.scss +++ b/_sass/minimal-mistakes/_footer.scss @@ -28,23 +28,10 @@ a { color: inherit; - text-decoration: none; - - &:hover { - text-decoration: underline; - } - } - - .fas, - .fab, - .far, - .fal { - color: $muted-text-color; } } .page__footer-copyright { - font-family: $global-font-family; font-size: $type-size-7; } @@ -57,21 +44,12 @@ li { display: inline-block; - padding-top: 5px; - padding-bottom: 5px; - font-family: $sans-serif-narrow; font-size: $type-size-6; text-transform: uppercase; } - li + li:before { - content: ""; - padding-right: 5px; - } - - a { - padding-right: 10px; - font-weight: bold; + li + li { + padding-right: 8px; } .social-icons { diff --git a/_sass/minimal-mistakes/_forms.scss b/_sass/minimal-mistakes/_forms.scss index 1796bed..e6d6e74 100644 --- a/_sass/minimal-mistakes/_forms.scss +++ b/_sass/minimal-mistakes/_forms.scss @@ -51,7 +51,6 @@ button, select, textarea { box-sizing: border-box; - font-family: $sans-serif; } label { diff --git a/_sass/minimal-mistakes/_masthead.scss b/_sass/minimal-mistakes/_masthead.scss index 3b448a8..a766864 100644 --- a/_sass/minimal-mistakes/_masthead.scss +++ b/_sass/minimal-mistakes/_masthead.scss @@ -17,7 +17,6 @@ max-width: 100%; display: flex; justify-content: space-between; - font-family: $sans-serif-narrow; @include breakpoint($x-large) { max-width: $max-width; @@ -41,7 +40,6 @@ display: flex; align-self: center; font-weight: bold; - // z-index: 20; } .site-subtitle { @@ -79,6 +77,6 @@ &--lg { padding-right: 2em; - font-weight: 700; + font-weight: bold; } } diff --git a/_sass/minimal-mistakes/_mixins.scss b/_sass/minimal-mistakes/_mixins.scss index 39a5411..0ca9332 100644 --- a/_sass/minimal-mistakes/_mixins.scss +++ b/_sass/minimal-mistakes/_mixins.scss @@ -3,9 +3,6 @@ ========================================================================== */ %tab-focus { - /* Default*/ - outline: thin dotted $focus-color; - /* Webkit*/ outline: 5px auto $focus-color; outline-offset: -2px; } diff --git a/_sass/minimal-mistakes/_navigation.scss b/_sass/minimal-mistakes/_navigation.scss index 074589b..8d5ecd4 100644 --- a/_sass/minimal-mistakes/_navigation.scss +++ b/_sass/minimal-mistakes/_navigation.scss @@ -12,7 +12,6 @@ max-width: 100%; padding-left: 1em; padding-right: 1em; - font-family: $sans-serif; animation: $intro-transition; animation-delay: 0.3s; @@ -60,7 +59,6 @@ margin: 0; padding: 0; list-style-type: none; - font-family: $sans-serif; } li { @@ -72,7 +70,6 @@ display: block; margin-bottom: 0.25em; padding: 0.5em 1em; - font-family: $sans-serif; font-size: 14px; font-weight: bold; line-height: 1.5; @@ -122,7 +119,6 @@ padding: 1em 2em; float: left; width: 50%; - font-family: $sans-serif; font-size: $type-size-5; font-weight: bold; text-align: center; @@ -422,7 +418,6 @@ .nav__title { margin: 0; padding: 0.5rem 0.75rem; - font-family: $sans-serif-narrow; font-size: $type-size-5; font-weight: bold; } @@ -431,7 +426,6 @@ display: block; margin: 0.5rem 0; padding: 0.25rem 0; - font-family: $sans-serif-narrow; font-size: $type-size-6; font-weight: bold; text-transform: uppercase; @@ -443,7 +437,6 @@ ========================================================================== */ .toc { - font-family: $sans-serif-narrow; color: $gray; background-color: $background-color; border: 1px solid $border-color; diff --git a/_sass/minimal-mistakes/_notices.scss b/_sass/minimal-mistakes/_notices.scss index 5c087ed..9a12a02 100644 --- a/_sass/minimal-mistakes/_notices.scss +++ b/_sass/minimal-mistakes/_notices.scss @@ -14,7 +14,6 @@ margin: 2em 0 !important; /* override*/ padding: 1em; color: $dark-gray; - font-family: $global-font-family; font-size: $type-size-6 !important; text-indent: initial; /* override*/ background-color: mix(#fff, $notice-color, 90%); diff --git a/_sass/minimal-mistakes/_page.scss b/_sass/minimal-mistakes/_page.scss index 35cdee2..368bc86 100644 --- a/_sass/minimal-mistakes/_page.scss +++ b/_sass/minimal-mistakes/_page.scss @@ -71,7 +71,6 @@ body { } .page__lead { - font-family: $global-font-family; font-size: $type-size-4; } @@ -126,13 +125,11 @@ body { dt { margin-top: 1em; - font-family: $sans-serif; font-weight: bold; } dd { margin-left: 1em; - font-family: $sans-serif; font-size: $type-size-6; } @@ -212,7 +209,6 @@ body { margin: 0 auto; padding: 2px 5px; color: #fff; - font-family: $caption-font-family; font-size: $type-size-7; background: #000; text-align: right; @@ -266,7 +262,6 @@ body { .page__meta { margin-top: 2em; color: $muted-text-color; - font-family: $sans-serif; font-size: $type-size-6; p { diff --git a/_sass/minimal-mistakes/_sidebar.scss b/_sass/minimal-mistakes/_sidebar.scss index 2bc5a8b..86c79c1 100644 --- a/_sass/minimal-mistakes/_sidebar.scss +++ b/_sass/minimal-mistakes/_sidebar.scss @@ -48,12 +48,10 @@ h5, h6 { margin-bottom: 0; - font-family: $sans-serif-narrow; } p, li { - font-family: $sans-serif; font-size: $type-size-6; line-height: 1.5; } @@ -162,7 +160,6 @@ } } .sidebar .author__name { - font-family: $sans-serif; font-size: $type-size-5; } @@ -179,7 +176,6 @@ position: relative; display: table-cell; vertical-align: middle; - font-family: $sans-serif; z-index: 20; cursor: pointer; diff --git a/_sass/minimal-mistakes/_syntax.scss b/_sass/minimal-mistakes/_syntax.scss index 7265202..2b9f8f1 100644 --- a/_sass/minimal-mistakes/_syntax.scss +++ b/_sass/minimal-mistakes/_syntax.scss @@ -8,7 +8,6 @@ figure.highlight { margin-bottom: 1em; background: $base00; color: $base05; - font-family: $monospace; font-size: $type-size-6; line-height: 1.8; border-radius: $border-radius; diff --git a/_sass/minimal-mistakes/_tables.scss b/_sass/minimal-mistakes/_tables.scss index c270a77..1b1cd97 100644 --- a/_sass/minimal-mistakes/_tables.scss +++ b/_sass/minimal-mistakes/_tables.scss @@ -6,7 +6,6 @@ table { display: block; margin-bottom: 1em; width: 100%; - font-family: $global-font-family; font-size: $type-size-6; border-collapse: collapse; overflow-x: auto; diff --git a/_sass/minimal-mistakes/_utilities.scss b/_sass/minimal-mistakes/_utilities.scss index b1ca734..b18fd0a 100644 --- a/_sass/minimal-mistakes/_utilities.scss +++ b/_sass/minimal-mistakes/_utilities.scss @@ -69,7 +69,6 @@ body:hover .visually-hidden button { position: fixed; z-index: 20; margin: 0; - font-family: $sans-serif; white-space: nowrap; } diff --git a/_sass/minimal-mistakes/_variables.scss b/_sass/minimal-mistakes/_variables.scss index cc53de9..d4b698a 100644 --- a/_sass/minimal-mistakes/_variables.scss +++ b/_sass/minimal-mistakes/_variables.scss @@ -15,24 +15,7 @@ $paragraph-indent: false !default; // true, false (default) $indent-var: 1em !default; /* system typefaces */ -$serif: Georgia, Times, serif !default; $sans-serif: 'Noto Sans TC', sans-serif !default; -$monospace: Monaco, Consolas, "Lucida Console", monospace !default; - -/* sans serif typefaces */ -$sans-serif-narrow: $sans-serif !default; -$helvetica: Helvetica, "Helvetica Neue", Arial, sans-serif !default; - -/* serif typefaces */ -$georgia: Georgia, serif !default; -$times: Times, serif !default; -$bodoni: "Bodoni MT", serif !default; -$calisto: "Calisto MT", serif !default; -$garamond: Garamond, serif !default; - -$global-font-family: $sans-serif !default; -$header-font-family: $sans-serif !default; -$caption-font-family: $serif !default; /* type scale */ $type-size-1: 2.441em !default; // ~39.056px diff --git a/_sass/minimal-mistakes/vendor/magnific-popup/_magnific-popup.scss b/_sass/minimal-mistakes/vendor/magnific-popup/_magnific-popup.scss index 27b27bc..b6a31cd 100644 --- a/_sass/minimal-mistakes/vendor/magnific-popup/_magnific-popup.scss +++ b/_sass/minimal-mistakes/vendor/magnific-popup/_magnific-popup.scss @@ -292,7 +292,6 @@ button { font-style: normal; font-size: 28px; - font-family: $serif; &:hover, &:focus { diff --git a/_sass/minimal-mistakes/vendor/magnific-popup/_settings.scss b/_sass/minimal-mistakes/vendor/magnific-popup/_settings.scss index e7866b3..1f6bae2 100644 --- a/_sass/minimal-mistakes/vendor/magnific-popup/_settings.scss +++ b/_sass/minimal-mistakes/vendor/magnific-popup/_settings.scss @@ -40,7 +40,6 @@ $mfp-include-mobile-layout-for-image: true; // Removes pad // Image caption options $mfp-caption-title-color: #f3f3f3; // Caption title color $mfp-caption-subtitle-color: #bdbdbd; // Caption subtitle color -.mfp-counter { font-family: $serif; } // Caption font family // A11y $mfp-use-visuallyhidden: false; \ No newline at end of file -- 2.45.2