Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ACS-7768] unify inputs and selects across the app - revert #3850

Merged
merged 1 commit into from
May 20, 2024
Merged

[ACS-7768] unify inputs and selects across the app - revert #3850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions app/src/app/app.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -123,12 +122,6 @@ registerLocaleData(localeSv);
name: 'app',
source: 'assets'
}
},
{
provide: MAT_FORM_FIELD_DEFAULT_OPTIONS,
useValue: {
appearance: 'outline'
}
}
],
declarations: [AppComponent],
Expand Down
4 changes: 2 additions & 2 deletions projects/aca-content/folder-rules/src/rule-details/actions/rule-action.ui-component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...ntent/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
class="aca-rule-composite-condition__form__row"
*ngFor="let control of conditionFormControls; let i = index">

<mat-form-field *ngIf="i === 0" appearance="outline" subscriptSizing="dynamic" class="aca-rule-composite-condition-form-field">
<mat-form-field *ngIf="i === 0" appearance="outline" subscriptSizing="dynamic">
<mat-select
[formControl]="invertedControl"
[disabled]="readOnly">
Expand All @@ -16,7 +16,7 @@
</mat-select>
</mat-form-field>

<mat-form-field *ngIf="i > 0" appearance="outline" subscriptSizing="dynamic" class="aca-rule-composite-condition-form-field">
<mat-form-field *ngIf="i > 0" appearance="outline" subscriptSizing="dynamic">
<mat-select
[formControl]="booleanModeControl">
<mat-option value="and">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.LOGIC_OPERATORS.AND' | translate }}</mat-option>
Expand Down
4 changes: 0 additions & 4 deletions ...ntent/folder-rules/src/rule-details/conditions/rule-composite-condition.ui-component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@
& > :nth-child(2) {
flex: 1;
}

.aca-rule-composite-condition-form-field {
min-width: unset;
}
}
}
}
2 changes: 1 addition & 1 deletion projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
</aca-rule-action-list>
</div>

<div class="aca-rule-details__form__row aca-rule-details__form__options" *ngIf="showOptionsSection">
<div class="aca-rule-details__form__row" *ngIf="showOptionsSection">
<div class="aca-label">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.LABEL.OPTIONS' | translate }}</div>
<aca-rule-options
formControlName="options"
Expand Down
19 changes: 1 addition & 18 deletions projects/aca-content/folder-rules/src/rule-details/rule-details.ui-component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
padding: 8px 20px;
width: 100%;
box-sizing: border-box;
overflow-x: auto;

&.aca-rule-details__form__description {
padding-top: 0;
Expand All @@ -17,6 +16,7 @@

&__row {
display: flex;
align-items: baseline;
gap: 8px;

& > label,
Expand All @@ -28,10 +28,6 @@
padding: 0.75em 0;
}

& > label {
margin-top: 11px;
}

& > div {
flex-grow: 1;
}
Expand All @@ -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)) {
Expand Down
10 changes: 4 additions & 6 deletions .../src/lib/components/info-drawer/library-metadata-tab/library-metadata-form.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<mat-card-content>
<form [formGroup]="form" autocomplete="off">
<mat-form-field floatLabel="auto" data-automation-id="library-name-properties-wrapper" class="app-library-metadata-form-field">
<mat-label>{{ 'LIBRARY.DIALOG.FORM.NAME' | translate }}</mat-label>
<input
matInput
[cdkTrapFocusAutoCapture]="form.enabled"
[cdkTrapFocus]="form.enabled"
required
placeholder="{{ 'LIBRARY.DIALOG.FORM.NAME' | translate }}"
formControlName="title"
[errorStateMatcher]="matcher"
/>
Expand All @@ -18,23 +18,21 @@
</mat-form-field>

<mat-form-field floatLabel="auto" data-automation-id="library-id-properties-wrapper" class="app-library-metadata-form-field">
<mat-label>{{ 'LIBRARY.DIALOG.FORM.SITE_ID' | translate }}</mat-label>
<input matInput formControlName="id" />
<input matInput placeholder="{{ 'LIBRARY.DIALOG.FORM.SITE_ID' | translate }}" formControlName="id" />
</mat-form-field>

<mat-form-field floatLabel="auto" data-automation-id="library-visibility-properties-wrapper" class="app-library-metadata-form-field">
<mat-label>{{ 'LIBRARY.DIALOG.FORM.VISIBILITY' | translate }}</mat-label>
<mat-select formControlName="visibility">
<mat-select placeholder="{{ 'LIBRARY.DIALOG.FORM.VISIBILITY' | translate }}" formControlName="visibility">
<mat-option [value]="type.value" *ngFor="let type of libraryType">
{{ type.label | translate }}
</mat-option>
</mat-select>
</mat-form-field>

<mat-form-field floatLabel="auto" data-automation-id="library-description-properties-wrapper" class="app-library-metadata-form-field">
<mat-label>{{ 'LIBRARY.DIALOG.FORM.DESCRIPTION' | translate }}</mat-label>
<textarea
matInput
placeholder="{{ 'LIBRARY.DIALOG.FORM.DESCRIPTION' | translate }}"
rows="3"
formControlName="description"
[errorStateMatcher]="matcher"
Expand Down
2 changes: 1 addition & 1 deletion ...ontent/src/lib/components/search/search-input-control/search-input-control.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<mat-icon class="app-search-input-control-icon app-search-button-icon" [attr.aria-label]="'SEARCH.BUTTON.ARIA-LABEL' | translate">search</mat-icon>
</button>
<mat-form-field class="app-input-form-field" floatLabel="auto">
<mat-label>{{ 'SEARCH.INPUT.PLACEHOLDER' | translate }}</mat-label>
<input
matInput
#searchInput
Expand All @@ -20,6 +19,7 @@
(ngModelChange)="inputChange($event)"
(keyup.enter)="searchSubmit($event)"
class="app-input-form-field-input"
[placeholder]="'SEARCH.INPUT.PLACEHOLDER' | translate"
autocomplete="off"
/>
<div matSuffix class="app-suffix-search-icon-wrapper">
Expand Down
18 changes: 17 additions & 1 deletion ...ontent/src/lib/components/search/search-input-control/search-input-control.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
font-size: 24px;
cursor: pointer;
}

.app-clear-icon {
font-size: 18px;
margin: 3px;
}
}

.app-search-container {
Expand All @@ -25,6 +30,7 @@

.app-input-form-field {
letter-spacing: -0.7px;
font-size: 16px;
width: calc(100% - 56px);

&-input {
Expand All @@ -38,12 +44,23 @@
display: none;
}
}

/* stylelint-disable selector-class-pattern */
.mat-mdc-form-field-icon-suffix {
position: relative;
right: -14px;
}
}

.mat-mdc-form-field-flex {
background: #fff;
}

.mat-mdc-text-field-wrapper {
height: 44px;
padding-left: 0;
}

.app-input-form-field-readonly {
.mat-mdc-text-field-wrapper,
.mat-mdc-form-field-flex {
Expand All @@ -57,7 +74,6 @@
&-icon {
font-size: 24px;
padding-right: 0;
margin-top: -10px;
}
}
}
4 changes: 2 additions & 2 deletions projects/aca-content/src/lib/components/search/search-input/search-input.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
<button mat-icon-button class="app-search-button" (click)="searchByOption()" [title]="'SEARCH.BUTTON.TOOLTIP' | translate">
<mat-icon [attr.aria-label]="'SEARCH.BUTTON.ARIA-LABEL' | translate">search</mat-icon>
</button>
<mat-form-field class="app-input-form-field app-input-form-field-readonly" [floatLabel]="'auto'" appearance="fill">
<mat-label>{{ 'SEARCH.INPUT.PLACEHOLDER' | translate }}</mat-label>
<mat-form-field class="app-input-form-field app-input-form-field-readonly" [floatLabel]="'auto'">
<input
matInput
[attr.aria-label]="'SEARCH.INPUT.ARIA-LABEL' | translate"
class="app-input-form-field-input"
[type]="'text'"
[readonly]="true"
[value]="searchedWord"
[placeholder]="'SEARCH.INPUT.PLACEHOLDER' | translate"
/>

<div matSuffix class="app-suffix-search-icon-wrapper app-icon-arrow">
Expand Down
7 changes: 6 additions & 1 deletion projects/aca-content/src/lib/components/search/search-input/search-input.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ $top-margin: 12px;
caret-color: var(--theme-text-color);
}
}

&:focus-within {
label {
display: none;
}
}
}

/* stylelint-disable-next-line */
Expand Down Expand Up @@ -80,7 +86,6 @@ $top-margin: 12px;
font-size: 16px;
letter-spacing: -0.7px;
margin-bottom: -8px;
margin-top: 23px;

/* stylelint-disable-next-line */
.mat-mdc-checkbox {
Expand Down
Loading