Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/detect-renamed-posts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ jobs:

steps:
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
# this enables doing git diff HEAD^ for the squashed PR commit
fetch-depth: 2

- name: Set Up Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 22

- name: Run Renaming Script
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/detect-ruby-version-mismatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Verify Ruby version in readme.md matches .ruby-version
run: |
RUBY_VERSION=$(cat .ruby-version)
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.2
3.3.8
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.2.2-slim-bullseye
FROM ruby:3.3.8-slim-bookworm

ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y --no-install-recommends \
Expand All @@ -14,6 +14,7 @@ WORKDIR /memfault/interrupt
COPY Gemfile .
COPY Gemfile.lock .
RUN bundle config force_ruby_platform true
RUN gem install bundler -v 4.0.10
RUN bundle install

COPY requirements.txt .
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }

# gem "rails"

gem "jekyll", "~> 4.2.1"
gem "jekyll", "~> 4.4"

gem "jekyll-paginate", "~> 1.1"
gem "jekyll-feed", "~> 0.15.1"
gem 'jekyll-seo-tag', "~> 2.7.1"
gem "jekyll-feed", "~> 0.17"
gem 'jekyll-seo-tag', "~> 2.8"

group :jekyll_plugins do
gem 'jekyll-diagrams'
Expand Down
77 changes: 46 additions & 31 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,46 +1,56 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
addressable (2.9.0)
public_suffix (>= 2.0.2, < 8.0)
base64 (0.3.0)
bigdecimal (4.1.1)
colorator (1.1.0)
concurrent-ruby (1.3.4)
concurrent-ruby (1.3.6)
csv (3.3.5)
deep_merge (1.2.2)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
eventmachine (1.2.7)
ffi (1.17.0)
ffi (1.17.4)
forwardable-extended (2.6.0)
http_parser.rb (0.8.0)
i18n (1.14.6)
google-protobuf (4.34.1)
bigdecimal
rake (~> 13.3)
http_parser.rb (0.8.1)
i18n (1.14.8)
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-diagrams (0.10.0)
jekyll (>= 3.8, < 5.0)
jekyll-feed (0.15.1)
jekyll-feed (0.17.0)
jekyll (>= 3.7, < 5.0)
jekyll-get-json (1.0.0)
deep_merge (~> 1.2)
jekyll (>= 3.0)
jekyll-paginate (1.1.0)
jekyll-sass-converter (2.2.0)
sassc (> 2.0.1, < 3.0)
jekyll-seo-tag (2.7.1)
jekyll-sass-converter (3.1.0)
sass-embedded (~> 1.75)
jekyll-seo-tag (2.8.0)
jekyll (>= 3.8, < 5.0)
jekyll-sitemap (1.4.0)
jekyll (>= 3.7, < 5.0)
Expand All @@ -49,49 +59,54 @@ GEM
nokogiri (~> 1.10)
jekyll-watch (2.2.1)
listen (~> 3.0)
kramdown (2.4.0)
rexml
json (2.19.3)
kramdown (2.5.2)
rexml (>= 3.4.4)
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.4)
listen (3.9.0)
listen (3.10.0)
logger
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
logger (1.7.0)
mercenary (0.4.0)
mini_portile2 (2.8.7)
nokogiri (1.16.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
pathutil (0.16.2)
forwardable-extended (~> 2.6)
public_suffix (6.0.1)
public_suffix (7.0.5)
racc (1.8.1)
rake (13.4.1)
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.99.0)
google-protobuf (~> 4.31)
rake (>= 13)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
unicode-display_width (2.6.0)
webrick (1.8.2)

PLATFORMS
ruby

DEPENDENCIES
jekyll (~> 4.2.1)
jekyll (~> 4.4)
jekyll-diagrams
jekyll-feed (~> 0.15.1)
jekyll-feed (~> 0.17)
jekyll-get-json (~> 1.0)
jekyll-paginate (~> 1.1)
jekyll-seo-tag (~> 2.7.1)
jekyll-seo-tag (~> 2.8)
jekyll-sitemap (~> 1.4)
jekyll-target-blank (~> 2.0)
webrick (~> 1.7)

BUNDLED WITH
2.2.29
4.0.10
21 changes: 20 additions & 1 deletion _sass/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,26 @@ $github-color: #000000;
$rss-color: $orange-color;
$linkedin-color: #0077B5;


$blue: #141443;
$gray: rgba(20, 24, 69, 0.15);
$white: white;

$baseline-height: 2rem;

$main-color: #141845;
$background-color: #FDFDFD;
$text-color: #222222;

$link-color: $main-color;
$theme-color: $main-color;

// Dark theme
$main-color-dark: #FDFDFD;
$background-color-dark: #141845;
$text-color-dark: #FDFDFD;

// Additional colors
$light-grey: #CBD6E2;
$disabled-color: rgba(103, 113, 144, 1.0);
$background-color2: #F5F8FA;
$dark-grey: #33475b;
29 changes: 4 additions & 25 deletions _sass/base.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@use "sass:color";
@use "variables" as *;

/*
* Emerald is a simple blog theme built for Jekyll.
*/
Expand All @@ -16,30 +19,6 @@ html, body, h1, h2, h3, h4, h5, h6, p, ul, ol, li, img {
border: 0;
}

$baseline-height: 2rem;

/*- Base color -*/

$main-color: #141845;
$background-color: #FDFDFD;
$text-color: #222222;

$link-color: $main-color;

$theme-color: $main-color;

// Dark theme (not used)
$main-color-dark: #FDFDFD;
$background-color-dark: #141845;
$text-color-dark: #FDFDFD;


// Addition colors
$light-grey: #CBD6E2;
$disabled-color: rgba(103, 113, 144, 1.0);
$background-color2: #F5F8FA;
$dark-grey: #33475b;

/*- Base settings -*/

html {
Expand All @@ -58,7 +37,7 @@ a {
font-weight: 700;
&:hover,
&:focus {
color: darken($link-color, 5%);
color: color.adjust($link-color, $lightness: -5%);
}
}

Expand Down
9 changes: 5 additions & 4 deletions _sass/custom.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
@use "sass:color";
@use "variables" as *;

/*- Custom style -*/


/*- colors -*/

@import "variables";

/*- formatting -*/

%colored-links {
Expand All @@ -14,7 +15,7 @@
font-weight: 700;
&:hover,
&:focus {
color: darken($link-color, 5%);
color: color.adjust($link-color, $lightness: -5%);
}
}
}
Expand All @@ -28,7 +29,7 @@
width: 5rem;
height: 1px;
margin: 23px auto;
background-color: lighten($text-color, 70%);
background-color: color.adjust($text-color, $lightness: 70%);
}

ul, ol {
Expand Down
Loading
Loading