From 4dd694c4e2f1d9db6394fe62488eea100fecb028 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Thu, 20 Feb 2025 10:21:52 +0100 Subject: [PATCH] Optimized design --- group_vars/all/07_applications.yml | 2 + group_vars/all/13_design.yml | 9 ---- group_vars/all/14_service_provider.yml | 26 +++++----- .../templates/import/realm.json.j2 | 2 +- .../templates/global.css.j2 | 48 +++---------------- 5 files changed, 22 insertions(+), 65 deletions(-) diff --git a/group_vars/all/07_applications.yml b/group_vars/all/07_applications.yml index 795fdb71..e874763f 100644 --- a/group_vars/all/07_applications.yml +++ b/group_vars/all/07_applications.yml @@ -118,6 +118,8 @@ defaults_applications: enabled: false # Deactivated atm. @todo implement # database_password: Null # Needs to be set in inventory file # auth_token: Null # Needs to be set in inventory file + css: + enabled: false # The css isn't optimized yet for Matomo ## Mastodon mastodon: diff --git a/group_vars/all/13_design.yml b/group_vars/all/13_design.yml index 78585e1b..8ba26786 100644 --- a/group_vars/all/13_design.yml +++ b/group_vars/all/13_design.yml @@ -4,15 +4,6 @@ defaults_design: colors: # General Colors base: "#001f3f" - - # Sucess Color - success: "#B2D3B2" - # As the warning color – a light brown (earth) - warning: "#D2B48C" - # For error messages (standard red) - error: "#DC3545" - # As the info color – a very light blue (symbolizing the sky) - info: "#F0F8FF" filters: saturation_change: 70 hue_shift: 0 \ No newline at end of file diff --git a/group_vars/all/14_service_provider.yml b/group_vars/all/14_service_provider.yml index a15b9408..bc9e4056 100644 --- a/group_vars/all/14_service_provider.yml +++ b/group_vars/all/14_service_provider.yml @@ -1,9 +1,9 @@ # Adapt the values in your inventory file defaults_service_provider: - type: "legal" # Accepted Values: natural, legal + type: "legal" # Accepted Values: natural, legal company: - titel: "CyMaIS Example GbR" - slogan: "We keep your 0 and 1 in line" + titel: "CyMaIS Example GbR" + slogan: "We keep your 0 and 1 in line" address: street: "Binary Avenue 01" city: "Cybertown" @@ -11,19 +11,19 @@ defaults_service_provider: country: "Nexusland" logo: https://cloud.veen.world/s/logo_cymais_512x512/download platform: - titel: "CyMaIS Plattform Demo" - subtitel: "Demo of the Cyber Master Infrastructur Solution Plattform" + titel: "CyMaIS Plattform Demo" + subtitel: "Demo of the Cyber Master Infrastructur Solution Plattform" logo: https://cloud.veen.world/s/logo_cymais_512x512/download favicon: https://cloud.veen.world/s/veen_world_favicon/download contact: - bluesky: "@{{administrator_username}}.{{domains.bluesky_api}}" - email: "contact@{{primary_domain}}" - mastodon: "@{{administrator_username}}@{{domains.mastodon}}" - matrix: "@{{administrator_username}}:{{domains.matrix_synapse}}" - peertube: "@{{administrator_username}}@{{domains.peertube}}" - pixelfed: "@{{administrator_username}}@{{domains.pixelfed}}" - phone: "+0 000 000 404" - wordpress: "@{{administrator_username}}@{{domains.wordpress[0]}}" + bluesky: "@{{administrator_username}}.{{domains.bluesky_api}}" + email: "contact@{{primary_domain}}" + mastodon: "@{{administrator_username}}@{{domains.mastodon}}" + matrix: "@{{administrator_username}}:{{domains.matrix_synapse}}" + peertube: "@{{administrator_username}}@{{domains.peertube}}" + pixelfed: "@{{administrator_username}}@{{domains.pixelfed}}" + phone: "+0 000 000 404" + wordpress: "@{{administrator_username}}@{{domains.wordpress[0]}}" legal: editorial_responsible: "Johannes Gutenberg" source_code: "https://github.com/kevinveenbirkenbach/cymais" diff --git a/roles/docker-keycloak/templates/import/realm.json.j2 b/roles/docker-keycloak/templates/import/realm.json.j2 index 4a55e3eb..d81fe9c2 100644 --- a/roles/docker-keycloak/templates/import/realm.json.j2 +++ b/roles/docker-keycloak/templates/import/realm.json.j2 @@ -835,7 +835,7 @@ "secret": "{{oidc.client.secret}}", "redirectUris": [ {%- set redirect_uris = [] -%} - {%- for application, domain in defaults_domains.items() -%} + {%- for application, domain in domains.items() -%} {%- if applications[application_id] is defined and applications | get_oauth2_enabled(application_id) -%} {%- if domain is string -%} {%- set _ = redirect_uris.append("https://" ~ domain ~ "/*") -%} diff --git a/roles/nginx-modifier-css/templates/global.css.j2 b/roles/nginx-modifier-css/templates/global.css.j2 index e76689fc..99edf812 100644 --- a/roles/nginx-modifier-css/templates/global.css.j2 +++ b/roles/nginx-modifier-css/templates/global.css.j2 @@ -14,13 +14,6 @@ HINT: --color-{{ "%02d"|format(i) }}: {{ design.css.colors.base | adjust_color(target_lightness=(i / 100),saturation_change=design.css.filters.saturation_change,hue_shift=design.css.filters.hue_shift) }}; --color-rgb-{{ "%02d"|format(i) }}: {{ design.css.colors.base | adjust_color_rgb(target_lightness=(i / 100),saturation_change=design.css.filters.saturation_change,hue_shift=design.css.filters.hue_shift) }}; {% endfor %} - - /** Special Action Colors **/ - --success-color: {{ design.css.colors.success }}; - --warning-color: {{ design.css.colors.warning }}; - --error-color: {{ design.css.colors.error }}; - --info-color: {{ design.css.colors.info }}; - } @media (prefers-color-scheme: dark) { @@ -30,12 +23,6 @@ HINT: --color-{{ "%02d"|format(i) }}: {{ design.css.colors.base | adjust_color(target_lightness=(1 - (i / 100)),saturation_change=design.css.filters.saturation_change,hue_shift=design.css.filters.hue_shift) }}; --color-rgb-{{ "%02d"|format(i) }}: {{ design.css.colors.base | adjust_color_rgb(target_lightness=(1 - (i / 100)),saturation_change=design.css.filters.saturation_change,hue_shift=design.css.filters.hue_shift) }}; {% endfor %} - - /** Special Action Colors **/ - --success-color: {{ design.css.colors.success | adjust_color(target_lightness=(1 - 0.2)) }}; - --warning-color: {{ design.css.colors.warning | adjust_color(target_lightness=(1 - 0.3)) }}; - --error-color: {{ design.css.colors.error | adjust_color(target_lightness=(1 - 0.3)) }}; - --info-color: {{ design.css.colors.info | adjust_color(target_lightness=(1 - 0.2)) }}; } } @@ -62,10 +49,6 @@ HINT: --bs-secondary: var(--color-65); --bs-body-bg: var(--color-90); --bs-body-color: var(--color-40); - --bs-danger: var(--error-color); - --bs-warning: var(--warning-color); - --bs-success: var(--success-color); - --bs-info: var(--info-color); --bs-link-color: var(--color-50); --bs-btn-color: var(--color-40); } @@ -275,8 +258,13 @@ HINT: --pf-v5-global--icon--Color--dark--light: var(--color-99); --pf-v5-global--icon--Color--light--dark: var(--color-40); --pf-v5-global--icon--Color--dark--dark: var(--color-10); + } +/* Additional Keykloak Configuration */ +a.pf-v5-c-nav__link{ + --pf-v5-c-nav__link--BackgroundColor: rgba(var(--color-rgb-56), 0.4); +} /* gitea */ :root { @@ -577,26 +565,6 @@ h1, h2, h3, h4, h5, h6, p{ color: var(--color-10) !important; } -/* Bootstrap */ - -/* States: Success, Warning, Error, Info (Background and Text Colors) */ -.success, .alert-success { - background-color: var(--success-color) !important; - color: var(--color-40) !important; -} -.warning, .alert-warning { - background-color: var(--warning-color) !important; - color: var(--color-40) !important; -} -.error, .alert-danger { - background-color: var(--error-color) !important; - color: var(--color-40) !important; -} -.info, .alert-info { - background-color: var(--info-color) !important; - color: var(--color-40) !important; -} - /* Navigation (Background and Text Colors) */ .navbar, .navbar-light, .navbar-dark { background-color: var(--color-90) !important; @@ -664,10 +632,6 @@ html.ng-csp header#header{ background-color: var(--color-80) !important; } -html.ng-csp div#postsetupchecks ul.warnings{ - color: var(--error-color) !important; -} - html.ng-csp div#postsetupchecks ul.info{ background-color: transparent !important; } @@ -733,7 +697,7 @@ section.main.kanban{ } div.master, div.kanban-header, div.kanban-table-inner, section.kanban button,a.dropdown-project-list-projects{ - background-color: var(--info-color) !important; + background-color: var(--color-92) !important; color: var(--color-40) !important; }