diff --git a/Gemfile b/Gemfile index d128d7e..f37feca 100644 --- a/Gemfile +++ b/Gemfile @@ -1,10 +1,5 @@ source 'https://rubygems.org' -# gem 'jekyll', '~>4.4.1' -gem 'jekyll', '4.2.2' +gem 'jekyll', '~>4.4.1' gem 'jekyll-paginate' gem 'rexml' -gem 'logger' -gem 'csv' -gem 'base64' -gem 'bigdecimal' diff --git a/Gemfile.lock b/Gemfile.lock index 4d51dbf..8f273d9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,44 +1,53 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.8) + addressable (2.9.0) public_suffix (>= 2.0.2, < 8.0) - base64 (0.3.0) - bigdecimal (4.0.1) + base64 (0.2.0) + bigdecimal (3.1.8) colorator (1.1.0) - concurrent-ruby (1.3.6) - csv (3.3.5) + concurrent-ruby (1.3.7) + csv (3.3.2) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - ffi (1.17.3-x86_64-linux-gnu) + ffi (1.17.4) + ffi (1.17.4-x86_64-linux-gnu) forwardable-extended (2.6.0) + google-protobuf (4.35.1-x86_64-linux-gnu) + bigdecimal + rake (~> 13.3) http_parser.rb (0.8.1) - i18n (1.14.8) + i18n (1.15.2) concurrent-ruby (~> 1.0) - jekyll (4.2.2) + jekyll (4.4.1) addressable (~> 2.4) + base64 (~> 0.2) colorator (~> 1.0) + csv (~> 3.0) em-websocket (~> 0.5) i18n (~> 1.0) - jekyll-sass-converter (~> 2.0) + jekyll-sass-converter (>= 2.0, < 4.0) jekyll-watch (~> 2.0) - kramdown (~> 2.3) + json (~> 2.6) + kramdown (~> 2.3, >= 2.3.1) kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.4.0) + mercenary (~> 0.3, >= 0.3.6) pathutil (~> 0.9) - rouge (~> 3.0) + rouge (>= 3.0, < 5.0) safe_yaml (~> 1.0) - terminal-table (~> 2.0) + terminal-table (>= 1.8, < 4.0) + webrick (~> 1.7) jekyll-paginate (1.1.0) - jekyll-sass-converter (2.2.0) - sassc (> 2.0.1, < 3.0) + jekyll-sass-converter (3.1.0) + sass-embedded (~> 1.75) jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (2.5.1) - rexml (>= 3.3.9) + json (2.9.1) + kramdown (2.5.2) + rexml (>= 3.4.4) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.4) @@ -46,34 +55,33 @@ GEM logger rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - logger (1.7.0) + logger (1.6.4) mercenary (0.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (7.0.2) + public_suffix (7.0.5) + rake (13.4.2) rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.3.9) - rouge (3.30.0) + rexml (3.4.4) + rouge (4.7.0) safe_yaml (1.0.5) - sassc (2.4.0) - ffi (~> 1.9) - terminal-table (2.0.0) - unicode-display_width (~> 1.1, >= 1.1.1) - unicode-display_width (1.8.0) + sass-embedded (1.101.0-x86_64-linux-gnu) + google-protobuf (~> 4.31) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + unicode-display_width (2.6.0) + webrick (1.9.2) PLATFORMS + ruby x86_64-linux DEPENDENCIES - base64 - bigdecimal - csv - jekyll (= 4.2.2) + jekyll (~> 4.4.1) jekyll-paginate - logger rexml BUNDLED WITH - 2.3.5 + 2.6.9 diff --git a/_sass/_base.scss b/_sass/_base.scss index 8cf56de..055099c 100644 --- a/_sass/_base.scss +++ b/_sass/_base.scss @@ -120,7 +120,7 @@ a { color: $brand-color; text-decoration: none; &:visited { - color: darken($brand-color, 15%); + color: color.adjust($brand-color, $lightness: -15%, $space: hsl); } &:hover { color: $text-color; diff --git a/css/main.scss b/css/main.scss index 2be9cc1..31dff2b 100644 --- a/css/main.scss +++ b/css/main.scss @@ -4,6 +4,7 @@ @charset "utf-8"; +@use 'sass:color'; // Our variables $base-font-family: 'Share Tech', sans-serif; @@ -18,8 +19,8 @@ $background-color: #d2d4bc; $brand-color: #2a7ae2; $grey-color: #828282; -$grey-color-light: lighten($grey-color, 40%); -$grey-color-dark: darken($grey-color, 25%); +$grey-color-light: color.adjust($grey-color, $lightness: 40%, $space: hsl); +$grey-color-dark: color.adjust($grey-color, $lightness: -25%, $space: hsl); $on-palm: 600px; $on-laptop: 800px;