From d9fb3248650404ad6d078eba39b8b91381b1ebed Mon Sep 17 00:00:00 2001 From: Jieiku Date: Mon, 22 May 2023 23:07:56 -0700 Subject: Fixes for uglyurls --- sass/_font-extend-COPY-ME.sass | 8 ++++---- sass/_font-extend.sass | 16 ++++++++-------- sass/_imports.scss | 20 ++++++++++---------- sass/function/_font.sass | 4 ++-- sass/include/_embedded.scss | 4 ++-- sass/include/_hr.scss | 2 +- sass/include/_icons.scss | 2 +- sass/include/_nav.scss | 2 +- sass/include/_sectioning.scss | 4 ++-- sass/include/_typography.scss | 2 +- sass/include/_zola.scss | 4 +--- 11 files changed, 33 insertions(+), 35 deletions(-) (limited to 'sass') diff --git a/sass/_font-extend-COPY-ME.sass b/sass/_font-extend-COPY-ME.sass index 658ebbd..148f883 100644 --- a/sass/_font-extend-COPY-ME.sass +++ b/sass/_font-extend-COPY-ME.sass @@ -6,10 +6,10 @@ // or : import it with '@use "_font-extend-COPY-ME"' in whatever existing sass file you already load // delete the following two lines if you want to prepend your fonts... -$findFont-Main : "Segoe UI" // ← append custom MAIN font(s) AFTER this (full list @ '_variables.scss') -$findFont-Code : "Segoe UI Mono" // ← append custom CODE font(s) AFTER this -$fontExt-Main : ("MAIN FONT 1", "MAIN FONT 2") // list of custom MAIN font(s) to append -$fontExt-Code : ("CODE FONT 1", "CODE FONT 2") // list of custom CODE font(s) to append +$findFont-Main : "Segoe UI" // ← append custom MAIN font(s) AFTER this (full list @ '_variables.scss') +$findFont-Code : "Segoe UI Mono" // ← append custom CODE font(s) AFTER this +$fontExt-Main : ("MAIN FONT 1", "MAIN FONT 2") // list of custom MAIN font(s) to append +$fontExt-Code : ("CODE FONT 1", "CODE FONT 2") // list of custom CODE font(s) to append // ...and delete the corresponding variables ↓ @use "../themes/abridge/sass/font-extend" with($findFont-Main:$findFont-Main, $findFont-Code:$findFont-Code,$fontExt-Main:$fontExt-Main,$fontExt-Code:$fontExt-Code) diff --git a/sass/_font-extend.sass b/sass/_font-extend.sass index 35f7a50..9c612c4 100644 --- a/sass/_font-extend.sass +++ b/sass/_font-extend.sass @@ -1,14 +1,14 @@ @use "sass:meta" -@use "variables" as var -@use "function/font" as f +@use "variables" as var +@use "function/font" as f -$findFont-Main : null !default -$findFont-Code : null !default -$fontExt-Main : null !default -$fontExt-Code : null !default +$findFont-Main : null !default +$findFont-Code : null !default +$fontExt-Main : null !default +$fontExt-Code : null !default -$typeMain : meta.type-of($fontExt-Main) -$typeCode : meta.type-of($fontExt-Code) +$typeMain : meta.type-of($fontExt-Main) +$typeCode : meta.type-of($fontExt-Code) @if ($typeMain == 'string') or ($typeMain == 'list') @if ($findFont-Main == null) // prepend diff --git a/sass/_imports.scss b/sass/_imports.scss index b615533..95a58e3 100644 --- a/sass/_imports.scss +++ b/sass/_imports.scss @@ -15,6 +15,16 @@ // Config @forward "variables" as var-*; +@forward "colors/orange" as colors-*; +//@forward "colors/blue" as colors-*; +//@forward "colors/blueshade" as colors-*; + +//@use "fonts/Roboto"; +//@use "fonts/Roboto-Mono"; // Monospaced +//@use "fonts/Arimo"; +//@use "fonts/FiraCode"; // Monospaced +//@use "fonts/Abridge"; // Icon Font (don't recommend, CSS only icons are in my opinion better.) + // Includes - Sorted by importance/category (includes at top are needed most frequently) @use "include/document"; // html @use "include/typography"; // a, headings, p, ul, blockquote, ... @@ -40,13 +50,3 @@ //@use "include/grid"; // section infinite grid -- test/rework this similar to hnav and milligram in that it should collapse to a single column as the page becomes narrow //@use "include/misc"; // template, [hidden], dialog, canvas - -//@use "fonts/Roboto"; -//@use "fonts/Roboto-Mono"; // Monospaced -//@use "fonts/Arimo"; -//@use "fonts/FiraCode"; // Monospaced -//@use "fonts/Abridge"; // Icon Font (don't recommend, CSS only icons are in my opinion better.) - -@forward "colors/orange" as colors-*; -//@forward "colors/blue" as colors-*; -//@forward "colors/blueshade" as colors-*; diff --git a/sass/function/_font.sass b/sass/function/_font.sass index 95704c9..45f8fc3 100644 --- a/sass/function/_font.sass +++ b/sass/function/_font.sass @@ -2,8 +2,8 @@ @use "sass:list" @function font-append($base, $ext, $font-sep) - $base-pre : () - $base-pos : () + $base-pre : () + $base-pos : () $iFontSep : index($base, $font-sep) @if not $iFontSep // didn't find the font separator, return @debug "⚠ Failed to find '#{$font-sep}' in the list of '#{$base}'" diff --git a/sass/include/_embedded.scss b/sass/include/_embedded.scss index cff161e..bd1dbb8 100644 --- a/sass/include/_embedded.scss +++ b/sass/include/_embedded.scss @@ -4,13 +4,13 @@ .yvi {//youtube and vimeo iframe position: absolute; top: 0; - left: 0 + left: 0; } .yv {//youtube and vimeo div position: relative; padding-bottom: 56.25%; height: 0; - overflow: hidden + overflow: hidden; } img, video, diff --git a/sass/include/_hr.scss b/sass/include/_hr.scss index d6215dc..501bdf0 100644 --- a/sass/include/_hr.scss +++ b/sass/include/_hr.scss @@ -10,6 +10,6 @@ hr { height: 0; // 1 overflow: visible; // 2 border: none; - border-top: 1px solid var(--f1) + border-top: 1px solid var(--f1); } header hr, footer hr {border-top: 1px solid var(--c4)} diff --git a/sass/include/_icons.scss b/sass/include/_icons.scss index 511905d..907bcda 100644 --- a/sass/include/_icons.scss +++ b/sass/include/_icons.scss @@ -117,7 +117,7 @@ display: inline-block; //overflow: hidden; text-align: center; - vertical-align: middle + vertical-align: middle; } .svgs { width: var(--fs); diff --git a/sass/include/_nav.scss b/sass/include/_nav.scss index efad0ec..537f23d 100644 --- a/sass/include/_nav.scss +++ b/sass/include/_nav.scss @@ -128,7 +128,7 @@ footer nav { margin: var(--s2) 0 var(--s1); } div { - margin: auto // keeps top menu/search centered in mobile view + margin: auto; // keeps top menu/search centered in mobile view } } } diff --git a/sass/include/_sectioning.scss b/sass/include/_sectioning.scss index 36b0a8e..a84842d 100644 --- a/sass/include/_sectioning.scss +++ b/sass/include/_sectioning.scss @@ -77,12 +77,12 @@ header, main { padding-bottom: 0; margin-bottom: 0; hr { - margin:0.1rem 0 + margin:0.1rem 0; } } footer{ line-height: var(--lhh); hr, p { - margin: 0.1rem 0 .3rem + margin: 0.1rem 0 .3rem; } } diff --git a/sass/include/_typography.scss b/sass/include/_typography.scss index 8eaa7f9..7ed6096 100644 --- a/sass/include/_typography.scss +++ b/sass/include/_typography.scss @@ -46,7 +46,7 @@ a:hover { } h1 a, h2 a, main nav a { color: var(--f2); - text-decoration:none; + text-decoration: none; &:hover { color: var(--a3); text-decoration: none; diff --git a/sass/include/_zola.scss b/sass/include/_zola.scss index 2dd0b70..2b29a58 100644 --- a/sass/include/_zola.scss +++ b/sass/include/_zola.scss @@ -10,9 +10,7 @@ .s70 {font-size: .70em} .hpad {padding: 0 .2rem} .rpad {padding-right: .2rem} -.si { - font-size: 1.5em -} +.si {font-size: 1.5em} pre code[data-lang]::before { color: var(--f1); text-transform: uppercase; -- cgit v1.3.1