From 0cfe21b9f488b17c0a083151a73e27062b21a57d Mon Sep 17 00:00:00 2001 From: August Andersen Date: Tue, 17 Sep 2024 11:10:08 +0200 Subject: [PATCH 1/2] fixed welcome dialog and removed some text. --- .../welcome-dialog.component.html | 9 ------ .../welcome-dialog.component.scss | 2 +- src/assets/i18n/da.json | 4 --- src/styles.scss | 30 ++++++++++++------- 4 files changed, 20 insertions(+), 25 deletions(-) diff --git a/src/app/shared/components/welcome-dialog/welcome-dialog.component.html b/src/app/shared/components/welcome-dialog/welcome-dialog.component.html index 5452f068..ce8358c2 100644 --- a/src/app/shared/components/welcome-dialog/welcome-dialog.component.html +++ b/src/app/shared/components/welcome-dialog/welcome-dialog.component.html @@ -11,15 +11,6 @@

-

- {{ "WELCOME-DIALOG.SUB-HEADER-1" | translate }} -

-

- {{ "WELCOME-DIALOG.WELCOME-MESSAGE" | translate }} - - {{ "WELCOME-DIALOG.LINK-1" | translate }} {{ "WELCOME-DIALOG.WELCOME-MESSAGE-2" | translate }} -

{{ "WELCOME-DIALOG.SUB-HEADER-2" | translate }}

diff --git a/src/app/shared/components/welcome-dialog/welcome-dialog.component.scss b/src/app/shared/components/welcome-dialog/welcome-dialog.component.scss index f5c35c3a..f963b111 100644 --- a/src/app/shared/components/welcome-dialog/welcome-dialog.component.scss +++ b/src/app/shared/components/welcome-dialog/welcome-dialog.component.scss @@ -17,7 +17,7 @@ $spacing: 5rem; } } -.mat-dialog-content { +.mat-mdc-dialog-content { p { &.sub-header { strong { diff --git a/src/assets/i18n/da.json b/src/assets/i18n/da.json index 40769beb..c0fdc09d 100644 --- a/src/assets/i18n/da.json +++ b/src/assets/i18n/da.json @@ -1126,13 +1126,9 @@ "WELCOME-DIALOG": { "WELCOME": "VELKOMMEN TIL OS2iot", "WELCOME-SUB": " Din indgang til administration af IoT enheder", - "LINK-1": "OS2iot's brugerforum", "LINK-2": "produktsiden", "LINK-3": "Github", - "SUB-HEADER-1": "Brugerforum", "SUB-HEADER-2": "Om OS2iot", - "WELCOME-MESSAGE": "Bliv en aktiv del af ", - "WELCOME-MESSAGE-2": ". Her kan du stille spørgsmål, indrapportere fejl og dele dine udviklingsønsker. Ved fælles hjælp bliver løsningen bedre.", "WELCOME-MESSAGE-3": "OS2iot er en open source løsning organiseret igennem OS2-fællesskabet. Du kan finde mere information om OS2iot på ", "WELCOME-MESSAGE-4": " og følge udviklingen på ", "NO-ACCESS": "Du har endnu ikke de fornødne rettigheder i OS2iot. Anmod om adgang til en organisation for at få tildelt rettigheder af din administrator.", diff --git a/src/styles.scss b/src/styles.scss index fe8c7aee..84a68ff8 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -99,22 +99,30 @@ body { margin-left: 0; } -.welcome-screen .mat-dialog-container { - background-color: #55b156; +.line-break { + white-space: pre-line; } -.hide-checkbox { - color: $color-white-001; +.width100percent { + width: 100%; +} - .mat-checkbox-frame { - border-color: $color-white-001; - } +.welcome-screen .mat-mdc-dialog-surface { + background-color: #55b156 !important; + overflow: hidden; + padding: 24px; } -.line-break { - white-space: pre-line; +app-welcome-dialog .hide-checkbox .mdc-checkbox { + .mdc-checkbox__native-control:enabled:focus:focus:not(:checked):not(:indeterminate) ~ .mdc-checkbox__background { + border-color: $color-white-001 !important; + } + .mdc-checkbox__native-control:enabled:not(:checked):not(:indeterminate):not([data-indeterminate="true"]) + ~ .mdc-checkbox__background { + border-color: $color-white-001 !important; + } } -.width100percent { - width: 100%; +app-welcome-dialog .mdc-label { + color: $color-white-001 !important; } From 2a9bc8da17de4a1938510d466c4d165600c9b422 Mon Sep 17 00:00:00 2001 From: August Andersen Date: Tue, 17 Sep 2024 13:13:23 +0200 Subject: [PATCH 2/2] edited some padding and sizes --- .../applications-list/applications-list.component.ts | 2 +- .../components/welcome-dialog/welcome-dialog.component.scss | 2 +- src/styles.scss | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/applications/applications-list/applications-list.component.ts b/src/app/applications/applications-list/applications-list.component.ts index 66eccd7f..b569758a 100644 --- a/src/app/applications/applications-list/applications-list.component.ts +++ b/src/app/applications/applications-list/applications-list.component.ts @@ -134,7 +134,7 @@ export class ApplicationsListComponent implements OnInit { disableClose: true, closeOnNavigation: true, panelClass: "welcome-screen", - maxWidth: "60vw", + maxWidth: "40vw", data: { hasSomePermission: this.hasSomePermission, } as WelcomeDialogModel, diff --git a/src/app/shared/components/welcome-dialog/welcome-dialog.component.scss b/src/app/shared/components/welcome-dialog/welcome-dialog.component.scss index f963b111..8f6a5271 100644 --- a/src/app/shared/components/welcome-dialog/welcome-dialog.component.scss +++ b/src/app/shared/components/welcome-dialog/welcome-dialog.component.scss @@ -1,6 +1,6 @@ @import "src/assets/scss/setup/variables"; -$spacing: 5rem; +$spacing: 3rem; .container { padding-left: $spacing; diff --git a/src/styles.scss b/src/styles.scss index 84a68ff8..202924ab 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -110,7 +110,7 @@ body { .welcome-screen .mat-mdc-dialog-surface { background-color: #55b156 !important; overflow: hidden; - padding: 24px; + padding: 12px; } app-welcome-dialog .hide-checkbox .mdc-checkbox {