From 9285a5eddd5bf59fecae54ce9a8e2179a5481de5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Jul 2025 12:49:30 +0000 Subject: [PATCH 1/2] Bump super-linter/super-linter from 7 to 8 Bumps [super-linter/super-linter](https://github.com/super-linter/super-linter) from 7 to 8. - [Release notes](https://github.com/super-linter/super-linter/releases) - [Changelog](https://github.com/super-linter/super-linter/blob/main/CHANGELOG.md) - [Commits](https://github.com/super-linter/super-linter/compare/v7...v8) --- updated-dependencies: - dependency-name: super-linter/super-linter dependency-version: '8' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/linter.yml | 2 +- .github/workflows/test_website.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 74170981c87..1de15828f82 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -31,7 +31,7 @@ jobs: run: | echo "VALIDATE_ALL_CODEBASE=false" >> $GITHUB_ENV - name: Lint Code Base - uses: super-linter/super-linter/slim@v7 + uses: super-linter/super-linter/slim@v8 env: DEFAULT_BRANCH: main GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/test_website.yml b/.github/workflows/test_website.yml index c06905137f7..eab7f3bf794 100644 --- a/.github/workflows/test_website.yml +++ b/.github/workflows/test_website.yml @@ -40,7 +40,7 @@ jobs: - name: Use more complete checks for generated HTML linting run: cp -f .github/linters/.htmlhintrc_morechecks .github/linters/.htmlhintrc - name: Lint Generated HTML - uses: super-linter/super-linter/slim@v7 + uses: super-linter/super-linter/slim@v8 env: DEFAULT_BRANCH: main FILTER_REGEX_INCLUDE: src/static/html/.* From 40775c2ef91ff2a57f1cf5a3b9152a88851e9adb Mon Sep 17 00:00:00 2001 From: Max Ostapenko <1611259+max-ostapenko@users.noreply.github.com> Date: Tue, 29 Jul 2025 22:45:43 +0200 Subject: [PATCH 2/2] lint --- src/server/config.py | 6 ------ src/static/css/almanac.css | 4 ++-- src/static/css/index.css | 2 +- src/static/css/page.css | 16 ++++++++-------- src/static/js/almanac.js | 2 +- src/tools/generate/generate_chapters.js | 2 +- src/tools/generate/generate_figure_images.js | 2 +- 7 files changed, 14 insertions(+), 20 deletions(-) diff --git a/src/server/config.py b/src/server/config.py index 7744c4d7654..12980d515a4 100644 --- a/src/server/config.py +++ b/src/server/config.py @@ -23,12 +23,10 @@ def get_config(year): - global config_json return config_json[year] if year in config_json else None def get_timestamps_config(): - global timestamps_json return timestamps_json @@ -68,10 +66,6 @@ def get_live(json_config): def update_config(): - global SUPPORTED_YEARS - global SUPPORTED_CHAPTERS - global SUPPORTED_LANGUAGES - global config_json global timestamps_json global contributors diff --git a/src/static/css/almanac.css b/src/static/css/almanac.css index 5a61f648770..64135d9afcb 100644 --- a/src/static/css/almanac.css +++ b/src/static/css/almanac.css @@ -1233,10 +1233,10 @@ p.copyright a { top: 100%; left: -20px; /* overcome the parent container's 20px side padding */ right: -20px; /* overcome the parent container's 20px side padding */ - border-top: 1px solid rgba(242, 242, 242, 0.2); + border-top: 1px solid rgb(242, 242, 242, 0.2); padding: 60px 30px 30px; background-color: #677486; - box-shadow: 0 0 16px 0 rgba(78, 85, 100, 1); + box-shadow: 0 0 16px 0 rgb(78, 85, 100, 1); z-index: 2; } diff --git a/src/static/css/index.css b/src/static/css/index.css index 415fddb8906..b46d0c70fad 100644 --- a/src/static/css/index.css +++ b/src/static/css/index.css @@ -308,7 +308,7 @@ p { max-width: 100%; height: auto; z-index: -1; - background: linear-gradient(180deg, rgba(0, 0, 0, 0) calc(70% - 1px), rgb(192, 192, 192) calc(50%), rgba(0, 0, 0, 0) calc(70% + 1px)); + background: linear-gradient(180deg, rgb(0, 0, 0, 0) calc(70% - 1px), rgb(192, 192, 192) calc(50%), rgb(0, 0, 0, 0) calc(70% + 1px)); } @media (max-width: 87.5em) and (min-width: 56.26em) { diff --git a/src/static/css/page.css b/src/static/css/page.css index 9ae9f2e362b..cfa320b3715 100644 --- a/src/static/css/page.css +++ b/src/static/css/page.css @@ -11,8 +11,8 @@ .floating-card { border-radius: 16px; border-radius: 1rem; - box-shadow: 0 0 16px 0 rgba(78, 85, 100, 0.2); - box-shadow: 0 0 1rem 0 rgba(78, 85, 100, 0.2); + box-shadow: 0 0 16px 0 rgb(78, 85, 100, 0.2); + box-shadow: 0 0 1rem 0 rgb(78, 85, 100, 0.2); } .table-wrap { @@ -87,7 +87,7 @@ width: 100%; margin: 0; padding-left: 0; - border-top: 1px solid rgba(26, 43, 73, 0.1); + border-top: 1px solid rgb(26, 43, 73, 0.1); } .index ul ul:first-child { @@ -98,7 +98,7 @@ position: relative; font-weight: 900; list-style-type: none; - border-bottom: 1px solid rgba(26, 43, 73, 0.1); + border-bottom: 1px solid rgb(26, 43, 73, 0.1); } .index ul:last-child li:last-child { @@ -116,7 +116,7 @@ .index li li { font-weight: 700; - border-bottom: 1px solid rgba(26, 43, 73, 0.1); + border-bottom: 1px solid rgb(26, 43, 73, 0.1); } .index li li a { @@ -130,7 +130,7 @@ .index li li li { font-weight: normal; - border-bottom: 1px solid rgba(26, 43, 73, 0.1); + border-bottom: 1px solid rgb(26, 43, 73, 0.1); } .index li li li a { @@ -249,7 +249,7 @@ .chapter-cta { border: none; - box-shadow: 0 0 1rem 0 rgba(78, 85, 100, 0.2); + box-shadow: 0 0 1rem 0 rgb(78, 85, 100, 0.2); padding: 10px 12px; margin-top: 1em; margin-left: 1em; @@ -387,7 +387,7 @@ padding: 16px; border: 1px solid #e0e0e0; border-radius: 4px; - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1); + box-shadow: 0 1px 3px rgb(0, 0, 0, 0.1); font-family: monospace; background-color: #f9f9f9; overflow-x: auto; diff --git a/src/static/js/almanac.js b/src/static/js/almanac.js index 91ea1eb238b..58cb29b12a4 100644 --- a/src/static/js/almanac.js +++ b/src/static/js/almanac.js @@ -342,7 +342,7 @@ function highResolutionCanvasSupported() { largeCanvasSupported = Boolean(ctx.getImageData(1199, 741, 1, 1).data[3]) == 1; } } - catch (e) { + catch { largeCanvasSupported = false; } diff --git a/src/tools/generate/generate_chapters.js b/src/tools/generate/generate_chapters.js index 303ac85859a..7d6ab875512 100644 --- a/src/tools/generate/generate_chapters.js +++ b/src/tools/generate/generate_chapters.js @@ -84,7 +84,7 @@ const generate_chapters = async (chapter_match) => { try { [, language, year, chapter] = file.match(re); - } catch(error) { + } catch { // No match - skip to next in for loop continue; } diff --git a/src/tools/generate/generate_figure_images.js b/src/tools/generate/generate_figure_images.js index c343077d104..6d9fff608ad 100644 --- a/src/tools/generate/generate_figure_images.js +++ b/src/tools/generate/generate_figure_images.js @@ -51,7 +51,7 @@ const generate_images = async (chapter_match) => { try { [, language, year, chapter] = file.match(re); - } catch(error) { + } catch { // No match - skip to next in for loop continue; }