From ae1e02be9ce497953b68bd37362d2266845e1597 Mon Sep 17 00:00:00 2001 From: Ivan Date: Sun, 13 Aug 2023 03:42:37 +0200 Subject: [PATCH] update gems --- Gemfile | 3 +-- Gemfile.lock | 53 +++++++++++++++++++++++++---------------------- _scss/minima/_base.scss | 10 ++++----- _scss/minima/_layout.scss | 14 ++++++------- 4 files changed, 41 insertions(+), 39 deletions(-) diff --git a/Gemfile b/Gemfile index ddf334b..b49e30f 100644 --- a/Gemfile +++ b/Gemfile @@ -8,8 +8,7 @@ source 'https://rubygems.org' # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem 'jekyll', '~> 4.2.1' -gem 'webrick' +gem 'jekyll' # If you have any plugins, put them here! group :jekyll_plugins do diff --git a/Gemfile.lock b/Gemfile.lock index c465035..c8504d5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,39 +1,41 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.1) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) colorator (1.1.0) - concurrent-ruby (1.1.10) + concurrent-ruby (1.2.2) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) ffi (1.15.5) forwardable-extended (2.6.0) + google-protobuf (3.24.0) http_parser.rb (0.8.0) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - jekyll (4.2.2) + jekyll (4.3.2) addressable (~> 2.4) colorator (~> 1.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) + kramdown (~> 2.3, >= 2.3.1) kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.4.0) + mercenary (>= 0.3.6, < 0.5) 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-feed (0.17.0) jekyll (>= 3.7, < 5.0) jekyll-paginate (1.1.0) - jekyll-sass-converter (2.2.0) - sassc (> 2.0.1, < 3.0) + jekyll-sass-converter (3.0.0) + sass-embedded (~> 1.54) jekyll-seo-tag (2.8.0) jekyll (>= 3.8, < 5.0) jekyll-sitemap (1.4.0) @@ -44,37 +46,38 @@ GEM rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - liquid (4.0.3) - listen (3.7.1) + liquid (4.0.4) + listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (5.0.1) + public_suffix (5.0.3) + rake (13.0.6) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rexml (3.2.5) - rouge (3.30.0) + rexml (3.2.6) + rouge (4.1.3) 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) - webrick (1.7.0) + sass-embedded (1.64.2) + google-protobuf (~> 3.23) + rake (>= 13.0.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + unicode-display_width (2.4.2) + webrick (1.8.1) PLATFORMS ruby DEPENDENCIES - jekyll (~> 4.2.1) + jekyll jekyll-feed jekyll-paginate jekyll-seo-tag jekyll-sitemap - webrick BUNDLED WITH - 2.3.7 + 2.4.14 diff --git a/_scss/minima/_base.scss b/_scss/minima/_base.scss index 8e41843..4695225 100644 --- a/_scss/minima/_base.scss +++ b/_scss/minima/_base.scss @@ -37,7 +37,7 @@ h1, h2, h3, h4, h5, h6, p, blockquote, pre, ul, ol, dl, figure, %vertical-rhythm { - margin-bottom: $spacing-unit / 2; + margin-bottom: calc($spacing-unit / 2); } @@ -131,7 +131,7 @@ a { blockquote { color: $grey-color; border-left: 4px solid $grey-color-light; - padding-left: $spacing-unit / 2; + padding-left: calc($spacing-unit / 2); @include relative-font-size(1.125); letter-spacing: -1px; font-style: italic; @@ -188,8 +188,8 @@ pre { max-width: -moz-calc(#{$content-width} - (#{$spacing-unit})); 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; + padding-right: calc($spacing-unit / 2); + padding-left: calc($spacing-unit / 2); } } @@ -243,7 +243,7 @@ table { } } th, td { - padding: ($spacing-unit / 3) ($spacing-unit / 2); + padding: calc($spacing-unit / 3) calc($spacing-unit / 2); } th { background-color: lighten($grey-color-light, 3%); diff --git a/_scss/minima/_layout.scss b/_scss/minima/_layout.scss index ed79e75..25cd601 100644 --- a/_scss/minima/_layout.scss +++ b/_scss/minima/_layout.scss @@ -54,7 +54,7 @@ @include media-query($on-palm) { position: absolute; top: 9px; - right: $spacing-unit / 2; + right: calc($spacing-unit / 2); background-color: $background-color; border: 1px solid $grey-color-light; border-radius: 5px; @@ -115,7 +115,7 @@ .footer-heading { @include relative-font-size(1.125); - margin-bottom: $spacing-unit / 2; + margin-bottom: calc($spacing-unit / 2); } .contact-list, @@ -127,14 +127,14 @@ .footer-col-wrapper { @include relative-font-size(0.9375); color: $grey-color; - margin-left: -$spacing-unit / 2; + margin-left: calc(-1 * $spacing-unit / 2); @extend %clearfix; } .footer-col { float: left; - margin-bottom: $spacing-unit / 2; - padding-left: $spacing-unit / 2; + margin-bottom: calc($spacing-unit / 2); + padding-left: calc($spacing-unit / 2); } .footer-col-1 { @@ -206,8 +206,8 @@ } .post-meta { - margin-top: -$spacing-unit / 4; - margin-bottom: $spacing-unit / 5; + margin-top: calc(-1 * $spacing-unit / 4); + margin-bottom: calc($spacing-unit / 5); font-size: $small-font-size; color: $grey-color; } -- 2.11.4.GIT