From c5ef691077c583ed8c4e4f57ae9dfd3f047ce5d0 Mon Sep 17 00:00:00 2001 From: Emilia Date: Sun, 2 Oct 2022 17:43:59 -0400 Subject: [PATCH] Move base styles out of waltuh.scss --- .../css-purgatory/waltuh/scss/base.scss | 214 ++++++++++++++++++ .../css-purgatory/waltuh/scss/waltuh.scss | 211 ++--------------- 2 files changed, 230 insertions(+), 195 deletions(-) create mode 100644 src/cool-stuff/css-purgatory/waltuh/scss/base.scss diff --git a/src/cool-stuff/css-purgatory/waltuh/scss/base.scss b/src/cool-stuff/css-purgatory/waltuh/scss/base.scss new file mode 100644 index 0000000..9119e5e --- /dev/null +++ b/src/cool-stuff/css-purgatory/waltuh/scss/base.scss @@ -0,0 +1,214 @@ +@use "sass:math"; +/* ----------------- */ +/* Custom Properties */ +/* ----------------- */ +/* + This values are to be overridden + after being injected into + the global scope. +*/ + + /* colors */ + +$color-dark: hsl(0 0% 0%); /* Black */ +$color-light: hsl(0 0% 50%); /* Gray */ +$color-white: hsl(0 0% 100%);/* White */ + + /* font */ + + /* Sizes divided by 16 so values given in px */ +$fs-900: math.div(125rem, 16); +$fs-800: math.div(75rem, 16); +$fs-700: math.div(56rem, 16); +$fs-600: math.div(32rem, 16); +$fs-500: math.div(28rem, 16); +$fs-400: math.div(24rem, 16); +$fs-300: math.div(18rem, 16); +$fs-200: math.div(16rem, 16); + +$ff-serif: serif; +$ff-sans-cond: sans-serif; +$ff-sans: sans-serif; + +@mixin utility{ +/* --------------- */ +/* Utility Classes */ +/* --------------- */ + +/* Layouts */ + +.container { + padding-inline: clamp(0.5rem, 4rem, 5rem); + margin-inline: auto; + max-width: 80rem; +} + +.flex { + display: flex; + gap: 2rem; +} + +.column { + justify-content: center; + align-items: center; + flex-direction: column; + align-content: center; +} + +.row { + flex-direction: row; + flex-wrap: wrap; + justify-content: space-evenly; + align-content: baseline; + max-width: 100%; +} + +.two-columns { + display: grid; + /* Will shrink to one column, never exceed two! + * The `max` in `minmax` asks that the columns + * be no smaller */ + grid-template-columns: repeat(auto-fit, minmax(max(30rem, 40%), 1fr)); + column-gap: 1rem; + justify-content: space-evenly; +} + +.lock-bottom { + position: absolute; + bottom: 0%; +} + +/* Other */ + +.hr::after { /* Add fake hr after header */ + content: ''; + + position: absolute; + display: block; + clear: both; + width: 100%; + height: 0.15rem; + + background-color: black; +} + +/* Color Classes */ + +.bg-dark { background-color: $color-dark; } +.bg-light { background-color: $color-light; } +.bg-white { background-color: $color-white; } + +.text-dark { color: $color-dark; } +.text-light { color: $color-light; } +.text-white { color: $color-white; } + +/* Font Classes */ + +.fs-900 { font-size: $fs-900; } +.fs-800 { font-size: $fs-800; } +.fs-700 { font-size: $fs-700; } +.fs-600 { font-size: $fs-600; } +.fs-500 { font-size: $fs-500; } +.fs-400 { font-size: $fs-400; } +.fs-300 { font-size: $fs-300; } +.fs-200 { font-size: $fs-200; } + +.ff-serif { font-family: $ff-serif; } +.ff-sans-cond { font-family: $ff-sans-cond; } +.ff-sans { font-family: $ff-sans; } + +.uppercase { text-transform: uppercase; } +.lowercase { text-transform: lowercase; } + +/* Semantic Tags and Their Classes */ + +header { + margin-bottom: 3vh; +} + +section:not(:last-of-type) { + margin-bottom: 3vh; +} + +footer { + margin-top: 3vh; +} +} + +@mixin reset { +/* ----- */ +/* Reset */ +/* ----- */ + +*, +*::before, +*::after { + box-sizing: border-box; +} + +body, h1, h2, h3, h4, h5, h6, p { + margin: 0; +} + +h1, h2, h3, h4, h5, h6, p { + font-weight: 400; +} + +h1, h2, h3 { + line-height: 1.1; +} + +body { + font-family: $ff-sans; + font-size: $fs-400; + color: $color-dark; + background-color: $color-white; + line-height: 1.5; + min-height: 100vh; +} + +main { + margin-left: 1vw; + margin-top: 1vh; + * { + z-index: 2; + } +} + +footer { + z-index: 2; +} + +img, picture { + max-width: 100%; + display: block; +} + +input, button, textarea, select { + font: inherit; +} + +@media (prefers-reduced-motion: reduce) { + *, + *::before, + *::after { + animation-duration: 0.01ms !important; + animation-iteration-count: 1 !important; + transition-duration: 0.01ms !important; + scroll-behaviour: auto !important; + } +} + +} + +/* -------------------- */ +/* Non-Reusable Classes */ +/* -------------------- */ +/* meant for these pages + * only, not to be used + * in practice */ + +.colors--block { + padding: 3rem 1rem 1rem; + border: 1px solid black; +} diff --git a/src/cool-stuff/css-purgatory/waltuh/scss/waltuh.scss b/src/cool-stuff/css-purgatory/waltuh/scss/waltuh.scss index d52c613..80ff409 100644 --- a/src/cool-stuff/css-purgatory/waltuh/scss/waltuh.scss +++ b/src/cool-stuff/css-purgatory/waltuh/scss/waltuh.scss @@ -1,21 +1,18 @@ @use "sass:color"; @use "sass:math"; -/* ----------------- */ -/* Custom Properties */ -/* ----------------- */ -/* Many of the prop- - * erties here are - * where the substa- - * ntive changes - * will be made */ +@use "base" as *; - /* colors */ +/* ------ */ +/* */ +/* Waltuh */ +/* */ +/* ------ */ -$color-white: hsl(280 30% 80%);/* White */ -$color-dark: color.adjust($color-white, $lightness: -50%); /* Black */ -$color-light: hsl(190 80% 30%); /* Gray */ +/* Initial Variable Resets */ - /* font */ +$color-white: hsl(280 30% 80%); +$color-dark: color.adjust($color-white, $lightness: -50%); +$color-light: hsl(190 80% 30%); @font-face { font-family: "Inconsolata"; @@ -24,6 +21,7 @@ $color-light: hsl(190 80% 30%); /* Gray */ font-display: swap; font-variation-settings: "wdth" 85; } + @font-face { font-family: "Jost"; src: url("fonts/Jost.ttf"); @@ -31,149 +29,10 @@ $color-light: hsl(190 80% 30%); /* Gray */ font-display: swap; } - /* Sizes divided by 16 so values given in px */ -$fs-900: calc(100rem / 16); -$fs-800: calc(75rem / 16); -$fs-700: calc(56rem / 16); -$fs-600: calc(32rem / 16); -$fs-500: calc(28rem / 16); -$fs-400: calc(24rem / 16); -$fs-300: calc(18rem / 16); -$fs-200: calc(16rem / 16); - $ff-serif: "Inconsolata", monospace; -$ff-sans-cond: sans-serif; $ff-sans: "Jost", sans-serif; - -/* ----- */ -/* Reset */ -/* ----- */ - -*, -*::before, -*::after { - box-sizing: border-box; -} - -body, h1, h2, h3, h4, h5, h6, p { - margin: 0; -} - -h1, h2, h3, h4, h5, h6, p { - font-weight: 400; -} - -h1, h2, h3 { - line-height: 1.1; -} - -body { - font-family: $ff-sans; - font-size: $fs-400; - color: $color-dark; - background-color: $color-white; - line-height: 1.5; - min-height: 100vh; -} - -main { - margin-left: 1vw; - margin-top: 1vh; -} - -img, picture { - max-width: 100%; - display: block; -} - -input, button, textarea, select { - font: inherit; -} - -@media (prefers-reduced-motion: reduce) { - *, - *::before, - *::after { - animation-duration: 0.01ms !important; - animation-iteration-count: 1 !important; - transition-duration: 0.01ms !important; - scroll-behaviour: auto !important; - } -} - - -/* --------------- */ -/* Utility Classes */ -/* --------------- */ - -/* Layouts */ - -.container { - padding-inline: clamp(0.5rem, 4rem, 5rem); - margin-inline: auto; - max-width: 80rem; -} - -.flex { - display: flex; - gap: 2rem; -} - -.column { - justify-content: center; - align-items: center; - flex-direction: column; - align-content: center; -} - -.row { - flex-direction: row; - flex-wrap: wrap; - justify-content: space-evenly; - align-content: baseline; - max-width: 100%; -} - -.two-columns { - display: grid; - /* Will shrink to one column, never exceed two! - * The `max` in `minmax` asks that the columns - * be no smaller */ - grid-template-columns: repeat(auto-fit, minmax(max(30rem, 40%), 1fr)); - column-gap: 1rem; - justify-content: space-evenly; -} - -.lock-bottom { - position: absolute; - bottom: 0%; -} - -/* Other */ - -.hr::after { /* Add fake hr after header */ - content: ''; - - position: absolute; - display: block; - clear: both; - width: 100%; - height: 0.15rem; - - background-color: black; -} - -/* Color Classes */ - -.bg-dark { background-color: $color-dark; } -.bg-light { background-color: $color-light; } -.bg-white { background-color: $color-white; } - -.text-dark { color: $color-dark; } -.text-light { color: $color-light; } -.text-white { color: $color-white; } - -/* Font Classes */ +$fs-900: math.div(100rem, 16); +@debug "ff-serif is #{$ff-serif}"; .fs-900 { font-size: $fs-900; font-weight: 400;} .fs-800 { font-size: $fs-800; font-weight: 300;} @@ -181,41 +40,11 @@ input, button, textarea, select { .fs-600 { font-size: $fs-600; font-weight: 300;} .fs-500 { font-size: $fs-500; font-weight: 200;} .fs-400 { font-size: $fs-400; font-weight: 200;} -.fs-300 { font-size: $fs-300; } -.fs-200 { font-size: $fs-200; } -.ff-serif { font-family: $ff-serif; } -.ff-sans-cond { font-family: $ff-sans-cond; } -.ff-sans { font-family: $ff-sans; } +/* --- */ -.uppercase { text-transform: uppercase; } -.lowercase { text-transform: lowercase; } - -/* Semantic Tags and Their Classes */ - -header { - margin-bottom: 3vh; -} - -section:not(:last-of-type) { - margin-bottom: 3vh; -} - -footer { - margin-top: 3vh; -} - -/* -------------------- */ -/* Non-Reusable Classes */ -/* -------------------- */ -/* meant for these pages - * only, not to be used - * in practice */ - -.colors--block { - padding: 3rem 1rem 1rem; - border: 1px solid black; -} +@include utility; +@include reset; @keyframes waltuh-gradient-anim { $r: 6em; @@ -268,11 +97,3 @@ footer { animation: overlay-breathe 4s ease infinite alternate; } -main { - * { - z-index: 2; - } -} -footer { - z-index: 2; -}