From 33e0587bb0bd38790628fd92cbde934a2ff3b002 Mon Sep 17 00:00:00 2001 From: Radovan Bast Date: Thu, 13 Aug 2026 15:47:17 +0200 Subject: [PATCH] uikit: simplify to not require including it as git submodule previously the submodule confused those who cloned without --recursive and it made maintenance a bit more difficult --- .github/workflows/build-preview.yml | 4 +- .../workflows/build-upon-push-or-merge.yml | 4 +- .gitmodules | 3 - README.md | 2 +- sass/style.scss | 114 ++++++++++++++---- uikit | 1 - update-uikit.sh | 18 --- 7 files changed, 94 insertions(+), 52 deletions(-) delete mode 100644 .gitmodules delete mode 160000 uikit delete mode 100755 update-uikit.sh diff --git a/.github/workflows/build-preview.yml b/.github/workflows/build-preview.yml index 2813676de..91f804843 100644 --- a/.github/workflows/build-preview.yml +++ b/.github/workflows/build-preview.yml @@ -31,10 +31,8 @@ jobs: if: github.event_name == 'pull_request' && github.repository == github.event.pull_request.head.repo.full_name steps: - - name: Checkout repository and submodules + - name: Checkout repository uses: actions/checkout@v4 - with: - submodules: recursive - name: Install zola run: | diff --git a/.github/workflows/build-upon-push-or-merge.yml b/.github/workflows/build-upon-push-or-merge.yml index 4bbbd980c..534e7c6e2 100644 --- a/.github/workflows/build-upon-push-or-merge.yml +++ b/.github/workflows/build-upon-push-or-merge.yml @@ -31,10 +31,8 @@ jobs: if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} steps: - - name: Checkout repository and submodules + - name: Checkout repository uses: actions/checkout@v4 - with: - submodules: recursive - name: Install zola run: | diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index c88ea2d4b..000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "uikit"] - path = uikit - url = git@github.com:uikit/uikit.git diff --git a/README.md b/README.md index 1863437db..ad751a289 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ or [download the binary](https://github.com/getzola/zola/releases). Then: ``` -$ git clone --recursive git@github.com:coderefinery/coderefinery.org.git +$ git clone git@github.com:coderefinery/coderefinery.org.git $ cd coderefinery.org $ zola serve ``` diff --git a/sass/style.scss b/sass/style.scss index 058b9cd2b..eb8441bf4 100644 --- a/sass/style.scss +++ b/sass/style.scss @@ -1,25 +1,90 @@ -// https://webaim.org/blog/wcag-2-0-and-link-colors/ -// https://github.com/uikit/uikit/blob/develop/src/scss/variables-theme.scss -$global-link-color: #3366dd; -$navbar-nav-item-color: #3366dd; -$navbar-nav-item-hover-color: #cc0099; -$iconnav-item-color: #3366dd; -$iconnav-item-hover-color: #cc0099; -$global-primary-background: #3366cc; -$global-secondary-background: #993366; -$base-code-color: #cc0099; -$text-meta-color: #666666; -$table-header-cell-color: #666666; - -// https://getuikit.com/docs/sass -@import "../uikit/src/scss/variables-theme.scss"; -@import "../uikit/src/scss/mixins-theme.scss"; -@import "../uikit/src/scss/uikit-theme.scss"; +a, +.uk-link { + color: #3366dd; +} + +:not(pre)>code, +:not(pre)>kbd, +:not(pre)>samp { + color: #cc0099; +} + +.uk-table th { + color: #666666; +} + +.uk-text-meta, +.uk-text-meta>a { + color: #666666; +} + +.uk-button-primary { + background-color: #3366cc; +} +.uk-button-primary:hover { + background-color: #2e5cb8; +} + +.uk-button-primary:active, +.uk-button-primary.uk-active { + background-color: #2952a3; +} + +.uk-background-primary { + background-color: #3366cc; +} + +.uk-card-secondary, +.uk-card-secondary.uk-card-hover:hover { + background-color: #993366; +} + +.uk-offcanvas-bar { + background: #993366; +} + +.uk-alert-primary { + background: #d6e0f5; + color: #3366cc; +} + +.uk-navbar-nav>li>a { + color: #3366dd; +} + +.uk-navbar-nav>li:hover>a, +.uk-navbar-nav>li>a[aria-expanded="true"] { + color: #cc0099; +} + +.uk-iconnav>*>a { + color: #3366dd; +} + +.uk-iconnav>*>a:hover { + color: #cc0099; +} + +// this used to be "@extend .uk-list; @extend .uk-list-square;" .markdown ul { - @extend .uk-list; - @extend .uk-list-square; + padding: 0; + padding-left: 30px; + list-style: none; + list-style-type: square; +} + +.markdown ul>* { + break-inside: avoid-column; +} + +.markdown ul>*> :last-child { + margin-bottom: 0; +} +.markdown ul> :nth-child(n+2), +.markdown ul>*>ul { + margin-top: 10px; } .site-footer a { @@ -32,8 +97,11 @@ $table-header-cell-color: #666666; .logo-container { display: flex; - justify-content: space-between; /* Evenly space logos */ - align-items: center; /* Align logos vertically */ + justify-content: space-between; + /* Evenly space logos */ + align-items: center; + /* Align logos vertically */ padding: 10px; - gap: 20px; /* Optional: uniform gap between logos */ -} + gap: 20px; + /* Optional: uniform gap between logos */ +} \ No newline at end of file diff --git a/uikit b/uikit deleted file mode 160000 index ef32556bf..000000000 --- a/uikit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ef32556bf265a6d01f79888f1bfb08eb168a6065 diff --git a/update-uikit.sh b/update-uikit.sh deleted file mode 100755 index 624768d6a..000000000 --- a/update-uikit.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash - -# safe bash settings -set -euo pipefail - -cd uikit -git checkout main -git pull origin main - -latest_tag=$(git describe --tags --abbrev=0) - -cd .. -git add uikit - -old_version=$(grep -oP "uikit@(\d+\.\d+\.\d+)" templates/base.html | head -n 1) -new_version="uikit@${latest_tag#v}" - -sed -i "s/${old_version}/${new_version}/g" templates/base.html