diff --git a/fonts/AmaticSC-Bold.ttf b/fonts/AmaticSC-Bold.ttf deleted file mode 100644 index 710f9b3..0000000 Binary files a/fonts/AmaticSC-Bold.ttf and /dev/null differ diff --git a/fonts/AmaticSC-Regular.ttf b/fonts/AmaticSC-Regular.ttf deleted file mode 100644 index 2b050ce..0000000 Binary files a/fonts/AmaticSC-Regular.ttf and /dev/null differ diff --git a/fonts/AmaticSC-Regular.woff2 b/fonts/AmaticSC-Regular.woff2 deleted file mode 100644 index d5a98c6..0000000 Binary files a/fonts/AmaticSC-Regular.woff2 and /dev/null differ diff --git a/fonts/ComicNeueAngular-BoldItalic.woff b/fonts/ComicNeueAngular-BoldItalic.woff new file mode 100644 index 0000000..7427fd0 Binary files /dev/null and b/fonts/ComicNeueAngular-BoldItalic.woff differ diff --git a/fonts/ComicNeueAngular-BoldItalic.woff2 b/fonts/ComicNeueAngular-BoldItalic.woff2 new file mode 100644 index 0000000..93c38fc Binary files /dev/null and b/fonts/ComicNeueAngular-BoldItalic.woff2 differ diff --git a/fonts/OpenSans-Bold-webfont.woff b/fonts/OpenSans-Bold-webfont.woff deleted file mode 100644 index 138089c..0000000 Binary files a/fonts/OpenSans-Bold-webfont.woff and /dev/null differ diff --git a/fonts/OpenSans-BoldItalic-webfont.woff b/fonts/OpenSans-BoldItalic-webfont.woff deleted file mode 100644 index 06d3a92..0000000 Binary files a/fonts/OpenSans-BoldItalic-webfont.woff and /dev/null differ diff --git a/fonts/OpenSans-ExtraBold-webfont.woff b/fonts/OpenSans-ExtraBold-webfont.woff deleted file mode 100644 index 93c97e5..0000000 Binary files a/fonts/OpenSans-ExtraBold-webfont.woff and /dev/null differ diff --git a/fonts/OpenSans-ExtraBoldItalic-webfont.woff b/fonts/OpenSans-ExtraBoldItalic-webfont.woff deleted file mode 100644 index daf2840..0000000 Binary files a/fonts/OpenSans-ExtraBoldItalic-webfont.woff and /dev/null differ diff --git a/fonts/OpenSans-Italic-webfont.woff b/fonts/OpenSans-Italic-webfont.woff deleted file mode 100644 index cbce186..0000000 Binary files a/fonts/OpenSans-Italic-webfont.woff and /dev/null differ diff --git a/fonts/OpenSans-Light-webfont.woff b/fonts/OpenSans-Light-webfont.woff deleted file mode 100644 index 085eb47..0000000 Binary files a/fonts/OpenSans-Light-webfont.woff and /dev/null differ diff --git a/fonts/OpenSans-LightItalic-webfont.woff b/fonts/OpenSans-LightItalic-webfont.woff deleted file mode 100644 index eb5d72b..0000000 Binary files a/fonts/OpenSans-LightItalic-webfont.woff and /dev/null differ diff --git a/fonts/OpenSans-Regular-webfont.woff b/fonts/OpenSans-Regular-webfont.woff deleted file mode 100644 index a3f58d4..0000000 Binary files a/fonts/OpenSans-Regular-webfont.woff and /dev/null differ diff --git a/fonts/OpenSans-Semibold-webfont.woff b/fonts/OpenSans-Semibold-webfont.woff deleted file mode 100644 index 66428f6..0000000 Binary files a/fonts/OpenSans-Semibold-webfont.woff and /dev/null differ diff --git a/fonts/OpenSans-SemiboldItalic-webfont.woff b/fonts/OpenSans-SemiboldItalic-webfont.woff deleted file mode 100644 index d017dd6..0000000 Binary files a/fonts/OpenSans-SemiboldItalic-webfont.woff and /dev/null differ diff --git a/fonts/forkawesome-webfont.eot b/fonts/forkawesome-webfont.eot deleted file mode 100644 index dcb9386..0000000 Binary files a/fonts/forkawesome-webfont.eot and /dev/null differ diff --git a/fonts/forkawesome-webfont.svg b/fonts/forkawesome-webfont.svg deleted file mode 100644 index bc0eb99..0000000 --- a/fonts/forkawesome-webfont.svg +++ /dev/null @@ -1,2760 +0,0 @@ - - - - - -Created by FontForge 20180321 at Thu Oct 4 17:05:43 2018 - By Julien Deswaef -The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/OFL). Fork Awesome is a fork based of off Font Awesome 4.7.0 by Dave Gandy. More info on licenses at https://forkawesome.github.io - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/fonts/forkawesome-webfont.ttf b/fonts/forkawesome-webfont.ttf deleted file mode 100644 index 3e0f6b7..0000000 Binary files a/fonts/forkawesome-webfont.ttf and /dev/null differ diff --git a/fonts/forkawesome-webfont.woff b/fonts/forkawesome-webfont.woff deleted file mode 100644 index 70cbee0..0000000 Binary files a/fonts/forkawesome-webfont.woff and /dev/null differ diff --git a/fonts/forkawesome-webfont.woff2 b/fonts/forkawesome-webfont.woff2 deleted file mode 100644 index 9185a85..0000000 Binary files a/fonts/forkawesome-webfont.woff2 and /dev/null differ diff --git a/fonts/teko-bold-webfont.woff b/fonts/teko-bold-webfont.woff deleted file mode 100644 index 592f7cd..0000000 Binary files a/fonts/teko-bold-webfont.woff and /dev/null differ diff --git a/fonts/teko-light-webfont.woff b/fonts/teko-light-webfont.woff deleted file mode 100644 index 3c7030c..0000000 Binary files a/fonts/teko-light-webfont.woff and /dev/null differ diff --git a/fonts/teko-medium-webfont.woff b/fonts/teko-medium-webfont.woff deleted file mode 100644 index 2aa760d..0000000 Binary files a/fonts/teko-medium-webfont.woff and /dev/null differ diff --git a/fonts/teko-regular-webfont.woff b/fonts/teko-regular-webfont.woff deleted file mode 100644 index 91a438d..0000000 Binary files a/fonts/teko-regular-webfont.woff and /dev/null differ diff --git a/fonts/teko-semibold-webfont.woff b/fonts/teko-semibold-webfont.woff deleted file mode 100644 index b87c0c6..0000000 Binary files a/fonts/teko-semibold-webfont.woff and /dev/null differ diff --git a/img/logo.webp b/img/logo.webp new file mode 100644 index 0000000..be73c12 Binary files /dev/null and b/img/logo.webp differ diff --git a/scss/components/_previews.scss b/scss/components/_previews.scss index 5f90280..867e345 100644 --- a/scss/components/_previews.scss +++ b/scss/components/_previews.scss @@ -61,6 +61,7 @@ $comment-peek-height:0px; height: $preview-height; .card-header { + letter-spacing: normal; padding: $lineheight_half/2 $card-header-padding; padding-bottom: $lineheight_half/2 !important; &:before { diff --git a/scss/core/_typography.scss b/scss/core/_typography.scss index b612eea..fdd421f 100644 --- a/scss/core/_typography.scss +++ b/scss/core/_typography.scss @@ -132,15 +132,12 @@ sup, sub { } } -.main-title, .page-title { +h1, .title-1, .main-title, +.page-title { font-family: $titlefont; - @include newTitle(3.815, $fontweight_base); -} - -h1, .title-1 { - font-family: $titlefont; - @include newTitle(2.441, $fontweight_hyper); + @include newTitle(3, $fontweight_hyper); color: $color-primary; + letter-spacing: -3px; } h2, .title-2 { diff --git a/scss/definitions/_fonts.scss b/scss/definitions/_fonts.scss index 1df8696..10ddd57 100644 --- a/scss/definitions/_fonts.scss +++ b/scss/definitions/_fonts.scss @@ -20,11 +20,14 @@ Ubuntu, 'Droid Sans', 'Helvetica Neue', sans-serif; -$titlefont: Amatic SC, sans-serif; +$titlefont: 'Comic Neue Angular', sans-serif; @font-face { - font-family: 'Amatic SC'; - src: url('fonts/AmaticSC-Regular.woff2') format('woff2'); - font-weight: 400; + font-family: 'Comic Neue Angular'; + src: local('Comic Neue Angular Bold Italic'), local('ComicNeueAngular-BoldItalic'), + url('fonts/ComicNeueAngular-BoldItalic.woff2') format('woff2'), + url('fonts/ComicNeueAngular-BoldItalic.woff') format('woff'); + font-weight: bold; + font-style: italic; font-display: swap; -} +} \ No newline at end of file diff --git a/scss/mixins/_panels.scss b/scss/mixins/_panels.scss index eaa25e8..017a2b8 100644 --- a/scss/mixins/_panels.scss +++ b/scss/mixins/_panels.scss @@ -14,6 +14,7 @@ margin-top: $size; &.card-header { margin-top:$card-header-vmargin; + letter-spacing: normal; } } &:last-child { diff --git a/style.css b/style.css index 29ab777..afd060e 100644 --- a/style.css +++ b/style.css @@ -13,9 +13,10 @@ This theme is licensed under the GPLv3. */ @font-face { - font-family: 'Amatic SC'; - src: url("fonts/AmaticSC-Regular.woff2") format("woff2"); - font-weight: 400; + font-family: 'Comic Neue Angular'; + src: local("Comic Neue Angular Bold Italic"), local("ComicNeueAngular-BoldItalic"), url("fonts/ComicNeueAngular-BoldItalic.woff2") format("woff2"), url("fonts/ComicNeueAngular-BoldItalic.woff") format("woff"); + font-weight: bold; + font-style: italic; font-display: swap; } *, @@ -146,18 +147,14 @@ sup > a, sub > a { sup > a:hover, sup > a:focus, sup > a:active, sub > a:hover, sub > a:focus, sub > a:active { color: #a32a64; } -.main-title, .page-title { - font-family: Amatic SC, sans-serif; - font-size: 3.815rem; - line-height: 4.8rem; - font-weight: 400; } - -h1, .title-1 { - font-family: Amatic SC, sans-serif; - font-size: 2.441rem; +h1, .title-1, .main-title, +.page-title { + font-family: "Comic Neue Angular", sans-serif; + font-size: 3rem; line-height: 3.2rem; font-weight: 800; - color: #CB357D; } + color: #CB357D; + letter-spacing: -3px; } h2, .title-2 { font-size: 2.441rem; @@ -409,7 +406,8 @@ nav.pagination { .card > *:first-child, .card > *.sr-only:first-child ~ * { margin-top: 2em; } .card > *:first-child.card-header, .card > *.sr-only:first-child ~ *.card-header { - margin-top: 0.8em; } + margin-top: 0.8em; + letter-spacing: normal; } .card > *:last-child { margin-bottom: 2em; } .card > *:last-child.card-header { @@ -750,6 +748,13 @@ textarea { border-width: 0px; border-style: none; } +.bg-dark { + background-color: #002b36; + color: #FDF7E7; } + .bg-dark a { + color: currentColor; + outline-color: currentColor; } + .c-primary, .btn-primary, .head-primary, .text-primary { --accent-color: #CB357D; --text-color-contrast: #FDF7E7; @@ -1335,6 +1340,7 @@ ul.social { position: relative; height: 12.8rem; } .preview-link .card-header { + letter-spacing: normal; padding: 0.4rem 1.6em; padding-bottom: 0.4rem !important; position: absolute;