Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@kastnerp
kastnerp committed Sep 25, 2024
1 parent 0f9ad1e commit f65832b
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 28 deletions.
67 changes: 44 additions & 23 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (7.1.3.4)
activesupport (7.2.1)
base64
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
mutex_m
tzinfo (~> 2.0)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
base64 (0.2.0)
Expand All @@ -35,7 +36,7 @@ GEM
rexml
csl-styles (1.0.1.11)
csl (~> 1.0)
css_parser (1.17.1)
css_parser (1.19.0)
addressable
cssminify2 (2.0.1)
csv (3.3.0)
Expand All @@ -51,24 +52,26 @@ GEM
loofah (>= 2.3.1, < 3)
sax-machine (>= 1.0, < 2)
ffi (1.17.0-aarch64-linux-gnu)
ffi (1.17.0-arm64-darwin)
ffi (1.17.0-x86_64-darwin)
ffi (1.17.0-x86_64-linux-gnu)
forwardable-extended (2.6.0)
gemoji (4.1.0)
google-protobuf (4.27.5-aarch64-linux)
google-protobuf (4.28.2-aarch64-linux)
bigdecimal
rake (>= 13)
google-protobuf (4.27.5-arm64-darwin)
google-protobuf (4.28.2-arm64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.27.5-x86_64-darwin)
google-protobuf (4.28.2-x86_64-darwin)
bigdecimal
rake (>= 13)
google-protobuf (4.27.5-x86_64-linux)
google-protobuf (4.28.2-x86_64-linux)
bigdecimal
rake (>= 13)
html-pipeline (2.14.3)
activesupport (>= 2)
nokogiri (>= 1.4)
htmlbeautifier (1.4.3)
htmlcompressor (0.4.0)
http_parser.rb (0.8.0)
httparty (0.22.0)
Expand Down Expand Up @@ -115,7 +118,6 @@ GEM
jekyll-paginate-v2 (3.0.0)
jekyll (>= 3.0, < 5.0)
jekyll-regex-replace (1.1.0)
jekyll-remote-include (1.0.2)
jekyll-sass-converter (3.0.0)
sass-embedded (~> 1.54)
jekyll-scholar (7.1.3)
Expand Down Expand Up @@ -145,27 +147,36 @@ GEM
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
latex-decode (0.4.0)
libv8-node (22.5.1.0-aarch64-linux)
libv8-node (22.7.0.4-aarch64-linux)
libv8-node (22.7.0.4-arm64-darwin)
libv8-node (22.7.0.4-x86_64-darwin)
libv8-node (22.7.0.4-x86_64-linux)
liquid (4.0.4)
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
logger (1.6.1)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
matrix (0.4.2)
mercenary (0.4.0)
mini_mime (1.1.5)
mini_racer (0.13.0)
libv8-node (~> 22.5.1.0)
minitest (5.24.1)
mini_racer (0.15.0)
libv8-node (~> 22.7.0.1)
minitest (5.25.1)
multi_xml (0.7.1)
bigdecimal (~> 3.1)
mutex_m (0.2.0)
namae (1.2.0)
racc (~> 1.7)
nokogiri (1.16.7-aarch64-linux)
racc (~> 1.4)
nokogiri (1.16.7-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.7-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.16.7-x86_64-linux)
racc (~> 1.4)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (6.0.1)
Expand All @@ -174,31 +185,41 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
rexml (3.3.6)
rexml (3.3.7)
rouge (4.4.0)
safe_yaml (1.0.5)
sass-embedded (1.79.1-aarch64-linux-gnu)
sass-embedded (1.79.3-aarch64-linux-gnu)
google-protobuf (~> 4.27)
sass-embedded (1.79.3-arm64-darwin)
google-protobuf (~> 4.27)
sass-embedded (1.79.3-x86_64-darwin)
google-protobuf (~> 4.27)
sass-embedded (1.79.3-x86_64-linux-gnu)
google-protobuf (~> 4.27)
sax-machine (1.3.2)
securerandom (0.3.1)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uglifier (4.2.0)
uglifier (4.2.1)
execjs (>= 0.3.0, < 3)
unicode-display_width (2.6.0)
unicode_utils (1.4.0)
webrick (1.8.1)
webrick (1.8.2)

PLATFORMS
aarch64-linux
arm64-darwin
x86_64-darwin
x86_64-linux

DEPENDENCIES
classifier-reborn
css_parser
feedjira
htmlbeautifier
httparty
htmlbeautifier
jekyll
jekyll-archives
jekyll-email-protect
Expand All @@ -210,8 +231,8 @@ DEPENDENCIES
jekyll-minifier
jekyll-paginate-v2
jekyll-regex-replace
jekyll-remote-include
jekyll-scholar
jekyll-remote-include
jekyll-sitemap
jekyll-tabs
jekyll-toc
Expand All @@ -222,4 +243,4 @@ DEPENDENCIES
webrick

BUNDLED WITH
2.5.19
2.5.7
16 changes: 14 additions & 2 deletions _sass/_themes.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
* Themes
******************************************************************************/

@use "sass:color";

:root {
--global-bg-color: #{$white-color};
--global-code-bg-color: #{$code-bg-color-light};
Expand All @@ -17,7 +19,12 @@
--global-divider-color: rgba(0, 0, 0, 0.1);
--global-card-bg-color: #{$white-color};
--global-highlight-color: #{$red-color-dark};
--global-back-to-top-bg-color: rgba(#{red($black-color)}, #{green($black-color)}, #{blue($black-color)}, 0.4);
--global-back-to-top-bg-color: rgba(
#{color.channel($black-color, "red", $space: rgb)},
#{color.channel($black-color, "green", $space: rgb)},
#{color.channel($black-color, "blue", $space: rgb)},
0.4
);
--global-back-to-top-text-color: #{$white-color};
--global-newsletter-bg-color: #{$white-color};
--global-newsletter-text-color: #{$black-color};
Expand Down Expand Up @@ -81,7 +88,12 @@ html[data-theme="dark"] {
--global-distill-app-color: #{$grey-color-light};
--global-divider-color: #424246;
--global-card-bg-color: #{$grey-900};
--global-back-to-top-bg-color: rgba(#{red($white-color)}, #{green($white-color)}, #{blue($white-color)}, 0.5);
--global-back-to-top-bg-color: rgba(
#{color.channel($white-color, "red", $space: rgb)},
#{color.channel($white-color, "green", $space: rgb)},
#{color.channel($white-color, "blue", $space: rgb)},
0.5
);
--global-back-to-top-text-color: #{$black-color};
--global-newsletter-bg-color: #{$grey-color-light};
--global-newsletter-text-color: #{$grey-color-dark};
Expand Down
8 changes: 5 additions & 3 deletions _sass/_variables.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,29 @@
* To adjust anything, simply edit the variables below and rebuild the theme.
******************************************************************************/

@use "sass:color";

// Colors
$red-color: #ff3636 !default;
$red-color-dark: #b71c1c !default;
$orange-color: #f29105 !default;
$blue-color: #0076df !default;
$blue-color-dark: #00369f !default;
$cyan-color: #2698ba !default;
$light-cyan-color: lighten($cyan-color, 25%);
$light-cyan-color: color.adjust($cyan-color, $lightness: 25%);
$green-color: #00ab37 !default;
$green-color-lime: #b7d12a !default;
$green-color-dark: #009f06 !default;
$green-color-light: #ddffdd !default;
$green-color-bright: #11d68b !default;
$purple-color: #b509ac !default;
$light-purple-color: lighten($purple-color, 25%);
$light-purple-color: color.adjust($purple-color, $lightness: 25%);
$pink-color: #f92080 !default;
$pink-color-light: #ffdddd !default;
$yellow-color: #efcc00 !default;

$grey-color: #828282 !default;
$grey-color-light: lighten($grey-color, 40%);
$grey-color-light: color.adjust($grey-color, $lightness: 40%);
$grey-color-dark: #1c1c1d;
$grey-900: #212529;

Expand Down

0 comments on commit f65832b

Please sign in to comment.