From 2f96ac0ebe4c1b8ae6634f32058ea3bdac99959b Mon Sep 17 00:00:00 2001 From: Aminda Suomalainen Date: Mon, 27 May 2024 09:29:42 +0300 Subject: [PATCH] further cleanup and removing _sass/ --- _sass/_base.scss | 212 ----------------------------- _sass/_layout.scss | 231 -------------------------------- _sass/_syntax-highlighting.scss | 200 --------------------------- css/main.scss | 18 +-- 4 files changed, 9 insertions(+), 652 deletions(-) delete mode 100644 _sass/_base.scss delete mode 100644 _sass/_layout.scss delete mode 100644 _sass/_syntax-highlighting.scss diff --git a/_sass/_base.scss b/_sass/_base.scss deleted file mode 100644 index a03ce30..0000000 --- a/_sass/_base.scss +++ /dev/null @@ -1,212 +0,0 @@ -/** - * Reset some basic elements - */ -body, -h1, -h2, -h3, -h4, -h5, -h6, -p, -blockquote, -pre, -hr, -dl, -dd, -ol, -ul, -figure { - margin: 0; - padding: 0; -} - -/** - * Basic styling - */ -body { - font-family: $base-font-family; - font-size: $base-font-size; - line-height: $base-line-height; - font-weight: 300; - color: $text-color; - background-color: $background-color; - -webkit-text-size-adjust: 100%; -} - -/** - * Set `margin-bottom` to maintain vertical rhythm - */ -h1, -h2, -h3, -h4, -h5, -h6, -p, -blockquote, -pre, -ul, -ol, -dl, -figure, -%vertical-rhythm { - margin-bottom: $spacing-unit / 2; -} - -/** - * Images - */ -img { - max-width: 100%; - vertical-align: middle; -} - -/** - * Figures - */ -figure > img { - display: block; -} - -figcaption { - font-size: $small-font-size; -} - -/** - * Lists - */ -ul, -ol { - margin-left: $spacing-unit; -} - -li { - > ul, - > ol { - margin-bottom: 0; - } -} - -/** - * Headings - */ -h1, -h2, -h3, -h4, -h5, -h6 { - font-weight: 300; -} - -/** - * Links - */ -a { - color: $brand-color; - //text-decoration: none; - text-decoration: underline; - - &:visited { - color: revert; - //darken($brand-color, 15%); - } - - &:hover { - color: $text-color; - text-decoration: underline; - } -} - -/** - * Blockquotes - */ -blockquote { - color: $grey-color; - border-left: 4px solid $grey-color-light; - padding-left: $spacing-unit / 2; - font-size: 18px; - letter-spacing: -1px; - font-style: italic; - - > :last-child { - margin-bottom: 0; - } -} - -/** - * Code formatting - */ -pre, -code { - //font-size: 15px; - font-size: revert; - font-family: $monospace-font-family; - border: 1px solid $grey-color-light; - border-radius: 3px; - //background-color: #eef; - background-color: revert; -} - -code { - padding: 1px 5px; -} - -pre { - padding: 8px 12px; - overflow-x: scroll; - - > code { - border: 0; - padding-right: 0; - padding-left: 0; - } -} - -/** - * Wrapper - */ -.wrapper { - max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit} * 2)); - max-width: calc(#{$content-width} - (#{$spacing-unit} * 2)); - margin-right: auto; - margin-left: auto; - padding-right: $spacing-unit; - padding-left: $spacing-unit; - @extend %clearfix; - - @include media-query($on-laptop) { - max-width: -webkit-calc(#{$content-width} - (#{$spacing-unit})); - max-width: calc(#{$content-width} - (#{$spacing-unit})); - padding-right: $spacing-unit / 2; - padding-left: $spacing-unit / 2; - } -} - -/** - * Clearfix - */ -%clearfix { - &:after { - content: ""; - display: table; - clear: both; - } -} - -/** - * Icons - */ -.icon { - > svg { - display: inline-block; - width: 16px; - height: 16px; - vertical-align: middle; - - path { - fill: $grey-color; - } - } -} diff --git a/_sass/_layout.scss b/_sass/_layout.scss deleted file mode 100644 index 7df5820..0000000 --- a/_sass/_layout.scss +++ /dev/null @@ -1,231 +0,0 @@ -/** - * Site header - */ -.site-header { - border-top: 5px solid $grey-color-dark; - border-bottom: 1px solid $grey-color-light; - min-height: 56px; - - // Positioning context for the mobile navigation icon - position: relative; -} - -.site-title { - font-size: 26px; - line-height: 56px; - letter-spacing: -1px; - margin-bottom: 0; - float: left; - - &, - &:visited { - color: $grey-color-dark; - } -} - -.site-nav { - float: right; - line-height: 56px; - border: 1px dashed; - - .menu-icon { - display: none; - } - - .page-link { - color: $text-color; - line-height: $base-line-height; - - // Gaps between nav items, but not on the first one - &:not(:first-child) { - margin-left: 20px; - } - } - - @include media-query($on-palm) { - position: absolute; - top: 9px; - right: 30px; - background-color: $background-color; - border: 1px solid $grey-color-light; - border-radius: 5px; - text-align: right; - - .menu-icon { - display: block; - float: right; - width: 36px; - height: 26px; - line-height: 0; - padding-top: 10px; - text-align: center; - - > svg { - width: 18px; - height: 15px; - - path { - fill: $grey-color-dark; - } - } - } - - .trigger { - clear: both; - display: none; - } - - &:hover .trigger { - display: block; - padding-bottom: 5px; - } - - .page-link { - display: block; - padding: 5px 10px; - } - } -} - -/** - * Site footer - */ -.site-footer { - border-top: 1px solid $grey-color-light; - padding: $spacing-unit 0; -} - -.footer-heading { - font-size: 18px; - margin-bottom: $spacing-unit / 2; -} - -.contact-list, -.social-media-list { - list-style: none; - margin-left: 0; -} - -.footer-col-wrapper { - font-size: 15px; - color: $grey-color; - margin-left: -$spacing-unit / 2; - @extend %clearfix; -} - -.footer-col { - float: left; - margin-bottom: $spacing-unit / 2; - padding-left: $spacing-unit / 2; -} - -.footer-col-1 { - width: -webkit-calc(35% - (#{$spacing-unit} / 2)); - width: calc(35% - (#{$spacing-unit} / 2)); -} - -.footer-col-2 { - width: -webkit-calc(20% - (#{$spacing-unit} / 2)); - width: calc(20% - (#{$spacing-unit} / 2)); -} - -.footer-col-3 { - width: -webkit-calc(45% - (#{$spacing-unit} / 2)); - width: calc(45% - (#{$spacing-unit} / 2)); -} - -@include media-query($on-laptop) { - .footer-col-1, - .footer-col-2 { - width: -webkit-calc(50% - (#{$spacing-unit} / 2)); - width: calc(50% - (#{$spacing-unit} / 2)); - } - - .footer-col-3 { - width: -webkit-calc(100% - (#{$spacing-unit} / 2)); - width: calc(100% - (#{$spacing-unit} / 2)); - } -} - -@include media-query($on-palm) { - .footer-col { - float: none; - width: -webkit-calc(100% - (#{$spacing-unit} / 2)); - width: calc(100% - (#{$spacing-unit} / 2)); - } -} - -/** - * Page content - */ -.page-content { - padding: $spacing-unit 0; -} - -.page-heading { - font-size: 20px; -} - -.post-list { - margin-left: 0; - list-style: none; - - > li { - margin-bottom: $spacing-unit; - } -} - -.post-meta { - font-size: $small-font-size; - color: $grey-color; -} - -.post-link { - display: block; - font-size: 24px; -} - -/** - * Posts - */ -.post-header { - margin-bottom: $spacing-unit; -} - -.post-title { - font-size: 42px; - letter-spacing: -1px; - line-height: 1; - - @include media-query($on-laptop) { - font-size: 36px; - } -} - -.post-content { - margin-bottom: $spacing-unit; - - h2 { - font-size: 32px; - - @include media-query($on-laptop) { - font-size: 28px; - } - } - - h3 { - font-size: 26px; - - @include media-query($on-laptop) { - font-size: 22px; - } - } - - h4 { - font-size: 20px; - - @include media-query($on-laptop) { - font-size: 18px; - } - } -} diff --git a/_sass/_syntax-highlighting.scss b/_sass/_syntax-highlighting.scss deleted file mode 100644 index 4eac3d6..0000000 --- a/_sass/_syntax-highlighting.scss +++ /dev/null @@ -1,200 +0,0 @@ -/** - * Syntax highlighting styles - */ -.highlight { - //background: #fff; - @extend %vertical-rhythm; - - .c { - color: #998; - font-style: italic; - } // Comment - .err { - color: #a61717; - background-color: #e3d2d2; - } // Error - .k { - font-weight: bold; - } // Keyword - .o { - font-weight: bold; - } // Operator - .cm { - color: #998; - font-style: italic; - } // Comment.Multiline - .cp { - color: #999; - font-weight: bold; - } // Comment.Preproc - .c1 { - color: #998; - font-style: italic; - } // Comment.Single - .cs { - color: #999; - font-weight: bold; - font-style: italic; - } // Comment.Special - .gd { - color: #000; - background-color: #fdd; - } // Generic.Deleted - .gd .x { - color: #000; - background-color: #faa; - } // Generic.Deleted.Specific - .ge { - font-style: italic; - } // Generic.Emph - .gr { - color: #a00; - } // Generic.Error - .gh { - color: #999; - } // Generic.Heading - .gi { - color: #000; - background-color: #dfd; - } // Generic.Inserted - .gi .x { - color: #000; - background-color: #afa; - } // Generic.Inserted.Specific - .go { - color: #888; - } // Generic.Output - .gp { - color: #555; - } // Generic.Prompt - .gs { - font-weight: bold; - } // Generic.Strong - .gu { - color: #aaa; - } // Generic.Subheading - .gt { - color: #a00; - } // Generic.Traceback - .kc { - font-weight: bold; - } // Keyword.Constant - .kd { - font-weight: bold; - } // Keyword.Declaration - .kp { - font-weight: bold; - } // Keyword.Pseudo - .kr { - font-weight: bold; - } // Keyword.Reserved - .kt { - color: #458; - font-weight: bold; - } // Keyword.Type - .m { - color: #099; - } // Literal.Number - .s { - color: #d14; - } // Literal.String - .na { - color: #008080; - } // Name.Attribute - .nb { - color: #0086b3; - } // Name.Builtin - .nc { - color: #458; - font-weight: bold; - } // Name.Class - .no { - color: #008080; - } // Name.Constant - .ni { - color: #800080; - } // Name.Entity - .ne { - color: #900; - font-weight: bold; - } // Name.Exception - .nf { - color: #900; - font-weight: bold; - } // Name.Function - .nn { - color: #555; - } // Name.Namespace - .nt { - color: #000080; - } // Name.Tag - .nv { - color: #008080; - } // Name.Variable - .ow { - font-weight: bold; - } // Operator.Word - .w { - color: #bbb; - } // Text.Whitespace - .mf { - color: #099; - } // Literal.Number.Float - .mh { - color: #099; - } // Literal.Number.Hex - .mi { - color: #099; - } // Literal.Number.Integer - .mo { - color: #099; - } // Literal.Number.Oct - .sb { - color: #d14; - } // Literal.String.Backtick - .sc { - color: #d14; - } // Literal.String.Char - .sd { - color: #d14; - } // Literal.String.Doc - .s2 { - color: #d14; - } // Literal.String.Double - .se { - color: #d14; - } // Literal.String.Escape - .sh { - color: #d14; - } // Literal.String.Heredoc - .si { - color: #d14; - } // Literal.String.Interpol - .sx { - color: #d14; - } // Literal.String.Other - .sr { - color: #009926; - } // Literal.String.Regex - .s1 { - color: #d14; - } // Literal.String.Single - .ss { - color: #990073; - } // Literal.String.Symbol - .bp { - color: #999; - } // Name.Builtin.Pseudo - .vc { - color: #008080; - } // Name.Variable.Class - .vg { - color: #008080; - } // Name.Variable.Global - .vi { - color: #008080; - } // Name.Variable.Instance - .il { - color: #099; - } // Literal.Number.Integer.Long -} diff --git a/css/main.scss b/css/main.scss index 290dcd3..e27e94c 100644 --- a/css/main.scss +++ b/css/main.scss @@ -9,12 +9,6 @@ $base-font-family: "Liberation Serif", "Tinos", "Times New Roman", serif; $monospace-font-family: "Liberation Mono", "Cousine", "Courier New", monospace; //$base-font-family: "Liberation Sans", "Arimo", "Arial", sans-serif; -// Width of the content area -$content-width: 800px; - -$on-palm: 600px; -$on-laptop: 800px; - @import "{{ site.theme }}"; // As high in css as can be edited. If I understand correctly, user @@ -31,6 +25,15 @@ $on-laptop: 800px; background-color: revert !important; } +// Fitting to text and monospace preferred +code { + font-size: 0.8em !important; +} +code, +pre { + font-family: $monospace-font-family !important; +} + // Overrides for dark themes @media (prefers-color-scheme: dark) { // Adblocker detection) @@ -63,9 +66,6 @@ $on-laptop: 800px; } } -// Import partials from `sass_dir` (defaults to `_sass`) -@import "base", "layout", "syntax-highlighting"; - // This is used in the index #avatar { margin-left: auto;