ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Change secondary link color depending on theme env variable 

Resolves MS-711 #complete
This commit is contained in:
Ramon Wenger 2023-05-08 17:49:35 +02:00
parent 25e2fd0856
commit dd66bab53a
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/pages/instrument.vue
View File

@ -30,9 +30,7 @@
import INSTRUMENT_QUERY from '@/graphql/gql/queries/instrumentQuery.gql'; import INSTRUMENT_QUERY from '@/graphql/gql/queries/instrumentQuery.gql';
import { defineAsyncComponent } from 'vue'; import { defineAsyncComponent } from 'vue';
const ContentComponent = defineAsyncComponent(() => const ContentComponent = defineAsyncComponent(() => import('@/components/content-blocks/ContentComponent.vue'));
import('@/components/content-blocks/ContentComponent.vue')
);
export default { export default {
apollo: { apollo: {
@ -101,7 +99,7 @@ export default {
} }
.secondary { .secondary {
color: $color-accent-2; color: $secondary-color;
font-weight: 600; font-weight: 600;
} }
} }

2
client/src/styles/_variables.scss
View File

@ -45,6 +45,8 @@ $color-white: #ffffff !default;
$header-color: $color-charcoal-dark; $header-color: $color-charcoal-dark;
$intro-color: $color-silver-dark; $intro-color: $color-silver-dark;
$secondary-color: $color-accent-2 !default;
$sans-serif-font-family: 'Montserrat', Arial, sans-serif; $sans-serif-font-family: 'Montserrat', Arial, sans-serif;
$serif-font-family: 'ff-meta-serif-web-pro', serif; $serif-font-family: 'ff-meta-serif-web-pro', serif;

2
client/src/styles/themes/_my-dha.scss
View File

@ -20,3 +20,5 @@ $color-accent-5: #e2eef8;
$color-brand-dark: #15893e; $color-brand-dark: #15893e;
$color-brand: #1bab4e; $color-brand: #1bab4e;
$color-brand-light: #d8f3e2; $color-brand-light: #d8f3e2;
$secondary-color: $color-accent-4;

2
client/src/styles/themes/_my-dhf.scss
View File

@ -20,3 +20,5 @@ $color-accent-5: #e2eef8;
$color-brand-dark: #0f7eb3; $color-brand-dark: #0f7eb3;
$color-brand: #139ee0; $color-brand: #139ee0;
$color-brand-light: #d0edfb; $color-brand-light: #d0edfb;
$secondary-color: $color-accent-4;

2
client/src/styles/themes/_my-kv.scss
View File

@ -20,3 +20,5 @@ $color-accent-5: #e2eef8;
$color-brand-dark: #1458c8; $color-brand-dark: #1458c8;
$color-brand: #2075ff; $color-brand: #2075ff;
$color-brand-light: #ccdfff; $color-brand-light: #ccdfff;
$secondary-color: $color-accent-1;

8
server/core/wagtail_hooks.py
View File

@ -30,8 +30,8 @@ def register_brand_feature(features):
# 2. Configure how Draftail handles the feature in its toolbar. # 2. Configure how Draftail handles the feature in its toolbar.
control = { control = {
"type": type_, "type": type_,
"label": "Grün", "label": "Auszeichung Primär",
"description": "Grün", "description": "Auszeichung Primär",
"style": {"color": "#17A887", "font-weight": "600"}, "style": {"color": "#17A887", "font-weight": "600"},
} }
@ -68,8 +68,8 @@ def register_secondary_feature(features):
# 2. Configure how Draftail handles the feature in its toolbar. # 2. Configure how Draftail handles the feature in its toolbar.
control = { control = {
"type": type_, "type": type_,
"label": "Blau", "label": "Auszeichnung sekundär",
"description": "Blau", "description": "Auszeichnung sekundär",
"style": {"color": "#078CC6", "font-weight": "600"}, "style": {"color": "#078CC6", "font-weight": "600"},
} }