diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3f18640e..4522a3e0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -26,8 +26,8 @@ on:
- '*'
jobs:
- build:
- name: Create Release
+ production:
+ name: Push release to production
runs-on: ubuntu-latest
permissions:
contents: write
@@ -39,10 +39,22 @@ jobs:
fetch-depth: '0'
ssh-key: ${{ secrets.ACTIONS_SSH_KEY }}
submodules: 'true'
-
+
- name: Push to production branch
run: |
git push origin HEAD:production
+
+ build:
+ name: Create release packages
+ runs-on: ubuntu-latest
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v3
+ with:
+ fetch-depth: '0'
+ ssh-key: ${{ secrets.ACTIONS_SSH_KEY }}
+ submodules: 'true'
- name: Pages setup
uses: actions/configure-pages@v3
@@ -102,6 +114,14 @@ jobs:
name: privacy_guides.zim
path: privacy_guides.zim
+ release:
+ name: Create release notes
+ needs: build
+ runs-on: ubuntu-latest
+ permissions:
+ contents: write
+
+ steps:
- name: Create release notes
uses: ncipollo/release-action@v1
with:
diff --git a/config/layouts/custom.yml b/config/layouts/custom.yml
index e43db650..9ca064e3 100644
--- a/config/layouts/custom.yml
+++ b/config/layouts/custom.yml
@@ -4,15 +4,18 @@ definitions:
{%- if page.meta.cover -%}
theme/assets/img/cover/{{ page.meta.cover }}
{%- else -%}
- {{ layout.background_image or "" }}
+ {{ layout.background_image or "theme/assets/brand/PNG/Banner/cover-progress-notext-blur.png" }}
{%- endif -%}
- &background_color >-
- {%- if page.meta.cover -%}
- #f7f7fcaa
- {%- else -%}
- #FFD06F
- {%- endif -%}
+ #f7f7fcaa
+
+ #- &background_color >-
+ # {%- if page.meta.cover -%}
+ # #f7f7fcaa
+ # {%- else -%}
+ # #FFD06F
+ # {%- endif -%}
- &color >-
{{ layout.color or "#2d2d2d" }}
@@ -72,11 +75,13 @@ definitions:
{{ page.meta.icon or "" }}
- &logo >-
- {%- if page.meta.cover -%}
- theme/assets/brand/SVG/Logo/privacy-guides-logo-notext.svg
- {%- elif config.theme.logo -%}
- {{ config.docs_dir }}/{{ config.theme.logo }}
- {%- endif -%}
+ theme/assets/brand/SVG/Logo/privacy-guides-logo-notext.svg
+
+ #{%- if page.meta.cover -%}
+ # theme/assets/brand/SVG/Logo/privacy-guides-logo-notext.svg
+ #{%- elif config.theme.logo -%}
+ # {{ config.docs_dir }}/{{ config.theme.logo }}
+ #{%- endif -%}
# Meta tags
tags:
diff --git a/config/mkdocs.common.yml b/config/mkdocs.common.yml
index 832c27fa..6a3ce8bb 100644
--- a/config/mkdocs.common.yml
+++ b/config/mkdocs.common.yml
@@ -61,6 +61,7 @@ repo_name: ""
theme:
name: material
custom_dir: ../theme
+ logo: ../../theme/assets/brand/SVG/Logo/privacy-guides-logo-notext-colorbg.svg
favicon: assets/brand/png/favicon/favicon-32x32.png
icon:
repo: simple/github
diff --git a/config/mkdocs.en.yml b/config/mkdocs.en.yml
index 35b370ee..6e291091 100644
--- a/config/mkdocs.en.yml
+++ b/config/mkdocs.en.yml
@@ -53,6 +53,7 @@ extra:
theme:
language: en
+ # this logo needs to be set separately because the relative path is different
logo: ../theme/assets/brand/SVG/Logo/privacy-guides-logo-notext-colorbg.svg
font:
text: Public Sans
diff --git a/config/mkdocs.es.yml b/config/mkdocs.es.yml
index db7e69ea..3f5fee08 100644
--- a/config/mkdocs.es.yml
+++ b/config/mkdocs.es.yml
@@ -53,7 +53,6 @@ extra:
theme:
language: es
- logo: ../../theme/assets/brand/SVG/Logo/privacy-guides-logo-notext-colorbg.svg
font:
text: Public Sans
code: DM Mono
diff --git a/config/mkdocs.fr.yml b/config/mkdocs.fr.yml
index ef59c781..787e610f 100644
--- a/config/mkdocs.fr.yml
+++ b/config/mkdocs.fr.yml
@@ -53,7 +53,6 @@ extra:
theme:
language: fr
- logo: ../../theme/assets/brand/SVG/Logo/privacy-guides-logo-notext-colorbg.svg
font:
text: Public Sans
code: DM Mono
diff --git a/config/mkdocs.he.yml b/config/mkdocs.he.yml
index 602fa6e5..730bd205 100644
--- a/config/mkdocs.he.yml
+++ b/config/mkdocs.he.yml
@@ -57,7 +57,6 @@ extra_css:
theme:
language: he
- logo: ../../theme/assets/brand/SVG/Logo/privacy-guides-logo-notext-colorbg.svg
font:
text: Open Sans
code: Cousine
diff --git a/config/mkdocs.nl.yml b/config/mkdocs.nl.yml
index 1981b177..24985ef8 100644
--- a/config/mkdocs.nl.yml
+++ b/config/mkdocs.nl.yml
@@ -53,7 +53,6 @@ extra:
theme:
language: nl
- logo: ../../theme/assets/brand/SVG/Logo/privacy-guides-logo-notext-colorbg.svg
font:
text: Public Sans
code: DM Mono
diff --git a/config/mkdocs.offline.yml b/config/mkdocs.offline.yml
index ad506425..66daa3fb 100644
--- a/config/mkdocs.offline.yml
+++ b/config/mkdocs.offline.yml
@@ -42,6 +42,7 @@ extra:
theme:
language: en
+ # this logo needs to be set separately because the relative path is different
logo: ../theme/assets/brand/SVG/Logo/privacy-guides-logo-notext-colorbg.svg
font:
text: Public Sans
@@ -75,6 +76,8 @@ theme:
plugins:
offline:
enabled: true
+ social:
+ enabled: false
markdown_extensions:
pymdownx.snippets:
diff --git a/theme/assets/brand b/theme/assets/brand
index 88941809..3a142da1 160000
--- a/theme/assets/brand
+++ b/theme/assets/brand
@@ -1 +1 @@
-Subproject commit 8894180936c111540bfefefe0b51e235d1e915e6
+Subproject commit 3a142da11d7a1e784d18011134510933fd2406f0
diff --git a/theme/partials/logo.html b/theme/partials/logo.html
index f4353413..fd3f26b0 100644
--- a/theme/partials/logo.html
+++ b/theme/partials/logo.html
@@ -19,5 +19,5 @@
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.
#} -->
-
-
+
+