Skip to content

Commit

Permalink
Upgrade to ruby 3, jekyll 4 and just the docs 0.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Artaud committed Jan 4, 2024
1 parent c7ef8e5 commit c5aa835
Show file tree
Hide file tree
Showing 6 changed files with 102 additions and 55 deletions.
9 changes: 4 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ source "https://rubygems.org"
#
# This will help ensure the proper Jekyll version is running.
# Happy Jekylling!
gem "jekyll", "3.8.6"
gem "jekyll", "4.3.3"
# gem "jekyll", :git => "https://github.com/jekyll/jekyll.git", :branch => "master"

# This is the default theme for new Jekyll sites. You may change this to anything you like.
gem "just-the-docs", "0.2.5"
gem "just-the-docs", "0.7.0"

# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
# uncomment the line below. To upgrade, run `bundle update github-pages`.
Expand All @@ -23,7 +23,7 @@ gem "just-the-docs", "0.2.5"

group :jekyll_plugins do
gem "jekyll-feed", "~> 0.6"
gem 'hawkins'
# gem 'hawkins'
gem 'jekyll-asciidoc'
gem 'jekyll-redirect-from'
gem 'jekyll-sitemap'
Expand All @@ -43,9 +43,8 @@ gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
# Performance-booster for watching directories on Windows
gem "wdm", "~> 0.1.0" if Gem.win_platform?


gem "webrick", "~> 1.7"

gem 'eventmachine', :git => 'https://github.com/eventmachine/eventmachine.git', tag: 'v1.2.7'


gem "rexml"
97 changes: 51 additions & 46 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,120 +4,125 @@ GIT
tag: v1.2.7
specs:
eventmachine (1.2.7)
eventmachine (1.2.7-x64-mingw32)

GEM
remote: https://rubygems.org/
specs:
addressable (2.8.1)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
asciidoctor (2.0.17)
asciidoctor (2.0.20)
coderay (1.1.3)
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)
ffi (1.15.5)
ffi (1.15.5-x64-mingw32)
ffi (1.16.3)
forwardable-extended (2.6.0)
hawkins (2.0.5)
em-websocket (~> 0.5)
jekyll (~> 3.1)
google-protobuf (3.25.1)
http_parser.rb (0.8.0)
i18n (0.9.5)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
jekyll (3.8.6)
jekyll (4.3.3)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 0.7)
jekyll-sass-converter (~> 1.0)
i18n (~> 1.0)
jekyll-sass-converter (>= 2.0, < 4.0)
jekyll-watch (~> 2.0)
kramdown (~> 1.14)
kramdown (~> 2.3, >= 2.3.1)
kramdown-parser-gfm (~> 1.0)
liquid (~> 4.0)
mercenary (~> 0.3.3)
mercenary (>= 0.3.6, < 0.5)
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
rouge (>= 3.0, < 5.0)
safe_yaml (~> 1.0)
jekyll-asciidoc (3.0.0)
asciidoctor (>= 1.5.0)
terminal-table (>= 1.8, < 4.0)
webrick (~> 1.7)
jekyll-asciidoc (3.0.1)
asciidoctor (>= 1.5.0, < 3.0.0)
jekyll (>= 3.0.0)
jekyll-feed (0.16.0)
jekyll-feed (0.17.0)
jekyll (>= 3.7, < 5.0)
jekyll-include-cache (0.2.1)
jekyll (>= 3.7, < 5.0)
jekyll-redirect-from (0.16.0)
jekyll (>= 3.3, < 5.0)
jekyll-rushed-analytics (0.1.15.pre)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
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)
jekyll (>= 3.7, < 5.0)
jekyll-watch (2.2.1)
listen (~> 3.0)
just-the-docs (0.2.5)
jekyll (~> 3.8.5)
jekyll-seo-tag (~> 2.0)
rake (~> 12.3.1)
kramdown (1.17.0)
liquid (4.0.3)
listen (3.7.1)
just-the-docs (0.7.0)
jekyll (>= 3.8.5)
jekyll-include-cache
jekyll-seo-tag (>= 2.0)
rake (>= 12.3.1)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.4)
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
mercenary (0.4.0)
method_source (1.0.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
pry (0.14.1)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (5.0.0)
rake (12.3.3)
public_suffix (5.0.4)
rake (13.1.0)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
rb-readline (0.5.5)
rouge (3.30.0)
rexml (3.2.6)
rouge (4.2.0)
safe_yaml (1.0.5)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-embedded (1.69.5)
google-protobuf (~> 3.23)
rake (>= 13.0.0)
slim (3.0.9)
temple (>= 0.7.6, < 0.9)
tilt (>= 1.3.3, < 2.1)
temple (0.8.2)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
thread_safe (0.3.6)
tilt (2.0.11)
tzinfo (2.0.5)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
tzinfo-data (1.2022.5)
tzinfo-data (1.2023.4)
tzinfo (>= 1.0.0)
wdm (0.1.1)
webrick (1.7.0)
unicode-display_width (2.5.0)
webrick (1.8.1)

PLATFORMS
x64-mingw32
x86_64-linux

DEPENDENCIES
eventmachine!
hawkins
jekyll (= 3.8.6)
jekyll (= 4.3.3)
jekyll-asciidoc
jekyll-feed (~> 0.6)
jekyll-redirect-from
jekyll-rushed-analytics (~> 0.1.15.pre)
jekyll-sitemap
just-the-docs (= 0.2.5)
just-the-docs (= 0.7.0)
pry
rb-readline
rexml
slim (~> 3.0.7)
thread_safe (~> 0.3.5)
tzinfo-data
wdm (~> 0.1.0)
webrick (~> 1.7)

BUNDLED WITH
Expand Down
2 changes: 1 addition & 1 deletion _sass/custom/custom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// // Colors
// //
//
// var(--white): #fff;
// var(--white): #fff;
//
// $grey-dk-000: #959396;
// $grey-dk-100: #5c5962;
Expand Down
2 changes: 1 addition & 1 deletion _sass/support/_functions.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@function rem($size, $unit:"") {
$remSize: $size / $root-font-size;
$remSize: calc($size / $root-font-size);

@if ($unit == false) {
@return #{$remSize};
Expand Down
45 changes: 44 additions & 1 deletion _sass/support/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,47 @@
$body-font-family: -apple-system, BlinkMacSystemFont, "helvetica neue", helvetica, roboto, noto, "segoe ui", arial, sans-serif !default;
$mono-font-family: "SFMono-Regular", Menlo, Consolas, Monospace !default;
$root-font-size: 16px !default; // Base font-size for rems
$content-line-height: 1.6 !default;
$body-line-height: 1.4 !default;
$body-heading-line-height: 1.15 !default !default;
$body-heading-line-height: 1.15 !default;

//
// Colors
//

// Colors

$white: #fff !default;
$grey-dk-000: #959396 !default;
$grey-dk-100: #5c5962 !default;
$grey-dk-200: #44434d !default;
$grey-dk-250: #302d36 !default;
$grey-dk-300: #27262b !default;
$grey-lt-000: #f5f6fa !default;
$grey-lt-100: #eeebee !default;
$grey-lt-200: #ecebed !default;
$grey-lt-300: #e6e1e8 !default;
$purple-000: #7253ed !default;
$purple-100: #5e41d0 !default;
$purple-200: #4e26af !default;
$purple-300: #381885 !default;
$blue-000: #2c84fa !default;
$blue-100: #2869e6 !default;
$blue-200: #264caf !default;
$blue-300: #183385 !default;
$green-000: #41d693 !default;
$green-100: #11b584 !default;
$green-200: #009c7b !default;
$green-300: #026e57 !default;
$yellow-000: #ffeb82 !default;
$yellow-100: #fadf50 !default;
$yellow-200: #f7d12e !default;
$yellow-300: #e7af06 !default;
$red-000: #f77e7e !default;
$red-100: #f96e65 !default;
$red-200: #e94c4c !default;
$red-300: #dd2e2e !default;

:root {
--white: #fff;
--black: #222222;
Expand Down Expand Up @@ -151,6 +185,8 @@ $sp-10: map-get($spacers, sp-10) !default; // 4.5 rem == 48px

$border: 1px solid !default;
$border-radius: 24px !default;
//$border-radius: 4px !default;
$border-color: $grey-lt-100 !default;

//
// Grid system
Expand All @@ -160,6 +196,13 @@ $gutter-spacing: $sp-6 !default;
$gutter-spacing-sm: $sp-4 !default;
$nav-width: 232px !default;
$content-width: 800px !default;
$nav-width-md: 15.5rem !default;
$nav-list-item-height: $sp-6 !default;
$nav-list-item-height-sm: $sp-8 !default;
$nav-list-expander-right: true;
$header-height: 3.75rem !default;
$search-results-width: $content-width - $nav-width !default;
$transition-duration: 400ms;

$media-queries: (
xs: 320px,
Expand Down
2 changes: 1 addition & 1 deletion assets/css/just-the-docs-light.scss
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
---
---

0 comments on commit c5aa835

Please sign in to comment.