diff --git a/Gemfile b/Gemfile index 453ecc8e7..7d4252228 100644 --- a/Gemfile +++ b/Gemfile @@ -2,8 +2,6 @@ source "https://rubygems.org" gem "jekyll", "~> 4.2" -gem "minima", "~> 2.5" - group :jekyll_plugins do gem "jekyll-feed", "~> 0.12" end diff --git a/Gemfile.lock b/Gemfile.lock index 730180d51..51c18ded7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -77,8 +77,6 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-sass-converter (3.1.0) sass-embedded (~> 1.75) - jekyll-seo-tag (2.8.0) - jekyll (>= 3.8, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) json (2.21.2) @@ -91,10 +89,6 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) - minima (2.5.2) - jekyll (>= 3.5, < 5.0) - jekyll-feed (~> 0.9) - jekyll-seo-tag (~> 2.1) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (6.0.2) @@ -166,7 +160,6 @@ DEPENDENCIES http_parser.rb (~> 0.6.0) jekyll (~> 4.2) jekyll-feed (~> 0.12) - minima (~> 2.5) tzinfo (>= 1, < 3) tzinfo-data wdm (~> 0.1.1) diff --git a/_config.yml b/_config.yml index c8248355a..8f746e3bd 100644 --- a/_config.yml +++ b/_config.yml @@ -15,7 +15,7 @@ rss: true # Build settings -theme: minima +# theme: minima # removed: contributed no layouts, includes or styles -- only an unused assets/main.css permalink: /:categories/:title/ post_dir: false markdown: kramdown diff --git a/_sass/forms.scss b/_sass/forms.scss index 19c1b3b0d..1ef719d04 100644 --- a/_sass/forms.scss +++ b/_sass/forms.scss @@ -1,3 +1,5 @@ +@use "sass:math"; +@use "sass:color"; btnform { margin: 0 0 5px 0; fieldset { @@ -13,7 +15,7 @@ btnform { padding: 0; color: $textcolor; border: 0; - border-bottom: 1px solid lighten($black, 80); + border-bottom: 1px solid color.adjust($black, $lightness: 80%); white-space: normal; } p { @@ -63,10 +65,10 @@ select { padding: 4px; margin-bottom: 5px / 4; background-color: $white; - border: 1px solid lighten($black, 80); + border: 1px solid color.adjust($black, $lightness: 80%); color: $textcolor; &:hover { - border-color: lighten($accentcolor, 50); + border-color: color.adjust($accentcolor, $lightness: 50%); } } .input-mini { @@ -184,7 +186,7 @@ select:focus { /* help text ==================================== */ .help-block, .help-inline { - color : lighten($black, 50); + color : color.adjust($black, $lightness: 50%); } .help-block { display : block; diff --git a/_sass/grid.scss b/_sass/grid.scss index ffb89e7ad..845568872 100644 --- a/_sass/grid.scss +++ b/_sass/grid.scss @@ -1,3 +1,4 @@ +@use "sass:math"; // Defining number of columns in the grid. // Common Values would be 12, 16 or 24 $width: 100%; @@ -16,16 +17,16 @@ $margin: 0; @mixin grid($grid:$def_grid,$cols:'',$float:left,$display:inline){ display:$display; float:$float; - width:(100%/$grid * $cols) - ($margin * 2); + width:(math.div(100%, $grid) * $cols) - ($margin * 2); } // Allows for padding before element @mixin prefix($grid:$def_grid,$cols:''){ - margin-left:(100%/$grid * $cols); + margin-left:(math.div(100%, $grid) * $cols); } // Allows for padding after element @mixin suffix($grid:$def_grid,$cols:''){ - margin-right:(100%/$grid * $cols); + margin-right:(math.div(100%, $grid) * $cols); } // Removes left margin @mixin first(){ @@ -38,10 +39,10 @@ $margin: 0; @mixin push($grid:$def_grid,$move:'') { position:relative; - left:(100%/$grid * $move); + left:(math.div(100%, $grid) * $move); } @mixin pull($grid:$def_grid,$move:''){ position:relative; - left:(100%/$grid * $move) * -1; + left:(math.div(100%, $grid) * $move) * -1; } \ No newline at end of file diff --git a/_sass/mixins.scss b/_sass/mixins.scss index ac952d987..cdffb8df0 100644 --- a/_sass/mixins.scss +++ b/_sass/mixins.scss @@ -1,3 +1,5 @@ +@use "sass:math"; +@use "sass:color"; // UTILITY MIXINS // -------------------------------------------------- @@ -44,25 +46,25 @@ // ------------------------ @mixin font-size($size) { font-size: 0px + $size; - font-size: 0rem + $size / $doc-font-size; - line-height: 0 + round($doc-line-height / $size*10000) / 10000; + font-size: 0rem + math.div($size, $doc-font-size); + line-height: 0 + math.div(math.round(math.div($doc-line-height, $size) * 10000), 10000); margin-bottom: 0px + $doc-line-height; - margin-bottom: 0rem + ($doc-line-height / $doc-font-size); + margin-bottom: 0rem + math.div($doc-line-height, $doc-font-size); } // Just the REMs // ------------- @mixin font-rem($size) { font-size: 0px + $size; - font-size: 0rem + $size / $doc-font-size; + font-size: 0rem + math.div($size, $doc-font-size); } // Just font-size and line-height // ------------------------------ @mixin font($size) { font-size: 0px + $size; - font-size: 0rem + $size / $doc-font-size; - line-height: 0 + round($doc-line-height / $size*10000) / 10000; + font-size: 0rem + math.div($size, $doc-font-size); + line-height: 0 + math.div(math.round(math.div($doc-line-height, $size) * 10000), 10000); } @mixin text-overflow() { @@ -70,7 +72,7 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } -$indent-var: 0rem + ($doc-line-height / $doc-font-size); +$indent-var: 0rem + math.div($doc-line-height, $doc-font-size); // GRADIENTS // -------------------------------------------------- diff --git a/_sass/page.scss b/_sass/page.scss index 9b2d1abe9..20d68b3c1 100644 --- a/_sass/page.scss +++ b/_sass/page.scss @@ -1,3 +1,5 @@ +@use "sass:color"; +@use "sass:math"; body { background-color: $bodycolor; font-family: $base-font; @@ -54,7 +56,7 @@ body { li { display: block; list-style-type: none; - border-bottom: 1px solid lighten($black,80); + border-bottom: 1px solid color.adjust($black, $lightness: 80%); border-bottom: 1px solid fade($black,10); @include font-rem(16); &:last-child { @@ -84,18 +86,18 @@ $button-size: 1.5rem; @mixin navicon-line() { display: inline-block; width: $button-size; - height: $button-size/7; + height: math.div($button-size, 7); // line color background: $white; - border-radius: $button-size/14; + border-radius: math.div($button-size, 14); transition: .3s; } .navicon-lines-button { - padding: $button-size/4 $button-size/2; + padding: math.div($button-size, 4) math.div($button-size, 2); transition: .3s; cursor: pointer; user-select: none; - border-radius: $button-size/7; + border-radius: math.div($button-size, 7); } .navicon-lines-button:hover { opacity: 1; @@ -105,7 +107,7 @@ $button-size: 1.5rem; } .navicon-lines { margin-right: 10px; - margin-bottom: $button-size/5; + margin-bottom: math.div($button-size, 5); // create middle line @include navicon-line; position: relative; @@ -116,17 +118,17 @@ $button-size: 1.5rem; position: absolute; left: 0; content: ''; - -webkit-transform-origin: $button-size/14 center; - transform-origin: $button-size/14 center; + -webkit-transform-origin: math.div($button-size, 14) center; + transform-origin: math.div($button-size, 14) center; } - &:before { top: $button-size/4; } - &:after { top: -$button-size/4; } + &:before { top: math.div($button-size, 4); } + &:after { top: math.div(-$button-size, 4); } } .navicon-lines-button:hover { opacity: 1; .navicon-lines { - &:before { top: $button-size/3.5; } - &:after { top: -$button-size/3.5; } + &:before { top: math.div($button-size, 3.5); } + &:after { top: math.div(-$button-size, 3.5); } } } .navicon-lines-button.x.active .navicon-lines { @@ -241,13 +243,13 @@ $button-size: 1.5rem; margin: 0; padding-bottom: .5em; @include font-rem(28); - border-bottom: 1px solid lighten($black,70); + border-bottom: 1px solid color.adjust($black, $lightness: 70%); } h4 { margin: 0; padding-bottom: .5em; @include font-rem(28); - border-bottom: 1px solid lighten($black,70); + border-bottom: 1px solid color.adjust($black, $lightness: 70%); } article { h2 { @@ -255,7 +257,7 @@ $button-size: 1.5rem; @include font-rem(20); &.link-post { margin-bottom: 0px + $doc-line-height; - margin-bottom: 0rem + ($doc-line-height / $doc-font-size); + margin-bottom: 0rem + math.div($doc-line-height, $doc-font-size); } } p { @@ -416,7 +418,7 @@ $button-size: 1.5rem; // Dotted line underlines for links p > a, li > a { - border-bottom: 1px dotted lighten($link-color, 50); + border-bottom: 1px dotted color.adjust($link-color, $lightness: 50%); &:hover { border-bottom-style: solid; } @@ -442,7 +444,7 @@ $button-size: 1.5rem; background-color: $white; } header { - background: lighten($black, 10); + background: color.adjust($black, $lightness: 10%); } h3 { margin: 0; @@ -473,7 +475,7 @@ $button-size: 1.5rem; display: block; color: $white; border-bottom-width: 0; - background: lighten($black, 30); + background: color.adjust($black, $lightness: 30%); @include opacity(0.7); @include transition(opacity 0.2s ease-in-out); &:hover { @@ -615,7 +617,7 @@ $button-size: 1.5rem; display: inline-block; padding-right: 5px; a { - color: lighten($basecolor, 40%); + color: color.adjust($basecolor, $lightness: 40%); @include transition(.4s linear); &:hover { text-decoration: none; @@ -690,7 +692,7 @@ $button-size: 1.5rem; color: $black; border-width: 2px !important; border-style: solid !important; - border-color: lighten($black,50); + border-color: color.adjust($black, $lightness: 50%); @include rounded(3px); } #goog-wm-sb { diff --git a/_sass/pygments.scss b/_sass/pygments.scss index 22423c640..519a2c25f 100644 --- a/_sass/pygments.scss +++ b/_sass/pygments.scss @@ -1,3 +1,4 @@ +@use "sass:color"; .highlight { background-color: #efefef; font-family: $code-font; @@ -10,7 +11,7 @@ margin: 0; padding: 1em; } - .lineno { padding-right: 24px; color: lighten(#333332,50);} + .lineno { padding-right: 24px; color: color.adjust(#333332, $lightness: 50%);} .hll { background-color: #ffffcc } .c { color: #408080; font-style: italic } /* Comment */ diff --git a/_sass/site.scss b/_sass/site.scss index 0ddfa3c1d..28dcf6e0b 100644 --- a/_sass/site.scss +++ b/_sass/site.scss @@ -1,11 +1,12 @@ +@use "sass:color"; /* Selection ============================================= */ ::-moz-selection { - background-color: lighten($basecolor, 65%); + background-color: color.adjust($basecolor, $lightness: 65%); color: $basecolor; text-shadow: none; } ::selection { - background-color: lighten($basecolor, 65%); + background-color: color.adjust($basecolor, $lightness: 65%); color: $basecolor; text-shadow: none; } diff --git a/_sass/typography.scss b/_sass/typography.scss index 17da453df..0f99fa88a 100644 --- a/_sass/typography.scss +++ b/_sass/typography.scss @@ -1,3 +1,4 @@ +@use "sass:color"; // Headings // -------------------------------------------------- h1, h2, h3, h4, h5, h6 { @@ -49,7 +50,7 @@ figcaption { padding-top: 10px; @include font(14); line-height: 1.3; - color: lighten($text-color, 10); + color: color.adjust($text-color, $lightness: 10%); } // Feature Image Caption @@ -63,7 +64,7 @@ figcaption { @include font(12); line-height: 1.3; font-style: italic; - color: lighten($text-color, 30); + color: color.adjust($text-color, $lightness: 30%); @media #{$small} { @include grid(12,9); @include prefix(12,0); @@ -73,7 +74,7 @@ figcaption { @include grid(12,8.5); } a { - color: lighten($text-color, 30); + color: color.adjust($text-color, $lightness: 30%); } } @@ -85,7 +86,7 @@ figcaption { text-indent: 0; @include font-rem(14); background-color: $body-color; - border: 1px solid darken($body-color,20); + border: 1px solid color.adjust($body-color, $lightness: -20%); @include rounded(3px); } @@ -134,7 +135,7 @@ li { white-space: nowrap; margin: 0 2px; padding: 0 5px; - border: 1px solid lighten($black, 90); + border: 1px solid color.adjust($black, $lightness: 90%); background-color: #efefef; @include rounded(3px); } diff --git a/_sass/variables.scss b/_sass/variables.scss index 6e3b825d1..a413b74d8 100644 --- a/_sass/variables.scss +++ b/_sass/variables.scss @@ -1,3 +1,4 @@ +@use "sass:color"; // TYPOGRAPHY ================================================ $doc-font-size: 16; $doc-line-height: 26; @@ -36,9 +37,9 @@ $info : #308cbc; // Links $linkcolor : #343434; $link-color : $linkcolor; -$linkcolorhover : darken($linkcolor, 10); -$linkcolorvisited : lighten($linkcolorhover, 20); -$linkcolorfocus : darken($linkcolorvisited, 10); +$linkcolorhover : color.adjust($linkcolor, $lightness: -10%); +$linkcolorvisited : color.adjust($linkcolorhover, $lightness: 20%); +$linkcolorfocus : color.adjust($linkcolorvisited, $lightness: -10%); // Media Queries $micro : "only screen and (min-width: 30em)"; diff --git a/_sass/vendor/font-awesome/_fixed-width.scss b/_sass/vendor/font-awesome/_fixed-width.scss index b221c9813..4107e738a 100644 --- a/_sass/vendor/font-awesome/_fixed-width.scss +++ b/_sass/vendor/font-awesome/_fixed-width.scss @@ -1,6 +1,8 @@ +// Local patch: namespaced Sass built-ins for dart-sass 2.x. Re-apply if this vendored library is updated. +@use "sass:math"; // Fixed Width Icons // ------------------------- .#{$fa-css-prefix}-fw { - width: (18em / 14); + width: math.div(18em, 14); text-align: center; } diff --git a/_sass/vendor/font-awesome/_larger.scss b/_sass/vendor/font-awesome/_larger.scss index 41e9a8184..963cfe1b3 100644 --- a/_sass/vendor/font-awesome/_larger.scss +++ b/_sass/vendor/font-awesome/_larger.scss @@ -1,10 +1,12 @@ +// Local patch: namespaced Sass built-ins for dart-sass 2.x. Re-apply if this vendored library is updated. +@use "sass:math"; // Icon Sizes // ------------------------- /* makes the font 33% larger relative to the icon container */ .#{$fa-css-prefix}-lg { - font-size: (4em / 3); - line-height: (3em / 4); + font-size: math.div(4em, 3); + line-height: math.div(3em, 4); vertical-align: -15%; } .#{$fa-css-prefix}-2x { font-size: 2em; } diff --git a/_sass/vendor/font-awesome/_list.scss b/_sass/vendor/font-awesome/_list.scss index 7d1e4d54d..69fa5ecc3 100644 --- a/_sass/vendor/font-awesome/_list.scss +++ b/_sass/vendor/font-awesome/_list.scss @@ -1,3 +1,5 @@ +// Local patch: namespaced Sass built-ins for dart-sass 2.x. Re-apply if this vendored library is updated. +@use "sass:math"; // List Icons // ------------------------- @@ -11,9 +13,9 @@ position: absolute; left: -$fa-li-width; width: $fa-li-width; - top: (2em / 14); + top: math.div(2em, 14); text-align: center; &.#{$fa-css-prefix}-lg { - left: -$fa-li-width + (4em / 14); + left: -$fa-li-width + math.div(4em, 14); } } diff --git a/_sass/vendor/font-awesome/_variables.scss b/_sass/vendor/font-awesome/_variables.scss index ac2b5051b..29cda7ee8 100644 --- a/_sass/vendor/font-awesome/_variables.scss +++ b/_sass/vendor/font-awesome/_variables.scss @@ -1,3 +1,5 @@ +// Local patch: namespaced Sass built-ins for dart-sass 2.x. Re-apply if this vendored library is updated. +@use "sass:math"; // Variables // -------------------------- @@ -7,7 +9,7 @@ $fa-css-prefix: fa !default; $fa-version: "4.1.0" !default; $fa-border-color: #eee !default; $fa-inverse: #fff !default; -$fa-li-width: (30em / 14) !default; +$fa-li-width: math.div(30em, 14) !default; $fa-var-adjust: "\f042"; $fa-var-adn: "\f170"; diff --git a/_sass/vendor/magnific-popup/_settings.scss b/_sass/vendor/magnific-popup/_settings.scss index 56bd6510a..549ae6b6a 100644 --- a/_sass/vendor/magnific-popup/_settings.scss +++ b/_sass/vendor/magnific-popup/_settings.scss @@ -1,3 +1,5 @@ +// Local patch: namespaced Sass built-ins for dart-sass 2.x. Re-apply if this vendored library is updated. +@use "sass:math"; //////////////////////// // Settings // //////////////////////// @@ -28,7 +30,7 @@ $mfp-include-iframe-type: true; // Enable Ifra $mfp-iframe-padding-top: 40px; // Iframe padding top $mfp-iframe-background: #000; // Background color of iframes $mfp-iframe-max-width: 900px; // Maximum width of iframes -$mfp-iframe-ratio: 9/16; // Ratio of iframe (9/16 = widescreen, 3/4 = standard, etc.) +$mfp-iframe-ratio: math.div(9, 16); // Ratio of iframe (9/16 = widescreen, 3/4 = standard, etc.) // Image-type options $mfp-include-image-type: true; // Enable Image-type popups diff --git a/_sass/vendor/magnific-popup/magnific-popup.scss b/_sass/vendor/magnific-popup/magnific-popup.scss index e956385bf..3d803f83d 100644 --- a/_sass/vendor/magnific-popup/magnific-popup.scss +++ b/_sass/vendor/magnific-popup/magnific-popup.scss @@ -1,3 +1,5 @@ +// Local patch: namespaced Sass built-ins for dart-sass 2.x. Re-apply if this vendored library is updated. +@use "sass:string"; /* Magnific Popup CSS */ @import "settings"; @@ -87,7 +89,7 @@ $mfp-use-visuallyhidden: false !default; // Hide content from brows background: $mfp-overlay-color; opacity: $mfp-overlay-opacity; @if $mfp-IE7support { - filter: unquote("alpha(opacity=#{$mfp-overlay-opacity*100})"); + filter: string.unquote("alpha(opacity=#{$mfp-overlay-opacity*100})"); } } @@ -285,7 +287,7 @@ button { text-align: center; opacity: $mfp-controls-opacity; @if $mfp-IE7support { - filter: unquote("alpha(opacity=#{$mfp-controls-opacity*100})"); + filter: string.unquote("alpha(opacity=#{$mfp-controls-opacity*100})"); } padding: 0 0 18px 10px; color: $mfp-controls-color; @@ -298,7 +300,7 @@ button { &:focus { opacity: 1; @if $mfp-IE7support { - filter: unquote("alpha(opacity=#{1*100})"); + filter: string.unquote("alpha(opacity=#{1*100})"); } } @@ -338,7 +340,7 @@ button { position: absolute; opacity: $mfp-controls-opacity; @if $mfp-IE7support { - filter: unquote("alpha(opacity=#{$mfp-controls-opacity*100})"); + filter: string.unquote("alpha(opacity=#{$mfp-controls-opacity*100})"); } margin: 0; top: 50%; @@ -354,7 +356,7 @@ button { &:focus { opacity: 1; @if $mfp-IE7support { - filter: unquote("alpha(opacity=#{1*100})"); + filter: string.unquote("alpha(opacity=#{1*100})"); } } &:before,