solving conflicts

.github/workflows/jekyll.yml

@@ -0,0 +1,71 @@
+name: Jekyll site CI
+
+on:
+  push:
+    branches: [ main, master ]
+  pull_request:
+    branches: [ main, master ]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.inputs.branch }}
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1.196.0
+        with:
+          ruby-version: '3.3'
+          bundler-cache: true
+          cache-version: 0
+
+      - name: Setup Pages
+        id: pages
+        uses: actions/configure-pages@v2
+
+      - name: Install dependencies
+        run: |
+          bundle install
+
+      - name: Build with Jekyll
+        # Outputs to the './_site' directory by default
+        run: |
+          bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
+        env:
+          PAGES_REPO_NWO: ${{ github.repository }}
+          JEKYLL_ENV: production
+          JEKYLL_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          JEKYLL_BUILD_BRANCH: ${{ github.ref_name }}
+          JEKYLL_BASE_PATH: ${{ steps.pages.outputs.base_path }}
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v1
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+
+    if: |
+      github.event_name == 'workflow_dispatch' ||
+      (github.event_name == 'push' && github.event.repository.default_branch == github.ref_name)
+    concurrency:
+      group: "pages"
+      cancel-in-progress: true
+
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v1

.gitignore

@@ -1,2 +1,6 @@
-.DS_Store*
-site/
+_site
+.sass-cache
+.jekyll-cache
+.jekyll-metadata
+vendor
+.idea

404.html

@@ -0,0 +1,22 @@
+---
+permalink: /404.html
+layout: default
+---
+
+<style type="text/css" media="screen">
+  .not-found.container {
+    margin: 10px auto;
+    text-align: center;
+  }
+  .not-found.container h1 {
+    margin: 30px 0;
+    font-size: 4em;
+    line-height: 1;
+    letter-spacing: -1px;
+  }
+</style>
+
+<div class="container not-found">
+  <h1>404</h1>
+  <p>The requested page could not be found.</p>
+</div>

Gemfile

@@ -0,0 +1,16 @@
+source "https://rubygems.org"
+
+gem "elixir-toolkit-theme-plugins", "~> 0.1.9"
+gem "webrick", "~> 1.7"
+gem "jekyll", "~> 4.3.2"
+gem "jemoji", "~> 0.13.0"
+gem "kramdown-parser-gfm", "~> 1.1"
+
+group :jekyll_plugins do
+  gem "jekyll-redirect-from", "~> 0.16.0"
+  gem "jekyll-sitemap", "~> 1.4"
+  gem "jekyll-github-metadata", "~> 2.15"
+  gem "jekyll-relative-links", "~> 0.6"
+  gem "jekyll-seo-tag", "~> 2.8"
+  gem "jekyll-remote-theme", "~> 0.4.3"
+end