Introduce jekyll-asset to optimize/compress assets

.github/workflows/build-production.yml

@@ -23,18 +23,22 @@ jobs:
     - uses: actions/checkout@v2
     # Use GitHub Actions' cache to shorten build times and decrease load on servers
     - uses: actions/cache@v2
+      id: cache
       with:
         path: vendor/bundle
-        key: ${{ runner.os }}-gems-v2-${{ hashFiles('**/Gemfile.lock') }}
+        key: ${{ runner.os }}-gems-v${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/Gemfile') }}
         restore-keys: |
-          ${{ runner.os }}-gems-v2-
+          ${{ runner.os }}-gems-v${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/Gemfile') }}
+          ${{ runner.os }}-gems-v${{ secrets.CACHE_VERSION }}-
     # Use GitHub Deploy Action to build and deploy to Github
     - uses: helaili/jekyll-action@v2
       id: build
       with:
+        jekyll_src: "."
         jekyll_env: production
+        pre_build_commands: "apk add --update vips uglify-js"
         build_only: true
-        jekyll_build_options: --config _config.staging.yml -d _site
+        jekyll_build_options: --config _config.prod.yml -d _site
     - uses: burnett01/rsync-deployments@5.2
       with:
         switches: -avzr --delete --exclude=/docs/ --exclude=/antrag-bmwi

.github/workflows/build-staging.yml

@@ -11,22 +11,23 @@ jobs:
     name: "Build and deploy to GitHub Pages"
     runs-on: ubuntu-latest
     steps:
-    # Set postBuffer of git to maximum as lower values may cause trobule while pushing
-    - run: git config --global http.postBuffer 524288000
     - uses: actions/checkout@v2
       id: checkout
     # Use GitHub Actions' cache to shorten build times and decrease load on servers
     - uses: actions/cache@v2
       id: cache
       with:
         path: vendor/bundle
-        key: ${{ runner.os }}-gems-v2-${{ hashFiles('**/Gemfile') }}
+        key: ${{ runner.os }}-gems-v${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/Gemfile') }}
         restore-keys: |
-          ${{ runner.os }}-gems-v2-
+          ${{ runner.os }}-gems-v${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/Gemfile') }}
+          ${{ runner.os }}-gems-v${{ secrets.CACHE_VERSION }}-
     # Use GitHub Deploy Action to build and deploy to Github
     - uses: helaili/jekyll-action@v2
       id: build
       with:
+        jekyll_src: "."
         jekyll_env: development
+        pre_build_commands: "apk add --update vips uglify-js"
         build_only: true
-        jekyll_build_options: --config _config.staging.yml
+        jekyll_build_options: "--config _config.staging.yml"

Gemfile

@@ -3,7 +3,12 @@ source "https://rubygems.org"
 gem "jekyll"
 gem "jekyll-multiple-languages-plugin"
 gem "jekyll-redirect-from"
-gem "jekyll-seo-tag"
+# Use local version of jekyll-seo-tag v2.8.0 so that we can modify the template file
+gem "jekyll-seo-tag", path: "_gems/jekyll-seo-tag"
 gem "jekyll-last-modified-at"
 gem "jekyll-feed"
 gem "jekyll-scholar"
+# Use local version of jekyll-assets (master, 056d2c8) as RubyGems version is outdated
+gem "jekyll-assets", path: "_gems/jekyll-assets"
+gem "uglifier"
+gem "ruby-vips"

assets/css/_sass/custom.scss → _assets/css/_sass/custom.scss

@@ -262,6 +262,8 @@ tr:hover, tr:focus {
     background-color: rgba(0,0,0,0.3);
     backdrop-filter: blur(5px);
     border-radius: 20px;
+    padding-left: 1rem !important;
+    padding-right: 1rem !important;
 }
 
 .carousel-caption p {

_assets/css/_sass/fork-awesome/_path.scss

@@ -0,0 +1,16 @@
+/* FONT PATH
+ * -------------------------- */
+
+@font-face {
+  font-family: '#{$fa-font-family}';
+  src: asset_url('forkawesome-webfont.eot?v=#{$fa-version}');
+  src: asset_url('forkawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'),
+    asset_url('forkawesome-webfont.woff2?v=#{$fa-version}') format('woff2'),
+    asset_url('forkawesome-webfont.woff?v=#{$fa-version}') format('woff'),
+    asset_url('forkawesome-webfont.ttf?v=#{$fa-version}') format('truetype'),
+    asset_url('forkawesome-webfont.svg?v=#{$fa-version}#forkawesomeregular') format('svg');
+//  src: url('#{$fa-font-path}/ForkAwesome.otf') format('opentype'); // used when developing fonts
+  font-weight: normal;
+  font-style: normal;
+  font-display: block;
+}