diff --git a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/css-colors/css-colors-editor.component.html b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/css-colors/css-colors-editor.component.html index 243cc1be5..6c0dca99b 100644 --- a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/css-colors/css-colors-editor.component.html +++ b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/css-colors/css-colors-editor.component.html @@ -3,20 +3,21 @@
- + {{'TENANT-CONFIGURATION-EDITOR.FIELDS.PRIMARY-COLOR' | translate}} {{formGroup.get('cssColors')?.get('primaryColor')?.getError('backendError').message}} {{'GENERAL.VALIDATION.REQUIRED' | translate}} {{'GENERAL.VALIDATION.INVALID-COLOR' | translate}} - + {{'TENANT-CONFIGURATION-EDITOR.FIELDS.PRIMARY-COLOR-2' | translate}} {{'GENERAL.VALIDATION.REQUIRED' | translate}} {{'GENERAL.VALIDATION.INVALID-COLOR' | translate}} - + {{'TENANT-CONFIGURATION-EDITOR.FIELDS.PRIMARY-COLOR-3' | translate}} {{'GENERAL.VALIDATION.REQUIRED' | translate}} {{'GENERAL.VALIDATION.INVALID-COLOR' | translate}} - + {{'TENANT-CONFIGURATION-EDITOR.FIELDS.SECONDARY-COLOR' | translate}}
-
-
-
diff --git a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/css-colors/css-colors-editor.component.scss b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/css-colors/css-colors-editor.component.scss index 33cd57c15..e6b81ab51 100644 --- a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/css-colors/css-colors-editor.component.scss +++ b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/css-colors/css-colors-editor.component.scss @@ -1,3 +1,7 @@ .css-colors { } + +::ng-deep .mat-mdc-form-field-icon-suffix { + margin-right: 0.2em; +} diff --git a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/default-user-locale/default-user-locale-editor.component.html b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/default-user-locale/default-user-locale-editor.component.html index ffe03b0a4..aa794485a 100644 --- a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/default-user-locale/default-user-locale-editor.component.html +++ b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/default-user-locale/default-user-locale-editor.component.html @@ -1,6 +1,6 @@
-
+
{{'TENANT-CONFIGURATION-EDITOR.FIELDS.TIMEZONE' | translate}} @@ -11,6 +11,8 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}} {{formGroup.get('defaultUserLocale')?.get('timezone')?.getError('backendError').message}} +
+
{{'TENANT-CONFIGURATION-EDITOR.FIELDS.CULTURE' | translate}} @@ -21,6 +23,8 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}} {{formGroup.get('defaultUserLocale')?.get('culture')?.getError('backendError').message}} +
+
{{'TENANT-CONFIGURATION-EDITOR.FIELDS.LANGUAGE' | translate}} @@ -34,12 +38,11 @@
-
-
-
diff --git a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/deposit/deposit-editor.component.html b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/deposit/deposit-editor.component.html index 584504544..d6ca45174 100644 --- a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/deposit/deposit-editor.component.html +++ b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/deposit/deposit-editor.component.html @@ -24,7 +24,7 @@
-
+
{{'TENANT-CONFIGURATION-EDITOR.FIELDS.REPOSITORY-ID' | translate}} @@ -32,7 +32,7 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}}
-
+
{{'TENANT-CONFIGURATION-EDITOR.FIELDS.URL' | translate}} @@ -40,7 +40,7 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}}
-
+
{{'TENANT-CONFIGURATION-EDITOR.FIELDS.ISSUER-URL' | translate}} @@ -48,7 +48,7 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}}
-
+
{{'TENANT-CONFIGURATION-EDITOR.FIELDS.CLIENT-ID' | translate}} @@ -56,7 +56,7 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}}
-
+
{{'TENANT-CONFIGURATION-EDITOR.FIELDS.CLIENT-SECRET' | translate}} @@ -64,7 +64,7 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}}
-
+
{{'TENANT-CONFIGURATION-EDITOR.FIELDS.SCOPE' | translate}} @@ -72,7 +72,7 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}}
-
+
{{'TENANT-CONFIGURATION-EDITOR.FIELDS.PDF-TRANSFORMER-ID' | translate}} @@ -80,7 +80,7 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}}
-
+
{{'TENANT-CONFIGURATION-EDITOR.FIELDS.RDA-TRANSFORMER-ID' | translate}} @@ -94,12 +94,11 @@
-
-
-
diff --git a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/deposit/deposit-editor.component.scss b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/deposit/deposit-editor.component.scss index 475061b20..cb290cffc 100644 --- a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/deposit/deposit-editor.component.scss +++ b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/deposit/deposit-editor.component.scss @@ -18,3 +18,7 @@ } } } + +::ng-deep label { + margin: 0; +} diff --git a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/file-transformer/file-transformer-editor.component.html b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/file-transformer/file-transformer-editor.component.html index c487e5650..f8fc73602 100644 --- a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/file-transformer/file-transformer-editor.component.html +++ b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/file-transformer/file-transformer-editor.component.html @@ -23,7 +23,7 @@
-
+
{{'TENANT-CONFIGURATION-EDITOR.FIELDS.TRANSFORMER-ID' | translate}} @@ -31,7 +31,7 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}}
-
+
{{'TENANT-CONFIGURATION-EDITOR.FIELDS.URL' | translate}} @@ -39,7 +39,7 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}}
-
+
{{'TENANT-CONFIGURATION-EDITOR.FIELDS.ISSUER-URL' | translate}} @@ -47,7 +47,7 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}}
-
+
{{'TENANT-CONFIGURATION-EDITOR.FIELDS.CLIENT-ID' | translate}} @@ -55,7 +55,7 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}}
-
+
{{'TENANT-CONFIGURATION-EDITOR.FIELDS.CLIENT-SECRET' | translate}} @@ -63,7 +63,7 @@ {{'GENERAL.VALIDATION.REQUIRED' | translate}}
-
+
{{'TENANT-CONFIGURATION-EDITOR.FIELDS.SCOPE' | translate}} @@ -78,11 +78,11 @@
-
-
diff --git a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/file-transformer/file-transformer-editor.component.scss b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/file-transformer/file-transformer-editor.component.scss index 998033d7a..eb0012996 100644 --- a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/file-transformer/file-transformer-editor.component.scss +++ b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/file-transformer/file-transformer-editor.component.scss @@ -18,3 +18,7 @@ } } } + +::ng-deep label { + margin: 0; +} diff --git a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/logo/logo-editor.component.html b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/logo/logo-editor.component.html index 5b8961563..ccc3b3d45 100644 --- a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/logo/logo-editor.component.html +++ b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/logo/logo-editor.component.html @@ -7,25 +7,25 @@
- -
-
-
diff --git a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/logo/logo-editor.component.scss b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/logo/logo-editor.component.scss index 120e11069..67a64bbdd 100644 --- a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/logo/logo-editor.component.scss +++ b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/logo/logo-editor.component.scss @@ -1,3 +1,19 @@ -.logo { +.attach-btn { + top: -20px; +} + +.attach-file { + width: 156px; + height: 44px; + color: #ffffff; + background: var(--primary-color) 0% 0% no-repeat padding-box; + box-shadow: 0px 3px 6px #1e202029; + border-radius: 30px; +} + +.attach-file:hover { + background-color: #ffffff; + border: 1px solid var(--primary-color); + color: var(--primary-color); } diff --git a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/tenant-configuration-editor.component.html b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/tenant-configuration-editor.component.html index f61dff138..25c9dd65d 100644 --- a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/tenant-configuration-editor.component.html +++ b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/tenant-configuration-editor.component.html @@ -38,7 +38,6 @@ - {{'TENANT-CONFIGURATION-EDITOR.DEPOSIT-PLUGINS.TITLE' | translate}}