From 3cfdf6fccff8f2df9768fbc88f276b48f6351a6b Mon Sep 17 00:00:00 2001 From: NFriedo <69233063+NFriedo@users.noreply.github.com> Date: Wed, 13 Mar 2024 12:27:20 +0100 Subject: [PATCH 01/54] fix dbc vuetify options --- src/vuetify.options.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vuetify.options.js b/src/vuetify.options.js index 8039e759e1..8b252949bc 100644 --- a/src/vuetify.options.js +++ b/src/vuetify.options.js @@ -5,7 +5,7 @@ const custom = { theme: { themes: { light: { - color: { + colors: { primary: "#9e292b", "primary-darken-1": "#800416", "primary-lighten": "#f5eaea", From b08c32a9cefa5c3f235a69d9b06e326a7d222a59 Mon Sep 17 00:00:00 2001 From: NFriedo <69233063+NFriedo@users.noreply.github.com> Date: Wed, 13 Mar 2024 13:38:38 +0100 Subject: [PATCH 02/54] change on-surface and on-background colors for testing purposes --- src/vuetify.options.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/vuetify.options.js b/src/vuetify.options.js index 8b252949bc..cb5df304c7 100644 --- a/src/vuetify.options.js +++ b/src/vuetify.options.js @@ -13,6 +13,8 @@ const custom = { "secondary-lighten-1": "#8a9199", "secondary-darken-1": "#3a424b", accent: "#e98404", + "on-surface": "#04CACA", + "on-background": "#01D94B", }, }, }, From 9179809052af5da417eb4410f43fc9e55c558660 Mon Sep 17 00:00:00 2001 From: NFriedo <69233063+NFriedo@users.noreply.github.com> Date: Wed, 13 Mar 2024 15:07:32 +0100 Subject: [PATCH 03/54] use typescript for vuetify options --- package-lock.json | 7 ++++ package.json | 1 + src/themes/base-vuetify.options.js | 47 -------------------------- src/themes/base-vuetify.options.ts | 54 ++++++++++++++++++++++++++++++ src/themes/brb/vuetify.options.js | 23 ------------- src/themes/brb/vuetify.options.ts | 26 ++++++++++++++ src/themes/n21/vuetify.options.js | 23 ------------- src/themes/n21/vuetify.options.ts | 26 ++++++++++++++ src/themes/thr/vuetify.options.js | 23 ------------- src/themes/thr/vuetify.options.ts | 26 ++++++++++++++ src/vuetify.options.js | 24 ------------- src/vuetify.options.ts | 28 ++++++++++++++++ 12 files changed, 168 insertions(+), 140 deletions(-) delete mode 100644 src/themes/base-vuetify.options.js create mode 100644 src/themes/base-vuetify.options.ts delete mode 100644 src/themes/brb/vuetify.options.js create mode 100644 src/themes/brb/vuetify.options.ts delete mode 100644 src/themes/n21/vuetify.options.js create mode 100644 src/themes/n21/vuetify.options.ts delete mode 100644 src/themes/thr/vuetify.options.js create mode 100644 src/themes/thr/vuetify.options.ts delete mode 100644 src/vuetify.options.js create mode 100644 src/vuetify.options.ts diff --git a/package-lock.json b/package-lock.json index a734312f0e..c8294dc8fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,6 +39,7 @@ "@mdi/js": "^7.2.96", "@openapitools/openapi-generator-cli": "^2.7.0", "@types/jest": "^27.5.2", + "@types/lodash": "^4.17.0", "@types/object-hash": "^2.2.1", "@types/sortablejs": "^1.15.7", "@typescript-eslint/eslint-plugin": "^6.13.2", @@ -3525,6 +3526,12 @@ "devOptional": true, "license": "MIT" }, + "node_modules/@types/lodash": { + "version": "4.17.0", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.0.tgz", + "integrity": "sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==", + "dev": true + }, "node_modules/@types/mime": { "version": "1.3.5", "dev": true, diff --git a/package.json b/package.json index 4ccd2d71db..25dff95ebe 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,7 @@ "@mdi/js": "^7.2.96", "@openapitools/openapi-generator-cli": "^2.7.0", "@types/jest": "^27.5.2", + "@types/lodash": "^4.17.0", "@types/object-hash": "^2.2.1", "@types/sortablejs": "^1.15.7", "@typescript-eslint/eslint-plugin": "^6.13.2", diff --git a/src/themes/base-vuetify.options.js b/src/themes/base-vuetify.options.js deleted file mode 100644 index 0d92567cae..0000000000 --- a/src/themes/base-vuetify.options.js +++ /dev/null @@ -1,47 +0,0 @@ -import * as materialAliases from "@/components/icons/material"; -import { aliases, mdi } from "vuetify/iconsets/mdi-svg"; - -import { customAliases } from "@/components/icons/custom"; - -export default { - theme: { - options: { - customProperties: true, - cspNonce: window.nonce, - }, - themes: { - light: { - colors: { - primary: "#9e292b", - "primary-darken-1": "#800416", - "primary-lighten": "#f5eaea", - secondary: "#54616e", - "secondary-lighten-1": "#8a9199", - "secondary-darken-1": "#3a424b", - accent: "#e98404", - black: "#1b1b1b", - white: "#ffffff", - info: "#0a7ac9", - "info-darken-1": "#0e8c71", - success: "#13ba98", - "success-darken-1": "#0e8c71", - warning: "#ff8311", - "warning-lighten-1": "#fff0e2", - error: "#ff1134", - "error-darken-1": "#bf0d26", - }, - }, - }, - }, - icons: { - defaultSet: "mdi", - aliases: { - ...aliases, - ...materialAliases, - ...customAliases, - }, - sets: { - mdi, - }, - }, -}; diff --git a/src/themes/base-vuetify.options.ts b/src/themes/base-vuetify.options.ts new file mode 100644 index 0000000000..1401e23a1b --- /dev/null +++ b/src/themes/base-vuetify.options.ts @@ -0,0 +1,54 @@ +import * as materialAliases from "@/components/icons/material"; +import { aliases, mdi } from "vuetify/iconsets/mdi-svg"; +import { type ThemeDefinition } from "vuetify"; +import { customAliases } from "@/components/icons/custom"; + +declare global { + interface Window { + nonce: string; + } +} + +const baseTheme: ThemeDefinition = { + dark: false, + colors: { + primary: "#9e292b", + "primary-darken-1": "#800416", + "primary-lighten": "#f5eaea", + secondary: "#54616e", + "secondary-lighten-1": "#8a9199", + "secondary-darken-1": "#3a424b", + accent: "#e98404", + black: "#1b1b1b", + white: "#ffffff", + info: "#0a7ac9", + "info-darken-1": "#0e8c71", + success: "#13ba98", + "success-darken-1": "#0e8c71", + warning: "#ff8311", + "warning-lighten-1": "#fff0e2", + error: "#ff1134", + "error-darken-1": "#bf0d26", + }, +}; + +export default { + theme: { + options: { + customProperties: true, + cspNonce: window.nonce, + }, + themes: { light: baseTheme }, + }, + icons: { + defaultSet: "mdi", + aliases: { + ...aliases, + ...materialAliases, + ...customAliases, + }, + sets: { + mdi, + }, + }, +}; diff --git a/src/themes/brb/vuetify.options.js b/src/themes/brb/vuetify.options.js deleted file mode 100644 index e27b70ae85..0000000000 --- a/src/themes/brb/vuetify.options.js +++ /dev/null @@ -1,23 +0,0 @@ -import base from "@/themes/base-vuetify.options.js"; -import { merge } from "lodash"; - -const custom = { - theme: { - dark: false, - themes: { - light: { - colors: { - primary: "#0a9396", - "primary-darken-1": "#086e71", - "primary-lighten": "#e6f4f5", - secondary: "#38677a", - "secondary-lighten-1": "#567e8e", - "secondary-darken-1": "#2a4d5b", - accent: "#e4032e", - }, - }, - }, - }, -}; - -export default merge(base, custom); diff --git a/src/themes/brb/vuetify.options.ts b/src/themes/brb/vuetify.options.ts new file mode 100644 index 0000000000..ada1f79abc --- /dev/null +++ b/src/themes/brb/vuetify.options.ts @@ -0,0 +1,26 @@ +import base from "@/themes/base-vuetify.options"; +import { merge } from "lodash"; +import { type ThemeDefinition } from "vuetify"; + +const brbTheme: ThemeDefinition = { + dark: false, + colors: { + primary: "#0a9396", + "primary-darken-1": "#086e71", + "primary-lighten": "#e6f4f5", + secondary: "#38677a", + "secondary-lighten-1": "#567e8e", + "secondary-darken-1": "#2a4d5b", + accent: "#e4032e", + }, +}; + +const custom = { + theme: { + themes: { + light: brbTheme, + }, + }, +}; + +export default merge(base, custom); diff --git a/src/themes/n21/vuetify.options.js b/src/themes/n21/vuetify.options.js deleted file mode 100644 index 5b8c660b50..0000000000 --- a/src/themes/n21/vuetify.options.js +++ /dev/null @@ -1,23 +0,0 @@ -import base from "@/themes/base-vuetify.options.js"; -import { merge } from "lodash"; - -const custom = { - theme: { - dark: false, - themes: { - light: { - colors: { - primary: "#2876d0", - "primary-darken-1": "#1e599c", - "primary-lighten": "#e9f1fa", - secondary: "#355478", - "secondary-lighten-1": "#536e8c", - "secondary-darken-1": "#283f5a", - accent: "#970000", - }, - }, - }, - }, -}; - -export default merge(base, custom); diff --git a/src/themes/n21/vuetify.options.ts b/src/themes/n21/vuetify.options.ts new file mode 100644 index 0000000000..675a751332 --- /dev/null +++ b/src/themes/n21/vuetify.options.ts @@ -0,0 +1,26 @@ +import base from "@/themes/base-vuetify.options"; +import { merge } from "lodash"; +import { type ThemeDefinition } from "vuetify"; + +const n21Theme: ThemeDefinition = { + dark: false, + colors: { + primary: "#2876d0", + "primary-darken-1": "#1e599c", + "primary-lighten": "#e9f1fa", + secondary: "#355478", + "secondary-lighten-1": "#536e8c", + "secondary-darken-1": "#283f5a", + accent: "#970000", + }, +}; + +const custom = { + theme: { + themes: { + light: n21Theme, + }, + }, +}; + +export default merge(base, custom); diff --git a/src/themes/thr/vuetify.options.js b/src/themes/thr/vuetify.options.js deleted file mode 100644 index 14cc2db270..0000000000 --- a/src/themes/thr/vuetify.options.js +++ /dev/null @@ -1,23 +0,0 @@ -import base from "@/themes/base-vuetify.options.js"; -import { merge } from "lodash"; - -const custom = { - theme: { - dark: false, - themes: { - light: { - colors: { - primary: "#2876d0", - "primary-darken-1": "#1e599c", - "primary-lighten": "#e9f1fa", - secondary: "#185888", - "secondary-lighten-1": "#3b719a", - "secondary-darken-1": "#124266", - accent: "#f56b00", - }, - }, - }, - }, -}; - -export default merge(base, custom); diff --git a/src/themes/thr/vuetify.options.ts b/src/themes/thr/vuetify.options.ts new file mode 100644 index 0000000000..669b777222 --- /dev/null +++ b/src/themes/thr/vuetify.options.ts @@ -0,0 +1,26 @@ +import base from "@/themes/base-vuetify.options"; +import { merge } from "lodash"; +import { type ThemeDefinition } from "vuetify"; + +const thrTheme: ThemeDefinition = { + dark: false, + colors: { + primary: "#2876d0", + "primary-darken-1": "#1e599c", + "primary-lighten": "#e9f1fa", + secondary: "#185888", + "secondary-lighten-1": "#3b719a", + "secondary-darken-1": "#124266", + accent: "#f56b00", + }, +}; + +const custom = { + theme: { + themes: { + light: thrTheme, + }, + }, +}; + +export default merge(base, custom); diff --git a/src/vuetify.options.js b/src/vuetify.options.js deleted file mode 100644 index cb5df304c7..0000000000 --- a/src/vuetify.options.js +++ /dev/null @@ -1,24 +0,0 @@ -import base from "@/themes/base-vuetify.options.js"; -import { merge } from "lodash"; - -const custom = { - theme: { - themes: { - light: { - colors: { - primary: "#9e292b", - "primary-darken-1": "#800416", - "primary-lighten": "#f5eaea", - secondary: "#54616e", - "secondary-lighten-1": "#8a9199", - "secondary-darken-1": "#3a424b", - accent: "#e98404", - "on-surface": "#04CACA", - "on-background": "#01D94B", - }, - }, - }, - }, -}; - -export default merge(base, custom); diff --git a/src/vuetify.options.ts b/src/vuetify.options.ts new file mode 100644 index 0000000000..15da52c6e0 --- /dev/null +++ b/src/vuetify.options.ts @@ -0,0 +1,28 @@ +import base from "@/themes/base-vuetify.options"; +import { merge } from "lodash"; +import { type ThemeDefinition } from "vuetify"; + +const defaultTheme: ThemeDefinition = { + dark: false, + colors: { + primary: "#9e292b", + "primary-darken-1": "#800416", + "primary-lighten": "#f5eaea", + secondary: "#54616e", + "secondary-lighten-1": "#8a9199", + "secondary-darken-1": "#3a424b", + accent: "#e98404", + "on-surface": "#04CACA", + "on-background": "#01D94B", + }, +}; + +const custom = { + theme: { + themes: { + light: defaultTheme, + }, + }, +}; + +export default merge(base, custom); From 1ac8895a47ebbe3b73c817f1de8ed7f7f1a62f26 Mon Sep 17 00:00:00 2001 From: NFriedo <69233063+NFriedo@users.noreply.github.com> Date: Thu, 14 Mar 2024 08:23:47 +0100 Subject: [PATCH 04/54] adjust colors --- src/vuetify.options.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vuetify.options.ts b/src/vuetify.options.ts index 15da52c6e0..4c2520ac55 100644 --- a/src/vuetify.options.ts +++ b/src/vuetify.options.ts @@ -12,8 +12,8 @@ const defaultTheme: ThemeDefinition = { "secondary-lighten-1": "#8a9199", "secondary-darken-1": "#3a424b", accent: "#e98404", - "on-surface": "#04CACA", - "on-background": "#01D94B", + "on-surface": "#01A4A4", + "on-background": "#01A238", }, }; From 1ac0656dbfad5f74f5276c0ace7cb3482ab2dc8c Mon Sep 17 00:00:00 2001 From: NFriedo <69233063+NFriedo@users.noreply.github.com> Date: Tue, 19 Mar 2024 11:14:35 +0100 Subject: [PATCH 05/54] adjust colors in the topbar elements --- src/components/topbar/HelpDropdown.vue | 8 ++------ src/components/topbar/MenuQrCode.vue | 7 +------ src/components/topbar/PopupIcon.vue | 1 - src/components/topbar/PopupIconInitials.vue | 1 - src/components/topbar/TheTopBar.vue | 4 ---- src/styles/utility/_links.scss | 6 +++--- 6 files changed, 6 insertions(+), 21 deletions(-) diff --git a/src/components/topbar/HelpDropdown.vue b/src/components/topbar/HelpDropdown.vue index 3b9a2e8499..cc0269432d 100644 --- a/src/components/topbar/HelpDropdown.vue +++ b/src/components/topbar/HelpDropdown.vue @@ -5,14 +5,10 @@ :href="item.action" :target="item.target" :ripple="false" + :prepend-icon="item.icon" class="mb-0" > - - {{ - $t(item.label) - }} + {{ $t(item.label) }} diff --git a/src/components/topbar/MenuQrCode.vue b/src/components/topbar/MenuQrCode.vue index 13798e6649..1e172461f4 100644 --- a/src/components/topbar/MenuQrCode.vue +++ b/src/components/topbar/MenuQrCode.vue @@ -4,12 +4,7 @@
{{ $t("global.topbar.MenuQrCode.qrHintText") }}
- + {{ $t("global.topbar.MenuQrCode.print") }} diff --git a/src/components/topbar/PopupIcon.vue b/src/components/topbar/PopupIcon.vue index 39c8d769a1..a25f4b9bd2 100644 --- a/src/components/topbar/PopupIcon.vue +++ b/src/components/topbar/PopupIcon.vue @@ -31,7 +31,6 @@ defineProps({ }, color: { type: String, - default: "rgba(var(--v-theme-secondary-darken-1))", }, centered: { type: Boolean, diff --git a/src/components/topbar/PopupIconInitials.vue b/src/components/topbar/PopupIconInitials.vue index e140d63b39..ae801450b6 100644 --- a/src/components/topbar/PopupIconInitials.vue +++ b/src/components/topbar/PopupIconInitials.vue @@ -107,7 +107,6 @@ const removePopup = () => { width: 214px; padding: var(--space-xs) 0; margin-top: var(--space-xs-4); - color: rgba(var(--v-theme-black)); white-space: nowrap; background-color: rgba(var(--v-theme-white)); border: 1px solid map-get($grey, lighten-2); diff --git a/src/components/topbar/TheTopBar.vue b/src/components/topbar/TheTopBar.vue index fb586d16a1..5cd28ba7d5 100644 --- a/src/components/topbar/TheTopBar.vue +++ b/src/components/topbar/TheTopBar.vue @@ -9,7 +9,6 @@ icon="$mdiMenu" height="60" width="60" - color="secondary-darken-1" variant="text" :ripple="false" :class="{ 'menu-button': true, 'expanded-menu': expandedMenu }" @@ -34,7 +33,6 @@ Date: Tue, 19 Mar 2024 16:53:16 +0100 Subject: [PATCH 06/54] remove custom css helpsection --- src/components/topbar/HelpDropdown.vue | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/components/topbar/HelpDropdown.vue b/src/components/topbar/HelpDropdown.vue index cc0269432d..2b80511510 100644 --- a/src/components/topbar/HelpDropdown.vue +++ b/src/components/topbar/HelpDropdown.vue @@ -4,12 +4,11 @@ - {{ $t(item.label) }} - + /> @@ -52,15 +51,6 @@ const menuItems = [ diff --git a/src/pages/rooms/RoomList.page.vue b/src/pages/rooms/RoomList.page.vue index 436fbbd028..e9249029e9 100644 --- a/src/pages/rooms/RoomList.page.vue +++ b/src/pages/rooms/RoomList.page.vue @@ -7,7 +7,6 @@
Date: Wed, 20 Mar 2024 14:23:11 +0100 Subject: [PATCH 08/54] adjust color avatar topbar --- src/components/topbar/PopupIconInitials.vue | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/components/topbar/PopupIconInitials.vue b/src/components/topbar/PopupIconInitials.vue index ae801450b6..2b45d4f47f 100644 --- a/src/components/topbar/PopupIconInitials.vue +++ b/src/components/topbar/PopupIconInitials.vue @@ -83,13 +83,9 @@ const removePopup = () => { color: rgba(var(--v-theme-white)); cursor: pointer; -webkit-user-select: none; - background-color: rgba(var(--v-theme-secondary)); + background-color: rgba(var(--v-theme-on-surface)); border: none; border-radius: var(--radius-round); - - &:hover { - background-color: rgba(var(--v-theme-secondary-darken-1)); - } } .popup { From d5345d4930272d0b4325c4245e6f243397c6f654 Mon Sep 17 00:00:00 2001 From: NFriedo <69233063+NFriedo@users.noreply.github.com> Date: Wed, 20 Mar 2024 15:36:43 +0100 Subject: [PATCH 09/54] adjust colors roomdetails page and remove heading colors in typography --- src/components/legacy/TheFooter.vue | 1 - src/components/molecules/RoomDotMenu.vue | 1 - src/pages/rooms/RoomDetails.page.vue | 17 +---------------- src/styles/utility/_typography.scss | 2 -- 4 files changed, 1 insertion(+), 20 deletions(-) diff --git a/src/components/legacy/TheFooter.vue b/src/components/legacy/TheFooter.vue index 6721ebc994..a6e9b86f97 100644 --- a/src/components/legacy/TheFooter.vue +++ b/src/components/legacy/TheFooter.vue @@ -103,7 +103,6 @@ export default { width: 100%; padding: 0 var(--space-md); margin: var(--space-lg) 0 var(--space-md); - color: rgba(var(--v-theme-secondary-darken-1)); text-align: center; @include breakpoint(tablet) { diff --git a/src/components/molecules/RoomDotMenu.vue b/src/components/molecules/RoomDotMenu.vue index c8e353db7f..66c814e7df 100644 --- a/src/components/molecules/RoomDotMenu.vue +++ b/src/components/molecules/RoomDotMenu.vue @@ -62,6 +62,5 @@ const handleClick = (menuItem) => { margin-top: -2px; margin-right: 4px; font-size: 1rem; - color: rgba(0, 0, 0, 0.87); } diff --git a/src/pages/rooms/RoomDetails.page.vue b/src/pages/rooms/RoomDetails.page.vue index a83f20dff1..ebfe0c5635 100644 --- a/src/pages/rooms/RoomDetails.page.vue +++ b/src/pages/rooms/RoomDetails.page.vue @@ -31,7 +31,6 @@
diff --git a/src/themes/brb/vuetify.options.ts b/src/themes/brb/vuetify.options.ts index 2deb25c7ff..e3dacf8c6b 100644 --- a/src/themes/brb/vuetify.options.ts +++ b/src/themes/brb/vuetify.options.ts @@ -12,9 +12,9 @@ const brbTheme: ThemeDefinition = { "secondary-lighten-1": "#567e8e", "secondary-darken-1": "#2a4d5b", accent: "#e4032e", - "on-surface": "#294C5A", - "on-background": "#294C5A", - "on-white": "#294C5A", + "on-surface": "#294c5a", + "on-background": "#294c5a", + "on-white": "#294c5a", }, }; diff --git a/src/themes/n21/vuetify.options.ts b/src/themes/n21/vuetify.options.ts index 6102d3e66d..40cfabbb31 100644 --- a/src/themes/n21/vuetify.options.ts +++ b/src/themes/n21/vuetify.options.ts @@ -12,9 +12,9 @@ const n21Theme: ThemeDefinition = { "secondary-lighten-1": "#536e8c", "secondary-darken-1": "#283f5a", accent: "#970000", - "on-surface": "#0F355", - "on-background": "#0F355", - "on-white": "#0F355", + "on-surface": "#0f3551", + "on-background": "#0f3551", + "on-white": "#0f3551", }, }; diff --git a/src/themes/thr/vuetify.options.ts b/src/themes/thr/vuetify.options.ts index c29400d60d..9bf96eb728 100644 --- a/src/themes/thr/vuetify.options.ts +++ b/src/themes/thr/vuetify.options.ts @@ -12,9 +12,9 @@ const thrTheme: ThemeDefinition = { "secondary-lighten-1": "#3b719a", "secondary-darken-1": "#124266", accent: "#f56b00", - "on-surface": "#0F3551", - "on-background": "#0F3551", - "on-white": "#0F3551", + "on-surface": "#0f3551", + "on-background": "#0f3551", + "on-white": "#0f3551", }, }; From 36eeb0d1e3aeadbdc6c40d772afcf3ea8cb17a73 Mon Sep 17 00:00:00 2001 From: NFriedo <69233063+NFriedo@users.noreply.github.com> Date: Tue, 2 Apr 2024 16:36:54 +0200 Subject: [PATCH 37/54] fix focus avatar topbar --- .../topbar/PopupIconInitials.unit.ts | 2 +- src/components/topbar/PopupIconInitials.vue | 29 +++++-------------- 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/src/components/topbar/PopupIconInitials.unit.ts b/src/components/topbar/PopupIconInitials.unit.ts index d40500c2d0..9b2e338071 100644 --- a/src/components/topbar/PopupIconInitials.unit.ts +++ b/src/components/topbar/PopupIconInitials.unit.ts @@ -24,7 +24,7 @@ describe("@/components/topbar/PopupIconInitials", () => { lastName: "Mustermann", userRole: "teacher", }); - expect(wrapper.find(".icon").text()).toBe("MM"); + expect(wrapper.findComponent({ name: "v-btn" }).text()).toBe("MM"); }); it("it pops up when it is clicked", async () => { diff --git a/src/components/topbar/PopupIconInitials.vue b/src/components/topbar/PopupIconInitials.vue index 2b45d4f47f..c964df8f52 100644 --- a/src/components/topbar/PopupIconInitials.vue +++ b/src/components/topbar/PopupIconInitials.vue @@ -3,15 +3,9 @@ -
{{ initials }}
+ {{ initials }}
@@ -69,23 +63,14 @@ const removePopup = () => { From 45f0721b4e9114aa7485f98a25c6050c2ba3d917 Mon Sep 17 00:00:00 2001 From: NFriedo <69233063+NFriedo@users.noreply.github.com> Date: Wed, 3 Apr 2024 16:45:50 +0200 Subject: [PATCH 44/54] remove or replace theme-black var --- src/components/administration/AdminMigrationSection.vue | 2 +- src/components/legacy/NavigationBar.vue | 2 -- src/components/lern-store/AddContentModal.vue | 1 - src/components/lern-store/ContentCard.vue | 1 + src/components/molecules/AdminTableLegend.vue | 5 ----- src/components/molecules/ContextMenu.vue | 1 - src/components/organisms/StepProgress.vue | 1 - .../organisms/administration/SchoolPolicyFormDialog.vue | 2 +- src/components/organisms/administration/SchoolTerms.vue | 2 +- .../organisms/administration/SchoolTermsFormDialog.vue | 2 +- src/components/templates/RoomDashboard.vue | 5 ----- src/components/templates/TasksDashboardMain.vue | 1 - 12 files changed, 5 insertions(+), 20 deletions(-) diff --git a/src/components/administration/AdminMigrationSection.vue b/src/components/administration/AdminMigrationSection.vue index a1c95efa8b..d173248667 100644 --- a/src/components/administration/AdminMigrationSection.vue +++ b/src/components/administration/AdminMigrationSection.vue @@ -394,7 +394,7 @@ export default defineComponent({ diff --git a/src/components/legacy/NavigationBar.vue b/src/components/legacy/NavigationBar.vue index 09db5479e1..af7c321e8a 100644 --- a/src/components/legacy/NavigationBar.vue +++ b/src/components/legacy/NavigationBar.vue @@ -103,7 +103,6 @@ export default { justify-content: center; width: 100%; line-height: var(--line-height-lg); - color: rgba(var(--v-theme-black)); text-align: center; background-color: rgba(var(--v-theme-white)); -webkit-backdrop-filter: blur(5px); @@ -219,7 +218,6 @@ export default { padding: var(--space-xs) var(--space-md); font-family: var(--font-primary); font-size: var(--text-md); - color: rgba(var(--v-theme-black)); @include breakpoint(tablet) { display: flex; diff --git a/src/components/lern-store/AddContentModal.vue b/src/components/lern-store/AddContentModal.vue index 4a2dc520b8..e9fe0740b3 100644 --- a/src/components/lern-store/AddContentModal.vue +++ b/src/components/lern-store/AddContentModal.vue @@ -173,7 +173,6 @@ export default { .content-modal { &__body { min-height: 300px; - color: rgba(var(--v-theme-black)) !important; &--select { margin-top: var(--space-xl); } diff --git a/src/components/lern-store/ContentCard.vue b/src/components/lern-store/ContentCard.vue index 4deff1ca2f..a9b3f60e0e 100644 --- a/src/components/lern-store/ContentCard.vue +++ b/src/components/lern-store/ContentCard.vue @@ -242,6 +242,7 @@ export default { &__title { height: calc(var(--heading-6) * var(--line-height-sm) * 3); margin: var(--space-xs) var(--space-sm); + color: rgba(var(--v-on-surface)); @include excerpt( $font-size: var(--heading-6), diff --git a/src/components/molecules/AdminTableLegend.vue b/src/components/molecules/AdminTableLegend.vue index b512e8a8e0..d4e9d6a1c8 100644 --- a/src/components/molecules/AdminTableLegend.vue +++ b/src/components/molecules/AdminTableLegend.vue @@ -111,11 +111,6 @@ $vertically-center: auto 0; justify-content: left; } -.link-style { - color: rgba(var(--v-theme-black)); - text-decoration: underline; -} - .external-sync-hint { margin: $vertically-center; } diff --git a/src/components/molecules/ContextMenu.vue b/src/components/molecules/ContextMenu.vue index 152c2767d6..6899b2023c 100644 --- a/src/components/molecules/ContextMenu.vue +++ b/src/components/molecules/ContextMenu.vue @@ -247,7 +247,6 @@ export default { &-text { width: max-content; font-size: var(--text-md); - color: rgba(var(--v-theme-black)); text-align: left; white-space: normal; diff --git a/src/components/organisms/StepProgress.vue b/src/components/organisms/StepProgress.vue index 9aabdd3f6d..561386da5b 100644 --- a/src/components/organisms/StepProgress.vue +++ b/src/components/organisms/StepProgress.vue @@ -93,7 +93,6 @@ ul.progressbar { margin: 0 auto; margin-bottom: var(--space-xs); font-weight: var(--font-weight-bold); - color: rgba(var(--v-theme-black)); content: counter(step); counter-increment: step; background: rgba(var(--v-theme-white)); diff --git a/src/components/organisms/administration/SchoolPolicyFormDialog.vue b/src/components/organisms/administration/SchoolPolicyFormDialog.vue index c82e3ca21a..2241e9c746 100644 --- a/src/components/organisms/administration/SchoolPolicyFormDialog.vue +++ b/src/components/organisms/administration/SchoolPolicyFormDialog.vue @@ -174,7 +174,7 @@ export default defineComponent({