diff --git a/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.html b/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.html index 081ea0edc..6335575a8 100644 --- a/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.html +++ b/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.html @@ -7,8 +7,8 @@
-
-
+
+
diff --git a/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.ts b/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.ts index 5345190e8..3305fc65f 100644 --- a/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.ts +++ b/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.ts @@ -11,14 +11,14 @@ import { accountTranslations } from '@translations/account-translations'; export class BaseAccountScreenComponent implements OnInit { readonly translations = accountTranslations; readonly path: string; - readonly shouldHideTitle: boolean; + readonly isWarningsScreen: boolean; constructor( private readonly _router: Router, private readonly _hostRef: ViewContainerRef, ) { this.path = this._router.url.split('/').pop(); - this.shouldHideTitle = this.path === 'warnings-preferences'; + this.isWarningsScreen = this.path === 'warnings-preferences'; } ngOnInit(): void { diff --git a/apps/red-ui/src/app/modules/account/screens/preferences/dialog-defaults/dialog-defaults.component.html b/apps/red-ui/src/app/modules/account/screens/preferences/dialog-defaults/dialog-defaults.component.html index 11a3af117..29a462da6 100644 --- a/apps/red-ui/src/app/modules/account/screens/preferences/dialog-defaults/dialog-defaults.component.html +++ b/apps/red-ui/src/app/modules/account/screens/preferences/dialog-defaults/dialog-defaults.component.html @@ -1,77 +1,79 @@ -
-
-

{{ 'dialog-defaults-form.title' | translate }}

-

{{ 'dialog-defaults-form.redaction.title' | translate }}

-
- - - - {{ - option.label | translate - }} - - - {{ - 'dialog-defaults-form.extra-option-label' | translate - }} +
+ +
+

{{ 'dialog-defaults-form.title' | translate }}

+

{{ 'dialog-defaults-form.redaction.title' | translate }}

+
+ + + + {{ + option.label | translate + }} + + + {{ + 'dialog-defaults-form.extra-option-label' | translate + }} +
+
+ + + + {{ + option.label | translate + }} + + + {{ + 'dialog-defaults-form.extra-option-label' | translate + }} +
+

{{ 'dialog-defaults-form.recommendation.title' | translate }}

+
+ + + + {{ + option.label | translate + }} + + + {{ + 'dialog-defaults-form.extra-option-label' | translate + }} +
+

{{ 'dialog-defaults-form.hint.title' | translate }}

+
+ + + + {{ option.label | translate }} + + + {{ + 'dialog-defaults-form.extra-option-label' | translate + }} +
+
+ + + + {{ option.label | translate }} + + + {{ + 'dialog-defaults-form.extra-option-label' | translate + }} +
-
- - - - {{ - option.label | translate - }} - - - {{ - 'dialog-defaults-form.extra-option-label' | translate - }} +
+
-

{{ 'dialog-defaults-form.recommendation.title' | translate }}

-
- - - - {{ - option.label | translate - }} - - - {{ - 'dialog-defaults-form.extra-option-label' | translate - }} -
-

{{ 'dialog-defaults-form.hint.title' | translate }}

-
- - - - {{ option.label | translate }} - - - {{ - 'dialog-defaults-form.extra-option-label' | translate - }} -
-
- - - - {{ option.label | translate }} - - - {{ - 'dialog-defaults-form.extra-option-label' | translate - }} -
-
-
- -
- + +
diff --git a/apps/red-ui/src/app/modules/account/screens/preferences/dialog-defaults/dialog-defaults.component.scss b/apps/red-ui/src/app/modules/account/screens/preferences/dialog-defaults/dialog-defaults.component.scss index 4584dd57c..931d87f46 100644 --- a/apps/red-ui/src/app/modules/account/screens/preferences/dialog-defaults/dialog-defaults.component.scss +++ b/apps/red-ui/src/app/modules/account/screens/preferences/dialog-defaults/dialog-defaults.component.scss @@ -2,6 +2,15 @@ mat-checkbox { margin: 8px 0 0 8px; } -.dialog-actions { - border-top: none; +h3 { + margin-top: 24px; + margin-bottom: 4px; +} + +form .iqser-input-group:not(first-of-type) { + margin-top: 8px; +} + +.dialog { + margin-bottom: 0; } diff --git a/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.html b/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.html index 9de8cca47..ad1f6dd44 100644 --- a/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.html +++ b/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.html @@ -1,52 +1,53 @@ -
-
-
-
- -
- - {{ 'preferences-screen.form.auto-expand-filters-on-action' | translate }} - -
+
+ +
+
+ +
+ + {{ 'preferences-screen.form.auto-expand-filters-on-action' | translate }} + +
-
- - {{ 'preferences-screen.form.open-structured-view-by-default' | translate }} - -
+
+ + {{ 'preferences-screen.form.open-structured-view-by-default' | translate }} + +
-
- - -
-
+
+ + +
+ - -

{{ 'preferences-screen.warnings-subtitle' | translate }}

-

{{ 'preferences-screen.warnings-description' | translate }}

+ +

{{ 'preferences-screen.warnings-subtitle' | translate }}

+

{{ 'preferences-screen.warnings-description' | translate }}

-
- - {{ 'preferences-screen.form.load-all-annotations-warning' | translate }} - -
-
- - {{ 'preferences-screen.form.help-mode-dialog' | translate }} - -
-
+
+ + {{ 'preferences-screen.form.load-all-annotations-warning' | translate }} + +
+
+ + {{ 'preferences-screen.form.help-mode-dialog' | translate }} + +
+
+
-
-
- -
- +
+ +
+ +
diff --git a/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.scss b/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.scss index efe894308..76f9b7458 100644 --- a/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.scss +++ b/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.scss @@ -1,9 +1,3 @@ -@use 'variables'; - -.content-delimiter { - border-top: 1px solid var(--iqser-separator); -} - .warnings-description { width: 105%; }