From db928022e2fcdfc66bb96d45a395208780b556b7 Mon Sep 17 00:00:00 2001 From: Chralu Date: Sat, 13 Jul 2024 09:50:12 +0200 Subject: [PATCH] Fix Baseurl to match github pages path. --- .github/workflows/jekyll-docker.yml | 2 +- .vscode/extensions.json | 7 +++++++ _includes/footer.html | 5 +++-- _includes/header.html | 2 +- _layouts/default.html | 2 +- _sass/_fonts.sass | 18 +++++++++--------- about/index.html | 6 +++--- case_studies/index.html | 3 ++- index.html | 4 ++-- question/do_map.html | 2 +- question/index.html | 4 ++-- question/other_project.html | 5 +++-- research/index.html | 3 ++- toolkit/index.html | 3 ++- 14 files changed, 39 insertions(+), 27 deletions(-) create mode 100755 .vscode/extensions.json diff --git a/.github/workflows/jekyll-docker.yml b/.github/workflows/jekyll-docker.yml index 18bb4d2..cc2c8d1 100644 --- a/.github/workflows/jekyll-docker.yml +++ b/.github/workflows/jekyll-docker.yml @@ -34,7 +34,7 @@ jobs: run: | docker run \ -v ${{ github.workspace }}:/srv/jekyll -v ${{ github.workspace }}/_site:/srv/jekyll/_site \ - jvconseil/jekyll-docker:latest /bin/bash -c "chmod -R 777 /srv/jekyll && jekyll build --future" + jvconseil/jekyll-docker:latest /bin/bash -c "chmod -R 777 /srv/jekyll && jekyll build --baseurl /fund-it-website --future" - name: Upload artifact # Automatically uploads an artifact from the './_site' directory by default uses: actions/upload-pages-artifact@v3 diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100755 index 0000000..0185612 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,7 @@ +{ + "recommendations": [ + "ginfuru.ginfuru-vscode-jekyll-syntax", + "ginfuru.vscode-jekyll-snippets", + "syler.sass-indented" + ] +} \ No newline at end of file diff --git a/_includes/footer.html b/_includes/footer.html index 6d89821..6686637 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -38,7 +38,7 @@

Pages

{%- if site_page.url != "/" -%} {%- if site_page.title -%}
  • {{ + href="{% if page.path == site_page.path %}#{% else %}{{ site_page.url }}{% endif %}">{{ site_page.title | escape }}
    • {%- endif -%} {%- endif -%} @@ -52,7 +52,8 @@

    Follow us

    {% for social_network in site.data.social_networks %}
  • - {{ social_network.image.description }} + {{ social_network.image.description }}
    • {% endfor %} diff --git a/_includes/header.html b/_includes/header.html index a52f4e1..0191321 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -13,7 +13,7 @@ {%- if site_page.url != "/" -%} {%- if site_page.title -%}
  • {{ + href="{% if page.path == site_page.path %}#{% else %}{{ site_page.url }}{% endif %}">{{ site_page.title | escape }}
    • {%- endif -%} {%- endif -%} diff --git a/_layouts/default.html b/_layouts/default.html index c02e932..c847ff6 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -4,7 +4,7 @@ {{ page.title }} - + {%- include header.html -%} diff --git a/_sass/_fonts.sass b/_sass/_fonts.sass index 9cff2aa..45097ab 100644 --- a/_sass/_fonts.sass +++ b/_sass/_fonts.sass @@ -14,7 +14,7 @@ $font-other: "Roboto", Arial font-style: normal font-weight: 400 font-display: swap - src: url('/assets/global/fonts/Inter-Regular-LatinExt.woff') format('woff') + src: url('{{site.baseurl}}/assets/global/fonts/Inter-Regular-LatinExt.woff') format('woff') unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF @font-face @@ -22,7 +22,7 @@ $font-other: "Roboto", Arial font-style: normal font-weight: 400 font-display: swap - src: url('/assets/global/fonts/Inter-Regular-Latin.woff') format('woff') + src: url('{{site.baseurl}}/assets/global/fonts/Inter-Regular-Latin.woff') format('woff') unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD @font-face @@ -30,7 +30,7 @@ $font-other: "Roboto", Arial font-style: normal font-weight: 500 font-display: swap - src: url('/assets/global/fonts/Inter-Bold-LatinExt.woff') format('woff') + src: url('{{site.baseurl}}/assets/global/fonts/Inter-Bold-LatinExt.woff') format('woff') unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF @font-face @@ -38,7 +38,7 @@ $font-other: "Roboto", Arial font-style: normal font-weight: 500 font-display: swap - src: url('/assets/global/fonts/Inter-Bold-Latin.woff') format('woff') + src: url('{{site.baseurl}}/assets/global/fonts/Inter-Bold-Latin.woff') format('woff') unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD @font-face @@ -46,7 +46,7 @@ $font-other: "Roboto", Arial font-style: normal font-weight: 900 font-display: swap - src: url('/assets/global/fonts/Inter-Black-LatinExt.woff') format('woff') + src: url('{{site.baseurl}}/assets/global/fonts/Inter-Black-LatinExt.woff') format('woff') unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF @font-face @@ -54,26 +54,26 @@ $font-other: "Roboto", Arial font-style: normal font-weight: 900 font-display: swap - src: url('/assets/global/fonts/Inter-Black-Latin.woff') format('woff') + src: url('{{site.baseurl}}/assets/global/fonts/Inter-Black-Latin.woff') format('woff') unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD @font-face font-family: 'ClashDisplay' - src: url('/assets/global/fonts/ClashDisplay-Light.woff') format('woff') + src: url('{{site.baseurl}}/assets/global/fonts/ClashDisplay-Light.woff') format('woff') font-weight: 300 font-display: swap font-style: normal, @font-face font-family: 'ClashDisplay' - src: url('/assets/global/fonts/ClashDisplay-Semibold.woff') format('woff') + src: url('{{site.baseurl}}/assets/global/fonts/ClashDisplay-Semibold.woff') format('woff') font-weight: 600 font-display: swap font-style: normal, @font-face font-family: 'ClashDisplay' - src: url('/assets/global/fonts/ClashDisplay-Bold.woff') format('woff') + src: url('{{site.baseurl}}/assets/global/fonts/ClashDisplay-Bold.woff') format('woff') font-weight: 700 font-display: swap font-style: normal, diff --git a/about/index.html b/about/index.html index 498b2d0..8ba2dea 100644 --- a/about/index.html +++ b/about/index.html @@ -23,12 +23,12 @@

    {{ site.data.about.title }}

    - \ No newline at end of file + \ No newline at end of file diff --git a/case_studies/index.html b/case_studies/index.html index 3b3799f..fb31339 100644 --- a/case_studies/index.html +++ b/case_studies/index.html @@ -28,7 +28,8 @@

    {{ resource.title }}

    {% picture {{ resource.image.url }} --alt {{ resource.image.description }} --parent class="layout-two-columns__left picture--square"%} - {{ resource.action_title }} + {{ + resource.action_title }}
    {%- endfor -%} diff --git a/index.html b/index.html index 43d884a..1bfc548 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@

    {{ site.data.home.title }}

    {{ site.data.home.subtitle }}

    - Get started ! + Get started !
    @@ -46,7 +46,7 @@

    {{ site.data.home.part3.title }}

    {{ site.data.home.part3.testimony.title }}

    {{ site.data.home.part3.testimony.footer }}
    - Discover more ! + Discover more !
    diff --git a/question/do_map.html b/question/do_map.html index b259217..f45030f 100644 --- a/question/do_map.html +++ b/question/do_map.html @@ -29,6 +29,6 @@

    STEP 2 : Check our map of initiatives to see what our community tried in you
    - I'll browse alone + I'll browse alone
    \ No newline at end of file diff --git a/question/index.html b/question/index.html index 70e577e..4f62929 100644 --- a/question/index.html +++ b/question/index.html @@ -32,10 +32,10 @@

    Are you working on a USE-IT map or something else ?

    } document.querySelector("#do_map").addEventListener('change', function () { if (!this.checked) return - _updateProjectLink('/question/do_map.html') + _updateProjectLink('{{site.baseurl}}/question/do_map.html') }); document.querySelector("#other_project").addEventListener('change', function () { if (!this.checked) return - _updateProjectLink('/question/other_project.html') + _updateProjectLink('{{site.baseurl}}/question/other_project.html') }); \ No newline at end of file diff --git a/question/other_project.html b/question/other_project.html index a597880..2baaca2 100644 --- a/question/other_project.html +++ b/question/other_project.html @@ -55,7 +55,8 @@

    {{ resource.title }}

    class="layout-two-columns__left picture--square"%}

    {{ resource.description }}

    - {{ resource.action_title }} + {{ + resource.action_title }}
    @@ -66,6 +67,6 @@

    {{ resource.title }}

    - I'll browse alone + I'll browse alone
    \ No newline at end of file diff --git a/research/index.html b/research/index.html index 162d2e1..beb33f9 100644 --- a/research/index.html +++ b/research/index.html @@ -31,7 +31,8 @@

    {{ resource.title }}

    class="layout-two-columns__left picture--square"%}

    {{ resource.description }}

    - {{ resource.action_title }} + {{ + resource.action_title }}
    diff --git a/toolkit/index.html b/toolkit/index.html index d359c01..61dc119 100644 --- a/toolkit/index.html +++ b/toolkit/index.html @@ -19,7 +19,8 @@

    {{ resource.title }}

    class="layout-two-columns__left picture--square"%}

    {{ resource.description }}

    - {{ resource.action_title }} + {{ + resource.action_title }}