diff --git a/app/src/app/app.module.ts b/app/src/app/app.module.ts index b1e6dfb93f..ced53c4df8 100644 --- a/app/src/app/app.module.ts +++ b/app/src/app/app.module.ts @@ -64,7 +64,6 @@ import { ShellModule, SHELL_APP_SERVICE, SHELL_AUTH_TOKEN } from '@alfresco/adf- import { StoreDevtoolsModule } from '@ngrx/store-devtools'; import { APP_ROUTES } from './app.routes'; import { MatIconRegistry } from '@angular/material/icon'; -import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field'; registerLocaleData(localeFr); registerLocaleData(localeDe); @@ -123,12 +122,6 @@ registerLocaleData(localeSv); name: 'app', source: 'assets' } - }, - { - provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, - useValue: { - appearance: 'outline' - } } ], declarations: [AppComponent], diff --git a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.scss index 83969a972d..80e821f5e7 100644 --- a/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.scss +++ b/projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.scss @@ -8,13 +8,13 @@ margin-top: -15px; .adf-property-list { - padding: 15px 8px 8px; + padding: 8px; background: unset; } .adf-property-list .adf-property adf-card-view-item-dispatcher adf-card-view-textitem { display: inline-block; - width: 100%; + width: 300px; .adf-textitem-clickable { padding-top: 0; diff --git a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.html index abba5e3407..e4c2be0d86 100644 --- a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.html +++ b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.html @@ -7,7 +7,7 @@ class="aca-rule-composite-condition__form__row" *ngFor="let control of conditionFormControls; let i = index"> - + @@ -16,7 +16,7 @@ - + {{ 'ACA_FOLDER_RULES.RULE_DETAILS.LOGIC_OPERATORS.AND' | translate }} diff --git a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.scss b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.scss index 283c644df0..d2af1b9eeb 100644 --- a/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.scss +++ b/projects/aca-content/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.scss @@ -40,10 +40,6 @@ & > :nth-child(2) { flex: 1; } - - .aca-rule-composite-condition-form-field { - min-width: unset; - } } } } diff --git a/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.html b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.html index 8f652bd1cd..d8d26a0be6 100644 --- a/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.html +++ b/projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.html @@ -53,7 +53,7 @@ -
+
{{ 'ACA_FOLDER_RULES.RULE_DETAILS.LABEL.OPTIONS' | translate }}
label, @@ -28,10 +28,6 @@ padding: 0.75em 0; } - & > label { - margin-top: 11px; - } - & > div { flex-grow: 1; } @@ -45,19 +41,6 @@ min-height: 4em; } } - - &.aca-rule-details__form__actions { - .aca-label { - margin-top: 14px; - } - } - - &.aca-rule-details__form__triggers, - &.aca-rule-details__form__options { - .aca-label { - padding-top: 2px; - } - } } &:not(:nth-child(1)) { diff --git a/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-form.component.html b/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-form.component.html index cb6b1d8c0b..b374adbba9 100644 --- a/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-form.component.html +++ b/projects/aca-content/src/lib/components/info-drawer/library-metadata-tab/library-metadata-form.component.html @@ -2,12 +2,12 @@