From 0fbbc661202f187fb7212ede17b39bd9c0e5cd97 Mon Sep 17 00:00:00 2001 From: Lorin Werthen-Brabants Date: Thu, 26 Sep 2024 09:08:55 +0200 Subject: [PATCH 01/29] WIP, introduce dark mode by updating bulma and dart-sass --- .gitmodules | 3 + Gemfile | 1 + Gemfile.lock | 12 ++ Rules | 7 +- content/assets/stylesheets/bulma | 1 + .../assets/stylesheets/includes/blogpost.scss | 3 +- .../stylesheets/includes/eventpage.scss | 7 +- .../assets/stylesheets/includes/events.scss | 10 +- .../assets/stylesheets/includes/general.scss | 16 +-- .../assets/stylesheets/includes/navbar.scss | 30 ++-- .../assets/stylesheets/includes/tiles.scss | 1 + content/assets/stylesheets/includes/toc.scss | 18 +-- .../stylesheets/includes/variables.scss | 38 ------ content/assets/stylesheets/main.scss | 52 ++++++- content/index.erb | 14 +- layouts/eventpost.erb | 10 +- layouts/events.erb | 4 +- layouts/partials/_events_tile.erb | 6 +- layouts/partials/_navbar.erb | 3 +- layouts/partials/_zeus_logo.erb | 31 +++++ lib/filters/dart_sass_custom.rb | 128 ++++++++++++++++++ lib/filters/sassc.rb | 4 - package.json | 6 +- yarn.lock | 34 ++++- 24 files changed, 326 insertions(+), 113 deletions(-) create mode 160000 content/assets/stylesheets/bulma delete mode 100644 content/assets/stylesheets/includes/variables.scss create mode 100644 layouts/partials/_zeus_logo.erb create mode 100644 lib/filters/dart_sass_custom.rb delete mode 100644 lib/filters/sassc.rb diff --git a/.gitmodules b/.gitmodules index 813c9210..971342bf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,3 +3,6 @@ #url = ssh://git@git.zeus.gent:2222/bestuur/drive.git url = https://git.zeus.gent/zeuswpi/drive.git branch = master +[submodule "content/assets/stylesheets/bulma"] + path = content/assets/stylesheets/bulma + url = https://github.com/jgthms/bulma diff --git a/Gemfile b/Gemfile index baad1a9b..b4311147 100644 --- a/Gemfile +++ b/Gemfile @@ -50,6 +50,7 @@ end group :nanoc do gem 'guard-nanoc' + gem 'nanoc-dart-sass' end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 9134d457..8c1a0fcc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,6 +14,7 @@ GEM rack-livereload (~> 0.3) autoprefixer-rails (10.4.15.0) execjs (~> 2) + bigdecimal (3.1.8) builder (3.2.4) coderay (1.1.3) colored (1.2) @@ -29,6 +30,9 @@ GEM execjs (2.9.1) ffi (1.15.5) formatador (1.1.0) + google-protobuf (4.28.2) + bigdecimal + rake (>= 13) guard (2.18.1) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) @@ -101,6 +105,9 @@ GEM slow_enumerator_tools (~> 1.0) tty-platform (~> 0.2) zeitwerk (~> 2.1) + nanoc-dart-sass (1.0.3) + nanoc-core (~> 4.12) + sass-embedded (~> 1.56) nanoc-deploying (1.0.2) nanoc-checking (~> 1.0) nanoc-cli (~> 4.11, >= 4.11.15) @@ -142,12 +149,16 @@ GEM rack (>= 3) webrick (~> 1.8) rainpress (1.0.1) + rake (13.2.1) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) rbtree (0.4.6) rexml (3.2.6) rubypants (0.7.1) + sass-embedded (1.79.3) + google-protobuf (~> 4.27) + rake (>= 13) sassc (2.4.0) ffi (~> 1.9) set (1.0.1) @@ -199,6 +210,7 @@ DEPENDENCIES kramdown kramdown-math-katex nanoc + nanoc-dart-sass nanoc-live pandoc-ruby puma diff --git a/Rules b/Rules index a74b4ba7..7dbcc0b0 100644 --- a/Rules +++ b/Rules @@ -10,6 +10,7 @@ require 'kramdown-math-katex' # Important!!! # First ignore the node_modules, we do not need any of it on the site directly. ignore '/node_modules/**/*' +ignore '/assets/stylesheets/bulma/**/*' # # @@ -231,18 +232,18 @@ compile '/assets/scripts/**/*.js' do end ignore '/data/**/*' - ignore '/assets/stylesheets/includes/**/*' + compile '/assets/stylesheets/**/*.scss' do # This filter is necessary for the workaround present in main.scss and deals with out of date dependencies filter :erb sass_opts = { syntax: :scss, - load_paths: ['content/assets/stylesheets'] + load_paths: ['content/assets/stylesheets','node_modules/'], } sass_opts[:style] = :compressed if production? - filter :sassc, sass_opts + filter :dart_sass_custom, sass_opts filter :autoprefixer if production? write ext: 'css' diff --git a/content/assets/stylesheets/bulma b/content/assets/stylesheets/bulma new file mode 160000 index 00000000..3fd2f650 --- /dev/null +++ b/content/assets/stylesheets/bulma @@ -0,0 +1 @@ +Subproject commit 3fd2f6502678c09dc39d2fe37980b88c2c5bc534 diff --git a/content/assets/stylesheets/includes/blogpost.scss b/content/assets/stylesheets/includes/blogpost.scss index 4ecdbbba..21ed1fda 100644 --- a/content/assets/stylesheets/includes/blogpost.scss +++ b/content/assets/stylesheets/includes/blogpost.scss @@ -14,10 +14,11 @@ margin: auto; .title { + font-weight: bolder; + @include tablet { font-size: 4rem; } - font-weight: bolder; } .subtitle { diff --git a/content/assets/stylesheets/includes/eventpage.scss b/content/assets/stylesheets/includes/eventpage.scss index b3c85ee7..414c5fd4 100644 --- a/content/assets/stylesheets/includes/eventpage.scss +++ b/content/assets/stylesheets/includes/eventpage.scss @@ -25,6 +25,7 @@ &.light-background { background-color: rgba(0, 0, 0, 0.75); + color: var(--bulma-background); } } @@ -57,11 +58,11 @@ } .event-tile-image { + max-width:200px; + max-height:200px; + // For now, don't show the event tile image on mobile, takes too much space @include mobile { display: none; } - - max-width:200px; - max-height:200px; } diff --git a/content/assets/stylesheets/includes/events.scss b/content/assets/stylesheets/includes/events.scss index 251604dd..172fc276 100644 --- a/content/assets/stylesheets/includes/events.scss +++ b/content/assets/stylesheets/includes/events.scss @@ -1,3 +1,4 @@ + .box.event-preview { border-radius: 0px; display: flex; @@ -16,11 +17,7 @@ padding-top:0px; box-shadow : none; width: 60%; - //for better spacing on mobile - @include mobile { - width: 100%; - } .title { font-size: 1.7em; font-weight: 500; @@ -50,6 +47,11 @@ font-size: 1.6em; font-weight: 400; } + + //for better spacing on mobile + @include mobile { + width: 100%; + } } .main-event { diff --git a/content/assets/stylesheets/includes/general.scss b/content/assets/stylesheets/includes/general.scss index eb2656cc..174a37e9 100644 --- a/content/assets/stylesheets/includes/general.scss +++ b/content/assets/stylesheets/includes/general.scss @@ -40,23 +40,23 @@ a.box:hover { border-bottom: none; } - &:visited:hover { - color: $link-hover; - } + // &:visited:hover { + // color: $button-link-hover; + // } } } footer .content a { &:not(.button) { - color: $text-light; + color: $text-weak; &:visited { - color: $text-light; + color: $text-weak; } - &:hover { - color: $link-hover; - } + // &:hover { + // color: $button-link-hover; + // } } } diff --git a/content/assets/stylesheets/includes/navbar.scss b/content/assets/stylesheets/includes/navbar.scss index 0bb05e1f..7ddc2136 100644 --- a/content/assets/stylesheets/includes/navbar.scss +++ b/content/assets/stylesheets/includes/navbar.scss @@ -18,13 +18,6 @@ } .navbar:not(.is-transparent) #logo-link { - @include desktop { - border-bottom: 2px solid $body-background; - margin-bottom: -2px; - width: 124px; - } - - #logo { @include desktop { max-width: none; @@ -35,6 +28,12 @@ position: absolute; } } + + @include desktop { + border-bottom: 2px solid var(--bulma-body-background-color); + margin-bottom: -2px; + width: 124px; + } } .navbar-item { @@ -42,23 +41,17 @@ font-size: 1.15em; } - @include touch { - .navbar-menu { - position: absolute; - width: 100%; - } - } - .navbar:not(.is-transparent) { .navbar-item { &:not(.is-active) { - color: #7a7a7a; + color: var(--bulma-text-title-l); } &.is-active { color: $primary; border-bottom: 2px solid; margin-bottom: -2px; + background-color: transparent; } } } @@ -70,4 +63,11 @@ transform: rotate(10deg); } } + + @include touch { + .navbar-menu { + position: absolute; + width: 100%; + } + } } diff --git a/content/assets/stylesheets/includes/tiles.scss b/content/assets/stylesheets/includes/tiles.scss index b34c3cfd..002e55bc 100644 --- a/content/assets/stylesheets/includes/tiles.scss +++ b/content/assets/stylesheets/includes/tiles.scss @@ -83,6 +83,7 @@ $top_coder_size: 80px; justify-content: center; table { + width: 100%; position: relative; tr:first-child { diff --git a/content/assets/stylesheets/includes/toc.scss b/content/assets/stylesheets/includes/toc.scss index 252f50da..a86518cd 100644 --- a/content/assets/stylesheets/includes/toc.scss +++ b/content/assets/stylesheets/includes/toc.scss @@ -1,15 +1,6 @@ // CSS related to the TOC #table-of-contents { - @include tablet { - position: absolute; - left: 100%; - } - - @include mobile { - text-align: center; - } - #markdown-toc { @extend .menu-list; @@ -18,6 +9,15 @@ list-style: none; } } + + @include tablet { + position: absolute; + left: 100%; + } + + @include mobile { + text-align: center; + } } $sel: ''; diff --git a/content/assets/stylesheets/includes/variables.scss b/content/assets/stylesheets/includes/variables.scss deleted file mode 100644 index 058be26c..00000000 --- a/content/assets/stylesheets/includes/variables.scss +++ /dev/null @@ -1,38 +0,0 @@ -// Colours -$zeus-orange: #ff7f00; -$zeus-blue: #00c4ff; - -$body-background: #fff; -$body-size: 1rem; - -$tile-orange: $zeus-orange; - -$navbar-border-color: #ccc; -$event-border-color: #ddd; - -$orange: $zeus-orange; -$blue: $zeus-blue; -$turquoise: #30d1b2; - -$link: $orange; -$link-visited: $link; - -$border-hover: $blue; - -$box-colour: #eee; -$highlighted-box-colour: $zeus-orange; -$highlighted-text-colour: #fff; -$highlighted-link-colour: #222324; - -$cammie-controls-color: rgba(0, 0, 0, .60); - -$event-padding: 10px; - -$primary: $orange; -$secondary: $zeus-blue; -$tertiary: $box-colour; - -// Let's trust the font the user chose -$family-sans-serif: sans-serif; - -$timeline-content-padding: 0.55em 0 0 2em; diff --git a/content/assets/stylesheets/main.scss b/content/assets/stylesheets/main.scss index 1e3dc90a..b5b782d1 100644 --- a/content/assets/stylesheets/main.scss +++ b/content/assets/stylesheets/main.scss @@ -3,10 +3,56 @@ // <% @items.find_all('/assets/stylesheets/includes/*').each {|e| e.raw_content } %> /* KEEP THIS ^^^^ */ -@import "includes/variables"; -@import "node_modules/bulma/bulma"; -@import "node_modules/bulma-timeline/src/sass/index.sass"; +// Colours +$zeus-orange: #ff7f00; +$zeus-blue: #00c4ff; + +$body-background: #fff; +$body-size: 1rem; + +$tile-orange: $zeus-orange; + +$navbar-border-color: #ccc; +$event-border-color: #ddd; + +$orange: $zeus-orange; +$blue: $zeus-blue; +$turquoise: #30d1b2; + +$link: $orange; +$link-visited: $link; + +$border-hover: $blue; + +$box-colour: #eee; +$highlighted-box-colour: $zeus-orange; +$highlighted-text-colour: #fff; +$highlighted-link-colour: #222324; + +$cammie-controls-color: rgba(0, 0, 0, .60); + +$event-padding: 10px; + +$primary: $orange; +$secondary: $zeus-blue; +$tertiary: $box-colour; + +// Let's trust the font the user chose +$family-sans-serif: sans-serif; + +$timeline-content-padding: 0.55em 0 0 2em; + +@use "bulma/sass" with ( + $primary: $zeus-orange, + $link: $zeus-orange +); + + +// @import "bulma/bulma"; +@import "bulma/sass/utilities/mixins"; +@import "bulma/sass/utilities/_index"; +// @import "node_modules/bulma-timeline/src/sass/index.sass"; // Sticky footer body { diff --git a/content/index.erb b/content/index.erb index 0e65ab93..268001aa 100644 --- a/content/index.erb +++ b/content/index.erb @@ -22,7 +22,7 @@
- + Upcoming Events @@ -46,7 +46,7 @@
- + Top Coders @@ -69,7 +69,7 @@
- + Previous Events @@ -85,7 +85,7 @@

- + About Zeus WPI

@@ -101,7 +101,7 @@
- + Blogpost @@ -124,7 +124,7 @@
- + Sponsoring members @@ -152,7 +152,7 @@
- + Sponsors diff --git a/layouts/eventpost.erb b/layouts/eventpost.erb index 8227989a..841ab248 100644 --- a/layouts/eventpost.erb +++ b/layouts/eventpost.erb @@ -17,16 +17,16 @@
<% if item[:banner] %> -
+
<% elsif item[:color] %> <% gradient = if item[:gradient].nil? || item[:gradient] 'linear-gradient(141deg,rgba(255,255,255,0),rgba(0,0,0,.60))' else 'none' end %> -
+
<% else %> -
+
<% end %>
<%= render '/partials/_navbar.*', zeus_logo_color: :white, transparent_nav: true %> @@ -39,7 +39,7 @@ <% if item[:header_text_background_color] %> style="background-color: <%= item[:header_text_background_color] %>" <% end %>> -

+

<%= item[:title] %> @@ -54,7 +54,7 @@

-

+

<%= item[:description] %>

    diff --git a/layouts/events.erb b/layouts/events.erb index 91a6c502..1f3b136d 100644 --- a/layouts/events.erb +++ b/layouts/events.erb @@ -49,9 +49,9 @@

    Upcoming events

<% upcoming_events_in_year_or_tag(@item).each_slice(1) do |slice| %> -
+
<% slice.each do |event| %> -
+
<%= render '/partials/_events_tile.*', event: event %>
<% end %> diff --git a/layouts/partials/_events_tile.erb b/layouts/partials/_events_tile.erb index 127c4da3..4f8b772a 100644 --- a/layouts/partials/_events_tile.erb +++ b/layouts/partials/_events_tile.erb @@ -1,11 +1,11 @@ <% if @event[:banner] %> - <% elsif @event[:color] %> - <% else %> - + <% end %>
<% if @event[:image] %> diff --git a/layouts/partials/_navbar.erb b/layouts/partials/_navbar.erb index 2df07b10..6dc9951e 100644 --- a/layouts/partials/_navbar.erb +++ b/layouts/partials/_navbar.erb @@ -5,7 +5,8 @@ <% if christmastime? %> <% end %> - + + <%= render '/partials/_zeus_logo.erb' %>
+ <%= fa :qrcode, fw: true %> Top up Tab balance + + + <%= fa :euro, fw: true %> Use Tab + +
+ + +
+

Call us

+
+

+ +32 9 264 47 51
+ Internal: 4751 +

+
- -
-

Pay us

-
-

- BE03 7340 5456 0384 -

-

- Please use the message "TAB <username>" when manually topping up your Tab balance -

- - <%= fa :qrcode, fw: true %> Top up Tab balance + + diff --git a/content/index.erb b/content/index.erb index 268001aa..485704b3 100644 --- a/content/index.erb +++ b/content/index.erb @@ -13,168 +13,164 @@ <% end %>
-
- <% if studytime? %> - <%= render '/tiles/blokmap.*' %> - <% end %> - -
-
-
- - - Upcoming Events - - -
- <% unless upcoming_events.empty? %> - <% upcoming_events.first(3).each do |event| %> -
- <%= render '/partials/_events_tile.*', event: event %> -
- <% end %> - <% else %> -
- There are currently no upcoming events. If you have a suggestion, let us know on mattermost in ~events! -
-
- <% end %> -
-
-
-
-
-
- - - Top Coders - - -
-
-
-
-

- - - -

-
-
- -
-
-
+
+
+ <% if studytime? %> + <%= render '/tiles/blokmap.*' %> + <% end %> -
- - - Previous Events - - -
- <% previous_events[0..3].each do |event| %> -
- <%= render '/partials/_events_tile.*', event: event %> -
- <%end%> + +
+
+ + + Upcoming Events + + +
+ <% unless upcoming_events.empty? %> + <% upcoming_events.first(3).each do |event| %> +
+ <%= render '/partials/_events_tile.*', event: event %>
+ <% end %> + <% else %> +
+ There are currently no upcoming events. If you have a suggestion, let us know on mattermost in ~events! +
-
-
-
-

- - About Zeus WPI - -

-

- Zeus WPI is the student association for Computer Science at Ghent University. - Our goal is to provide a stimulating environment for motivated students looking to expand their skills by engaging in interesting real-world projects. -

+ <% end %> +
-

- We organize various tech related events, such as talks by experts, hands-on coding events and introductory lectures for interesting technologies. - Together we build applications for Ghent University students (Hydra), for 12urenloop and of course for ourselves. -

-
-
- - - Blogpost + +
+ +
+ +
+ + + Top Coders + + +
+
+
+
+

+ + - +

+
+
+
- <% sorted_articles[0..2].each do |post| %> - <%= render '/partials/_blog_preview.*', post: post %> - <%end%>
+ + +
+ + + Previous Events + + +
+ <% previous_events[0..3].each do |event| %> +
+ <%= render '/partials/_events_tile.*', event: event %> +
+ <%end%>
-
- -
-
-
+ + +
+
+

+ + About Zeus WPI + +

+

+ Zeus WPI is the student association for Computer Science at Ghent University. + Our goal is to provide a stimulating environment for motivated students looking to expand their skills by engaging in interesting real-world projects. +

+ +

+ We organize various tech related events, such as talks by experts, hands-on coding events and introductory lectures for interesting technologies. + Together we build applications for Ghent University students (Hydra), for 12urenloop and of course for ourselves. +

+
+ + +
+ + + Blogpost + +
+ <% sorted_articles[0..2].each do |post| %> + <%= render '/partials/_blog_preview.*', post: post %> + <%end%>
- -
-
-
- - - Sponsoring members - - +
+ + +
+
+ + + Sponsoring members + + +
+ <% if current_sponsoring_members.nil? %> +
+

No sponsoring members yet for this academic year. Interested? Contact the board.

+
+ <% else %> +
+ <% current_sponsoring_members.shuffle.each do |member| %> +
+
+ + <%= member[:name] %> +
- <% if current_sponsoring_members.nil? %> -
-

No sponsoring members yet for this academic year. Interested? Contact the board.

-
- <% else %> -
- <% current_sponsoring_members.shuffle.each do |member| %> -
-
- - <%= member[:name] %> - -
-
- <% end %> -
- <% end %>
+ <% end %> +
+ <% end %> +
+ + +
+
+ + + Sponsors + +
-
-
-
- - - Sponsors - - + <% if current_sponsors.nil? %> +
+

No sponsors yet for this academic year. Interested? Contact the board.

+
+ <% else %> +
+ <% current_sponsors.shuffle.each do |sponsor| %> +
+
+ + <%= sponsor[:name] %> +
- <% if current_sponsors.nil? %> -
-

No sponsors yet for this academic year. Interested? Contact the board.

-
- <% else %> -
- <% current_sponsors.shuffle.each do |sponsor| %> -
-
- - <%= sponsor[:name] %> - -
-
- <% end %> -
- <% end %>
+ <% end %>
+ <% end %>
diff --git a/layouts/events.erb b/layouts/events.erb index 1f3b136d..2f54d96e 100644 --- a/layouts/events.erb +++ b/layouts/events.erb @@ -64,7 +64,7 @@

Past events

<% past_events_in_year_or_tag(@item).each_slice(1) do |slice| %> -
+
<% slice.each do |event| %>
<%= render '/partials/_events_tile.*', event: event %> From f2a3c15e327a49ddc0c8add8cebb90fb01ff373f Mon Sep 17 00:00:00 2001 From: lorin Date: Fri, 27 Sep 2024 08:55:08 +0000 Subject: [PATCH 19/29] Update .ruby-version --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index 4a36342f..fa7adc7a 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.0.0 +3.3.5 From 04c45023476b53316970f85e8f1f42d964488548 Mon Sep 17 00:00:00 2001 From: Lorin Werthen-Brabants Date: Fri, 27 Sep 2024 12:41:04 +0200 Subject: [PATCH 20/29] Unavailable image in the reports causes a crash.. --- lib/filters/pandoc_pdf.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/filters/pandoc_pdf.rb b/lib/filters/pandoc_pdf.rb index c95ea306..141351f9 100644 --- a/lib/filters/pandoc_pdf.rb +++ b/lib/filters/pandoc_pdf.rb @@ -15,6 +15,8 @@ def run(content, params = {}) content = content.gsub('\\', '\\\\') # Also escape tildes content = content.gsub('~', '\textasciitilde{}') + # And remove any markdown images + content = content.gsub(/!\[.*\]\(.*\)/, '') PandocRuby.convert(content, *args) From e18c72cca33c79b5c78aedbd7e463a28474f22c4 Mon Sep 17 00:00:00 2001 From: Lorin Werthen-Brabants Date: Fri, 27 Sep 2024 12:49:32 +0200 Subject: [PATCH 21/29] Remove some redundancy in the github workflow --- .github/workflows/build_site/action.yml | 35 +++++++++++++++++++++++++ .github/workflows/master.yml | 26 +----------------- .github/workflows/pr.yml | 26 +----------------- 3 files changed, 37 insertions(+), 50 deletions(-) create mode 100644 .github/workflows/build_site/action.yml diff --git a/.github/workflows/build_site/action.yml b/.github/workflows/build_site/action.yml new file mode 100644 index 00000000..d5837099 --- /dev/null +++ b/.github/workflows/build_site/action.yml @@ -0,0 +1,35 @@ +name: Build the site +description: Build the site using nanoc + +runs: + using: 'composite' + steps: + - name: Checkout repository + uses: actions/checkout@v2 + - name: Checkout submodule + shell: bash + run: git submodule update --init --recursive --remote + - name: Cache install Nix packages + uses: rikhuijzer/cache-install@c90964bcac3286c8571cb849f7caffb9e8b9cb37 + with: + key: nix-${{ hashFiles('packages.nix', 'gemset.nix') }} + nix_file: 'packages.nix' + - name: Cache Output + id: cache-output + uses: actions/cache@v4 + with: + path: | + ./tmp/ + ./output/ + key: build-${{ github.ref_name }} + restore-keys: | + build-master + - name: Set environment variable + shell: bash + run: "export LANG=en_US.UTF-8" + - name: Build site + shell: bash + run: "bundle exec nanoc --env=prod" + - name: Run checks + shell: bash + run: "bundle exec nanoc --env=prod check --deploy" \ No newline at end of file diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 30ac9b0e..fc9e3182 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -22,31 +22,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - - name: Checkout repository - uses: actions/checkout@v2 - - name: Checkout submodule - run: git submodule update --init --recursive --remote - - name: Cache install Nix packages - uses: rikhuijzer/cache-install@c90964bcac3286c8571cb849f7caffb9e8b9cb37 - with: - key: nix-${{ hashFiles('packages.nix', 'gemset.nix') }} - nix_file: 'packages.nix' - - name: Cache Output - id: cache-output - uses: actions/cache@v4 - with: - path: | - ./tmp/ - ./output/ - key: build-${{ github.ref_name }} - restore-keys: | - build-master - - name: Set environment variable - run: "export LANG=en_US.UTF-8" - - name: Build site - run: "bundle exec nanoc --env=prod" - - name: Run checks - run: "bundle exec nanoc --env=prod check --deploy" + - uses: ./.github/actions/build_site - name: Add private key shell: bash env: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index a40e8777..ac450b93 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -20,31 +20,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - - name: Checkout repository - uses: actions/checkout@v2 - - name: Checkout submodule - run: git submodule update --init --recursive --remote - - name: Cache install Nix packages - uses: rikhuijzer/cache-install@c90964bcac3286c8571cb849f7caffb9e8b9cb37 - with: - key: nix-${{ hashFiles('packages.nix', 'gemset.nix') }} - nix_file: 'packages.nix' - - name: Cache Output - id: cache-output - uses: actions/cache@v4 - with: - path: | - ./tmp/ - ./output/ - key: build-${{ github.ref_name }} - restore-keys: | - build-master - - name: Set environment variable - run: "export LANG=en_US.UTF-8" - - name: Build site - run: "bundle exec nanoc --env=prod" - - name: Run checks - run: "bundle exec nanoc --env=prod check --deploy" + - uses: ./.github/actions/build_site - name: Add private key shell: bash env: From 579a826772c9caedae4082fc312f0bfc717e7675 Mon Sep 17 00:00:00 2001 From: Lorin Werthen-Brabants Date: Fri, 27 Sep 2024 12:55:12 +0200 Subject: [PATCH 22/29] the folder is workflows, not actions --- .github/workflows/master.yml | 2 +- .github/workflows/pr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index fc9e3182..106af500 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -22,7 +22,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - - uses: ./.github/actions/build_site + - uses: ./.github/workflows/build_site - name: Add private key shell: bash env: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index ac450b93..ba4e7359 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -20,7 +20,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - - uses: ./.github/actions/build_site + - uses: ./.github/workflows/build_site - name: Add private key shell: bash env: From 33debbed5c13428c2080d26cf2b072aad4b158f9 Mon Sep 17 00:00:00 2001 From: Lorin Werthen-Brabants Date: Fri, 27 Sep 2024 12:56:10 +0200 Subject: [PATCH 23/29] Add a quick explanation regarding Nix users --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 5331fd6d..2e244e3e 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,14 @@ Our official meeting reports are added as a submodule so they update automatical git submodule update --init --recursive ``` +### For Nix users + +If you are using Nix, you can use the provided `shell.nix` file to get a shell with all the required dependencies. + +```bash +nix-shell +``` + ### Deploying The latest and greatest builds on master get deployed automatically using [travis](https://travis-ci.org). From 487e5c60d16116545f7919c55da296c0d481ccec Mon Sep 17 00:00:00 2001 From: lorin Date: Fri, 27 Sep 2024 15:24:12 +0200 Subject: [PATCH 24/29] Update action.yml --- .github/workflows/build_site/action.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build_site/action.yml b/.github/workflows/build_site/action.yml index d5837099..d30b908f 100644 --- a/.github/workflows/build_site/action.yml +++ b/.github/workflows/build_site/action.yml @@ -4,8 +4,6 @@ description: Build the site using nanoc runs: using: 'composite' steps: - - name: Checkout repository - uses: actions/checkout@v2 - name: Checkout submodule shell: bash run: git submodule update --init --recursive --remote From 08205a03c21f1964be762daece280dc507b2dba1 Mon Sep 17 00:00:00 2001 From: lorin Date: Fri, 27 Sep 2024 15:24:42 +0200 Subject: [PATCH 25/29] Update master.yml --- .github/workflows/master.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 106af500..4ea446c5 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -22,6 +22,8 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: + - name: Checkout repository + uses: actions/checkout@v2 - uses: ./.github/workflows/build_site - name: Add private key shell: bash From 50d327956c9c80e6555f482df84a9d898faadfba Mon Sep 17 00:00:00 2001 From: lorin Date: Fri, 27 Sep 2024 15:25:15 +0200 Subject: [PATCH 26/29] Update pr.yml --- .github/workflows/pr.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index ba4e7359..e46bb40f 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -20,6 +20,8 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: + - name: Checkout repository + uses: actions/checkout@v2 - uses: ./.github/workflows/build_site - name: Add private key shell: bash From 32094ec872fa289a72091d8d2d00754e90ce9ae2 Mon Sep 17 00:00:00 2001 From: lorin Date: Thu, 3 Oct 2024 14:29:58 +0200 Subject: [PATCH 27/29] Update eventpage.scss --- content/assets/stylesheets/includes/eventpage.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/assets/stylesheets/includes/eventpage.scss b/content/assets/stylesheets/includes/eventpage.scss index 7251276d..93774695 100644 --- a/content/assets/stylesheets/includes/eventpage.scss +++ b/content/assets/stylesheets/includes/eventpage.scss @@ -22,10 +22,10 @@ .header-text { padding: 20px; + color: var(--bulma-text-40-invert); &.light-background { background-color: rgba(0, 0, 0, 0.75); - color: var(--bulma-text-40-invert); } } From aaec8f01a160bf01479a3ff94a10d78513084cfa Mon Sep 17 00:00:00 2001 From: lorin Date: Thu, 3 Oct 2024 15:02:32 +0200 Subject: [PATCH 28/29] Update blogpost.scss --- content/assets/stylesheets/includes/blogpost.scss | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/content/assets/stylesheets/includes/blogpost.scss b/content/assets/stylesheets/includes/blogpost.scss index 1fd2a173..1b1dc3d6 100644 --- a/content/assets/stylesheets/includes/blogpost.scss +++ b/content/assets/stylesheets/includes/blogpost.scss @@ -12,11 +12,7 @@ .titlewrap { position: relative; margin: auto; - - .title { - font-weight: bolder; - } - + .subtitle { position: absolute; From a860481cf4eaa59029d1ddab717ca70d938672f8 Mon Sep 17 00:00:00 2001 From: lorin Date: Fri, 4 Oct 2024 10:22:45 +0200 Subject: [PATCH 29/29] Update underline --- content/assets/stylesheets/includes/general.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/assets/stylesheets/includes/general.scss b/content/assets/stylesheets/includes/general.scss index 9c38e819..08feb085 100644 --- a/content/assets/stylesheets/includes/general.scss +++ b/content/assets/stylesheets/includes/general.scss @@ -230,12 +230,12 @@ footer.footer { background-image: -webkit-linear-gradient( to right, $zeus-orange, - #ffffff + var(--bulma-body-background-color) ); /* Chrome 10-25, Safari 5.1-6 */ background-image: linear-gradient( to right, $zeus-orange, - #ffffff + var(--bulma-body-background-color) ); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ background-repeat: no-repeat; background-size: 100% 0.15em;