mirror of https://github.com/lxndrblz/anatole.git

Andreas Deininger
26.49.2025 71f54e941b74122353d950c04c7afa1a7b887595
fix: make setting 'contentratio' work again (#560)

Make setting 'concentration' work again
2 files deleted
10 files modified
93 ■■■■ changed files
.devcontainer/devcontainer.json 2 ●●● patch | view | raw | blame | history
.github/workflows/update-resources.yml 4 ●●●● patch | view | raw | blame | history
.gitignore 1 ●●●● patch | view | raw | blame | history
assets/scss/anatole.rtl.scss 4 ●●●● patch | view | raw | blame | history
assets/scss/anatole.scss 4 ●●●● patch | view | raw | blame | history
assets/scss/main.scss 1 ●●●● patch | view | raw | blame | history
assets/scss/modules/_variables.scss 6 ●●●●● patch | view | raw | blame | history
assets/scss/partials/components/_wrapper.scss 8 ●●●● patch | view | raw | blame | history
exampleSite/config/_default/languages.toml 6 ●●●● patch | view | raw | blame | history
exampleSite/config/_default/params.toml 3 ●●●●● patch | view | raw | blame | history
layouts/partials/head.html 52 ●●●●● patch | view | raw | blame | history
netlify.toml 2 ●●● patch | view | raw | blame | history
.devcontainer/devcontainer.json
@@ -6,7 +6,7 @@
      // Update VARIANT to pick hugo variant.
      // Example variants: hugo, hugo_extended
      // Rebuild the container if it already exists to update.
      "VARIANT": "hugo",
      "VARIANT": "hugo_extended",
      // Update VERSION to pick a specific hugo version.
      // Example versions: latest, 0.73.0, 0,71.1
      // Rebuild the container if it already exists to update.
.github/workflows/update-resources.yml
@@ -15,11 +15,11 @@
        uses: peaceiris/actions-hugo@v3
        with:
          extended: true
          hugo-version: 0.134.2
          hugo-version: 0.147.5
      - name: setup node
        uses: actions/setup-node@v4
        with:
          node-version: 20
          node-version: 22
      - name: install
        run: |
          npm ci
.gitignore
@@ -5,5 +5,6 @@
.hugo_build.lock
/node_modules
exampleSite/public/
exampleSite/resources/
.DS_Store
public/
assets/scss/anatole.rtl.scss
File was deleted
assets/scss/anatole.scss
File was deleted
assets/scss/main.scss
@@ -1,3 +1,4 @@
@import 'hugo:vars';
@import './modules/variables';
@import './modules/config';
@import './modules/color_theme';
assets/scss/modules/_variables.scss
@@ -17,9 +17,3 @@
$thumbnail-height: 15em;
$body-max-width: 1920px;
$sidebar-ratio: calc(1 - #{$content-ratio});
$content-max-width: calc(#{$body-max-width} * #{$content-ratio});
$sidebar-max-width: calc(#{$body-max-width} - #{$content-max-width});
$content-width: calc(#{$content-ratio} * 100%);
$sidebar-width: calc(#{$sidebar-ratio} * 100%);
assets/scss/partials/components/_wrapper.scss
@@ -14,11 +14,11 @@
    width: 100%;
    @include desktop {
      width: $content-width;
      width: $content-ratio;
    }
    @include widescreen {
      width: calc(#{$content-ratio} * 80%);
      width: $content-ratio-wide;
    }
    &--fullscreen {
@@ -40,12 +40,12 @@
    padding: 16px 0;
    @include desktop {
      width: $sidebar-width;
      width: $sidebar_ratio;
      padding: 0;
    }
    @include widescreen {
      width: calc(#{$sidebar-ratio} * 80%);
      width: $sidebar_ratio_wide;
    }
    &--hidden {
exampleSite/config/_default/languages.toml
@@ -6,9 +6,9 @@
[ar]
title = "فلانة الفلانية"
contentDir = "content/arabic"
contentDir = "content/arabic"
weight = 2
LanguageDirection = "rtl"
LanguageDirection = "rtl"
LanguageName = "AR"
[ar.params]
description = "أنا أعمل كمطورة ويب في شركة س"
description = "أنا أعمل كمطورة ويب في شركة س"
exampleSite/config/_default/params.toml
@@ -40,6 +40,9 @@
# hidesidebar = true
# Sidebar/Content Ratio
# contentratio = 0.6
[simpleAnalytics]
# enable = true
# customurl = "https://analytics.example.com"
layouts/partials/head.html
@@ -37,27 +37,37 @@
  <!-- CSS -->
  {{ if eq .Site.Language.LanguageDirection "rtl" }}
    {{ $sassTemplate := resources.Get "scss/anatole.rtl.scss" }}
    {{ $style := $sassTemplate | resources.ExecuteAsTemplate "scss/main.rtl.scss" . | css.Sass | resources.Minify | resources.Fingerprint }}
    <link
      rel="stylesheet"
      href="{{ $style.RelPermalink }}"
      integrity="{{ $style.Data.Integrity }}"
      crossorigin="anonymous"
      type="text/css"
    />
  {{ else }}
    {{ $sassTemplate := resources.Get "scss/anatole.scss" }}
    {{ $style := $sassTemplate | resources.ExecuteAsTemplate "scss/main.scss" . | css.Sass | resources.Minify | resources.Fingerprint }}
    <link
      rel="stylesheet"
      href="{{ $style.RelPermalink }}"
      integrity="{{ $style.Data.Integrity }}"
      crossorigin="anonymous"
      type="text/css"
    />
  {{ end }}
  {{ $contentRatio := or site.Params.contentratio 0.6 -}}
  {{ $languageDirection := or site.Language.LanguageDirection "ltr" -}}
  {{ $vars := dict
      "text_direction" $languageDirection
      "content_ratio" (printf "%f%%" (mul $contentRatio 100))
      "sidebar_ratio" (printf "%f%%" (mul (sub 1.0 $contentRatio) 100))
      "content_ratio_wide" (printf "%f%%" (mul 0.8 (mul $contentRatio 100)))
      "sidebar_ratio_wide" (printf "%f%%" (mul 0.8 (mul (sub 1.0 $contentRatio) 100)))
  -}}
  {{ $options := dict
      "transpiler" "libsass"
      "vars" $vars
      "targetPath" (printf "css/anatole%s.css" (cond (eq site.Language.LanguageDirection "") "" (printf ".%s" site.Language.LanguageDirection)))
  -}}
  {{ with resources.Get "scss/main.scss" -}}
    {{ if hugo.IsProduction -}}
      {{ with . | toCSS $options | minify | fingerprint }}
  <link rel="stylesheet"
    href="{{ .RelPermalink }}"
    integrity="{{ .Data.Integrity }}"
    crossorigin="anonymous">
      {{ end -}}
    {{ else -}}
      {{ with . | toCSS $options }}
  <link
    rel="stylesheet"
    href="{{ .RelPermalink }}"
  />
      {{ end -}}
    {{ end -}}
  {{ end -}}
  {{ $markupHighlightStyle := resources.Get "css/markupHighlight.css" | resources.Minify | resources.Fingerprint }}
  <link
netlify.toml
@@ -3,7 +3,7 @@
  command = "cd exampleSite && hugo --gc --minify --themesDir ../.."
  
[build.environment]
  HUGO_VERSION = "0.146.5"
  HUGO_VERSION = "0.147.5"
  HUGO_ENV = "production"
  HUGO_THEME = "repo"
  HUGO_BASEURL = "https://anatole-demo.netlify.app"