From d9eccf612775e3a8871e6eabbfdd29e2b6005b60 Mon Sep 17 00:00:00 2001 From: panr Date: Wed, 16 Oct 2024 09:09:51 +0200 Subject: [PATCH] move font features to @font-face declaration (closes #489) --- assets/css/code.css | 1 - assets/css/fonts.css | 6 +++++- assets/css/footer.css | 1 - assets/css/gist.css | 1 - assets/css/header.css | 1 - assets/css/main.css | 3 --- assets/css/menu.css | 1 - assets/css/pagination.css | 1 - assets/css/post.css | 1 - assets/css/prism.css | 2 -- assets/css/syntax.css | 1 - assets/css/terminal.css | 4 +--- assets/css/terms.css | 1 - 13 files changed, 6 insertions(+), 18 deletions(-) diff --git a/assets/css/code.css b/assets/css/code.css index fb2fc2d..b2ebea5 100644 --- a/assets/css/code.css +++ b/assets/css/code.css @@ -1,4 +1,3 @@ -/* _code.scss */ pre { margin: 20px 0; } diff --git a/assets/css/fonts.css b/assets/css/fonts.css index 9a920b0..8a44e68 100644 --- a/assets/css/fonts.css +++ b/assets/css/fonts.css @@ -1,15 +1,19 @@ -/* _font.scss */ @font-face { font-display: swap; font-family: "Fira Code"; font-style: normal; font-weight: 400; src: url("../fonts/FiraCode-Regular.woff") format("woff"); + font-feature-settings: "liga", "tnum", "zero", "ss01", "locl"; + font-variant-ligatures: contextual; } + @font-face { font-display: swap; font-family: "Fira Code"; font-style: normal; font-weight: 800; src: url("../fonts/FiraCode-Bold.woff") format("woff"); + font-feature-settings: "liga", "tnum", "zero", "ss01", "locl"; + font-variant-ligatures: contextual; } diff --git a/assets/css/footer.css b/assets/css/footer.css index ec64838..12e32de 100644 --- a/assets/css/footer.css +++ b/assets/css/footer.css @@ -1,4 +1,3 @@ -/* _footer.scss */ .footer { padding: 40px 0; flex-grow: 0; diff --git a/assets/css/gist.css b/assets/css/gist.css index 8a05af5..f4d2a51 100644 --- a/assets/css/gist.css +++ b/assets/css/gist.css @@ -1,4 +1,3 @@ -/* _gist.scss */ body .gist .blob-num, body .gist .blob-code-inner { border: none; diff --git a/assets/css/header.css b/assets/css/header.css index aa017af..120dd1c 100644 --- a/assets/css/header.css +++ b/assets/css/header.css @@ -1,4 +1,3 @@ -/* _header.scss */ .header { display: flex; flex-direction: column; diff --git a/assets/css/main.css b/assets/css/main.css index 3117a9f..b771deb 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -1,4 +1,3 @@ -/* _main.scss */ html { box-sizing: border-box; } @@ -20,8 +19,6 @@ body { color: var(--foreground); text-rendering: optimizelegibility; -webkit-font-smoothing: antialiased; - font-feature-settings: "liga", "tnum", "zero", "ss01", "locl"; - font-variant-ligatures: contextual; -webkit-overflow-scrolling: touch; text-size-adjust: 100%; } diff --git a/assets/css/menu.css b/assets/css/menu.css index 87c4b04..f9e77c9 100644 --- a/assets/css/menu.css +++ b/assets/css/menu.css @@ -1,4 +1,3 @@ -/* _menu.scss */ .navigation-menu { display: flex; align-items: flex-start; diff --git a/assets/css/pagination.css b/assets/css/pagination.css index 5cf162b..8198ddd 100644 --- a/assets/css/pagination.css +++ b/assets/css/pagination.css @@ -1,4 +1,3 @@ -/* _pagination.scss */ .pagination { margin-top: 50px; } diff --git a/assets/css/post.css b/assets/css/post.css index f1fe27f..7f2bda6 100644 --- a/assets/css/post.css +++ b/assets/css/post.css @@ -1,4 +1,3 @@ -/* _post.scss */ .index-content { margin-top: 20px; } diff --git a/assets/css/prism.css b/assets/css/prism.css index 653e502..3f5aa47 100644 --- a/assets/css/prism.css +++ b/assets/css/prism.css @@ -1,5 +1,3 @@ -/* _prism.scss */ - /* PrismJS 1.24.1 https://prismjs.com/download.html#themes=prism-tomorrow&languages=markup+css+clike+javascript+actionscript+apacheconf+applescript+bash+c+csharp+cpp+cmake+coffeescript+csp+css-extras+diff+django+docker+elixir+elm+erlang+fsharp+flow+git+go+graphql+haml+handlebars+haskell+http+java+json+kotlin+latex+less+llvm+makefile+markdown+markup-templating+nasm+objectivec+ocaml+perl+php+php-extras+powershell+processing+pug+python+r+jsx+tsx+reason+ruby+rust+sass+scss+scala+scheme+sql+stylus+swift+textile+toml+twig+typescript+vim+visual-basic+wasm+yaml&plugins=line-highlight+line-numbers+jsonp-highlight+highlight-keywords+command-line+toolbar+copy-to-clipboard */ diff --git a/assets/css/syntax.css b/assets/css/syntax.css index c205855..6c3383d 100644 --- a/assets/css/syntax.css +++ b/assets/css/syntax.css @@ -1,4 +1,3 @@ -/* _syntax.scss */ code.language-css, code.language-scss, .token.boolean, diff --git a/assets/css/terminal.css b/assets/css/terminal.css index 0acc318..2749e3c 100644 --- a/assets/css/terminal.css +++ b/assets/css/terminal.css @@ -19,7 +19,7 @@ html { box-sizing: inherit; margin: 0; padding: 0; -} +} body { margin: 0; @@ -38,8 +38,6 @@ body { color: var(--foreground); text-rendering: optimizeLegibility; -webkit-font-smoothing: antialiased; - font-feature-settings: "liga", "tnum", "zero", "ss01", "locl"; - font-variant-ligatures: contextual; -webkit-overflow-scrolling: touch; -webkit-text-size-adjust: 100%; } diff --git a/assets/css/terms.css b/assets/css/terms.css index d6534e3..4524f74 100644 --- a/assets/css/terms.css +++ b/assets/css/terms.css @@ -1,4 +1,3 @@ -/* _terms.scss */ .terms h3 { font-size: initial; }