From 2bc29e61934eb8cd0b81f56975f076f0ff856ef2 Mon Sep 17 00:00:00 2001 From: Markus Date: Fri, 22 Mar 2024 15:39:27 +0100 Subject: [PATCH 1/5] [fix] fixed issues with sign in buttons --- .../components/language/LanguageSelector.vue | 1 + presenter/src/components/menu/HeaderMenu.vue | 55 ++++++++++++++++--- 2 files changed, 49 insertions(+), 7 deletions(-) diff --git a/presenter/src/components/language/LanguageSelector.vue b/presenter/src/components/language/LanguageSelector.vue index 07fdbfb0cb..ea89ec137d 100644 --- a/presenter/src/components/language/LanguageSelector.vue +++ b/presenter/src/components/language/LanguageSelector.vue @@ -41,6 +41,7 @@ const languages = ref([ .language-select { max-width: 80px; + min-width: 70px; @include section-content-font; diff --git a/presenter/src/components/menu/HeaderMenu.vue b/presenter/src/components/menu/HeaderMenu.vue index 5cb355798a..571f1b11e3 100644 --- a/presenter/src/components/menu/HeaderMenu.vue +++ b/presenter/src/components/menu/HeaderMenu.vue @@ -25,7 +25,7 @@
-
+
-
+
@@ -72,7 +74,7 @@ location="right" class="nav-drawer d-flex d-md-none" > -
+
+
+ +
+ +
+
+
+
@@ -165,6 +195,7 @@ async function signOut() { const appBackground = ref('transparent') const navBackground = ref('#d8d8d8') const mobileMenu = ref(false) +const buttonsInBackground = ref(true) let videoSlideObserver: IntersectionObserver @@ -172,6 +203,8 @@ function changeAppBarBackground() { if (appBackground.value !== '#f5f5f5') { appBackground.value = '#f5f5f5' navBackground.value = '#f5f5f5' + + buttonsInBackground.value = false } } @@ -179,6 +212,8 @@ function resetAppBarBackground() { if (appBackground.value !== 'transparent') { appBackground.value = 'transparent' navBackground.value = 'transparent' + + buttonsInBackground.value = true } } @@ -226,6 +261,12 @@ onMounted(() => { $background-color-primary 0.06%, $background-color-primary-transition 100% ); + + .video-helper { + color: $font-color-default !important; + background-color: transparent !important; + border: 1px solid $font-color-default !important; + } } From 87c5e0ab50b530a62281e15753ce057bf52ac963 Mon Sep 17 00:00:00 2001 From: Markus Date: Fri, 22 Mar 2024 15:46:15 +0100 Subject: [PATCH 2/5] code linting --- presenter/src/components/language/LanguageSelector.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/presenter/src/components/language/LanguageSelector.vue b/presenter/src/components/language/LanguageSelector.vue index ea89ec137d..53aee21659 100644 --- a/presenter/src/components/language/LanguageSelector.vue +++ b/presenter/src/components/language/LanguageSelector.vue @@ -40,8 +40,8 @@ const languages = ref([ @import '#root/src/assets/scss/style'; .language-select { - max-width: 80px; min-width: 70px; + max-width: 80px; @include section-content-font; From f990a04571d9378b786eba8c22ff8d920f2c4412 Mon Sep 17 00:00:00 2001 From: Markus Date: Fri, 22 Mar 2024 15:46:41 +0100 Subject: [PATCH 3/5] updated snapshots --- .../menu/__snapshots__/HeaderMenu.test.ts.snap | 3 ++- .../src/layouts/__snapshots__/DefaultLayout.test.ts.snap | 3 ++- presenter/src/pages/auth/__snapshots__/Page.test.ts.snap | 3 ++- .../pages/datenschutz/__snapshots__/Page.test.ts.snap | 3 ++- .../src/pages/impressum/__snapshots__/Page.test.ts.snap | 3 ++- .../src/pages/index/__snapshots__/Page.test.ts.snap | 3 ++- .../src/pages/optin/__snapshots__/Page.test.ts.snap | 9 ++++++--- .../pages/silent-refresh/__snapshots__/Page.test.ts.snap | 3 ++- 8 files changed, 20 insertions(+), 10 deletions(-) diff --git a/presenter/src/components/menu/__snapshots__/HeaderMenu.test.ts.snap b/presenter/src/components/menu/__snapshots__/HeaderMenu.test.ts.snap index 6e5d95d9a9..00725e9801 100644 --- a/presenter/src/components/menu/__snapshots__/HeaderMenu.test.ts.snap +++ b/presenter/src/components/menu/__snapshots__/HeaderMenu.test.ts.snap @@ -367,7 +367,7 @@ exports[`HeaderMenu > renders 1`] = ` >
@@ -456,6 +456,7 @@ exports[`HeaderMenu > renders 1`] = `
+
diff --git a/presenter/src/layouts/__snapshots__/DefaultLayout.test.ts.snap b/presenter/src/layouts/__snapshots__/DefaultLayout.test.ts.snap index ddec228b2a..676185ec7b 100644 --- a/presenter/src/layouts/__snapshots__/DefaultLayout.test.ts.snap +++ b/presenter/src/layouts/__snapshots__/DefaultLayout.test.ts.snap @@ -377,7 +377,7 @@ exports[`DefaultLayout > renders 1`] = ` >
@@ -466,6 +466,7 @@ exports[`DefaultLayout > renders 1`] = `
+
diff --git a/presenter/src/pages/auth/__snapshots__/Page.test.ts.snap b/presenter/src/pages/auth/__snapshots__/Page.test.ts.snap index 479efde1e3..25303d3b38 100644 --- a/presenter/src/pages/auth/__snapshots__/Page.test.ts.snap +++ b/presenter/src/pages/auth/__snapshots__/Page.test.ts.snap @@ -378,7 +378,7 @@ exports[`AuthPage > signin callback without error > renders 1`] = ` >
@@ -467,6 +467,7 @@ exports[`AuthPage > signin callback without error > renders 1`] = `
+
diff --git a/presenter/src/pages/datenschutz/__snapshots__/Page.test.ts.snap b/presenter/src/pages/datenschutz/__snapshots__/Page.test.ts.snap index d3668d846a..a12ba6be57 100644 --- a/presenter/src/pages/datenschutz/__snapshots__/Page.test.ts.snap +++ b/presenter/src/pages/datenschutz/__snapshots__/Page.test.ts.snap @@ -377,7 +377,7 @@ exports[`DataPrivacyPage > renders 1`] = ` >
@@ -466,6 +466,7 @@ exports[`DataPrivacyPage > renders 1`] = `
+ diff --git a/presenter/src/pages/impressum/__snapshots__/Page.test.ts.snap b/presenter/src/pages/impressum/__snapshots__/Page.test.ts.snap index 45e7c36e39..e67d8cb002 100644 --- a/presenter/src/pages/impressum/__snapshots__/Page.test.ts.snap +++ b/presenter/src/pages/impressum/__snapshots__/Page.test.ts.snap @@ -377,7 +377,7 @@ exports[`ImpressumPage > renders 1`] = ` >
@@ -466,6 +466,7 @@ exports[`ImpressumPage > renders 1`] = `
+ diff --git a/presenter/src/pages/index/__snapshots__/Page.test.ts.snap b/presenter/src/pages/index/__snapshots__/Page.test.ts.snap index 38162eb853..743182e7aa 100644 --- a/presenter/src/pages/index/__snapshots__/Page.test.ts.snap +++ b/presenter/src/pages/index/__snapshots__/Page.test.ts.snap @@ -378,7 +378,7 @@ exports[`IndexPage > renders 1`] = ` >
@@ -467,6 +467,7 @@ exports[`IndexPage > renders 1`] = `
+ diff --git a/presenter/src/pages/optin/__snapshots__/Page.test.ts.snap b/presenter/src/pages/optin/__snapshots__/Page.test.ts.snap index ffd2643418..dfce90ef2a 100644 --- a/presenter/src/pages/optin/__snapshots__/Page.test.ts.snap +++ b/presenter/src/pages/optin/__snapshots__/Page.test.ts.snap @@ -378,7 +378,7 @@ exports[`OptinPage > API call with error > renders error message 1`] = ` >
@@ -467,6 +467,7 @@ exports[`OptinPage > API call with error > renders error message 1`] = `
+ @@ -1878,7 +1879,7 @@ exports[`OptinPage > API call with failure > renders error message 1`] = ` >
@@ -1967,6 +1968,7 @@ exports[`OptinPage > API call with failure > renders error message 1`] = `
+ @@ -3378,7 +3380,7 @@ exports[`OptinPage > API call with success > renders success 1`] = ` >
@@ -3467,6 +3469,7 @@ exports[`OptinPage > API call with success > renders success 1`] = `
+ diff --git a/presenter/src/pages/silent-refresh/__snapshots__/Page.test.ts.snap b/presenter/src/pages/silent-refresh/__snapshots__/Page.test.ts.snap index b0610b0930..53f6158b18 100644 --- a/presenter/src/pages/silent-refresh/__snapshots__/Page.test.ts.snap +++ b/presenter/src/pages/silent-refresh/__snapshots__/Page.test.ts.snap @@ -378,7 +378,7 @@ exports[`SilentRefreshPage > auth service with succes > renders 1`] = ` >
@@ -467,6 +467,7 @@ exports[`SilentRefreshPage > auth service with succes > renders 1`] = `
+ From 8b7468c7442fab15c417c8730f107e3cc8941e18 Mon Sep 17 00:00:00 2001 From: Markus Date: Fri, 22 Mar 2024 15:53:33 +0100 Subject: [PATCH 4/5] cleand up code --- presenter/src/components/menu/HeaderMenu.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/presenter/src/components/menu/HeaderMenu.vue b/presenter/src/components/menu/HeaderMenu.vue index 571f1b11e3..c09fca7119 100644 --- a/presenter/src/components/menu/HeaderMenu.vue +++ b/presenter/src/components/menu/HeaderMenu.vue @@ -97,7 +97,7 @@
-
+