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-7330] NG15 Edit rules dialog fixes #3723

Merged
merged 1 commit into from
Mar 25, 2024
Merged

[ACS-7330] NG15 Edit rules dialog fixes #3723

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
2 changes: 1 addition & 1 deletion projects/aca-content/folder-rules/src/manage-rules/manage-rules.smart-component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
z-index: 1;
display: flex;
flex-direction: row;
align-items: flex-start;
align-items: center;
overflow-x: auto;
justify-content: space-between;
padding: 12px 20px;
Expand Down
2 changes: 1 addition & 1 deletion ...ects/aca-content/folder-rules/src/rule-details/actions/rule-action-list.ui-component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</mat-menu>
</div>

<button mat-button data-automation-id="rule-action-list-add-action-button" (click)="addAction()" *ngIf="!readOnly">
<button mat-flat-button data-automation-id="rule-action-list-add-action-button" (click)="addAction()" *ngIf="!readOnly">
<mat-icon>add</mat-icon>
<span>{{ 'ACA_FOLDER_RULES.RULE_DETAILS.ACTION_BUTTONS.ADD_ACTION' | translate }}</span>
</button>
15 changes: 12 additions & 3 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 @@ -4,13 +4,22 @@
flex-direction: row;
gap: 20px;

adf-card-view .adf-property-list .adf-property adf-card-view-item-dispatcher adf-card-view-textitem {
display: inline-block;
width: 300px;
adf-card-view {
margin-top: -15px;

.adf-property-list .adf-property adf-card-view-item-dispatcher adf-card-view-textitem {
display: inline-block;
width: 300px;

.adf-textitem-clickable {
padding-top: 0;
}
}
}
}

&-full-width {
height: fit-content;
flex: 1;
}
}
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 @@ -56,11 +56,11 @@
</div>

<div class="aca-rule-composite-condition__form__actions" *ngIf="!readOnly" data-automation-id="add-actions">
<button mat-button (click)="addSimpleCondition()" data-automation-id="add-condition-button">
<button mat-flat-button (click)="addSimpleCondition()" data-automation-id="add-condition-button">
<mat-icon>add</mat-icon>
<span>{{ 'ACA_FOLDER_RULES.RULE_DETAILS.CONDITION_BUTTONS.ADD_CONDITION' | translate }}</span>
</button>
<button mat-button (click)="addCompositeCondition()" data-automation-id="add-group-button">
<button mat-flat-button (click)="addCompositeCondition()" data-automation-id="add-group-button">
<mat-icon>add</mat-icon>
<span>{{ 'ACA_FOLDER_RULES.RULE_DETAILS.CONDITION_BUTTONS.ADD_GROUP' | translate }}</span>
</button>
Expand Down
3 changes: 2 additions & 1 deletion ...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 @@ -26,7 +26,8 @@
gap: 8px;

& > :nth-child(1) {
width: 5em;
width: 7em;
height: fit-content;
font-size: inherit;
}

Expand Down
9 changes: 2 additions & 7 deletions projects/aca-content/folder-rules/src/rule-details/edit-rule-dialog.ui-component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,9 @@
}

.aca-edit-rule-dialog {
margin: -24px;

&__header {
display: flex;
align-items: center;
margin: -43px -24px 0;
padding: var(--edit-rule-dialog-padding);
box-sizing: border-box;
border-bottom: 1px solid var(--theme-border-color);
Expand All @@ -26,20 +23,18 @@
}
}

&__content {
margin: 0 -24px;
.aca-edit-rule-dialog__content {
color: inherit;
padding: 0;

&__spinner {
display: flex;
align-items: center;
justify-content: center;
margin: 20px 0;
}
}

&__footer {
margin: 0 -24px -43px;
padding: var(--edit-rule-dialog-padding);
box-sizing: border-box;
border-top: 1px solid var(--theme-border-color);
Expand Down
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
@@ -1,7 +1,7 @@
<form class="aca-rule-details__form" [ngClass]="{ 'aca-read-only': readOnly }" [formGroup]="form">

<ng-container *ngIf="!preview">
<div class="aca-rule-details__form__row aca-rule-details__form__name">
<div class="aca-rule-details__form__row">
<label for="rule-details-name-input">{{ 'ACA_FOLDER_RULES.RULE_DETAILS.LABEL.NAME' | translate }}</label>
<div>
<mat-form-field floatLabel='auto' class="aca-rule-details__form__row__field">
Expand Down
6 changes: 0 additions & 6 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,11 +6,6 @@
padding: 8px 20px;
width: 100%;
box-sizing: border-box;
overflow-x: auto;

&.aca-rule-details__form__name {
padding-bottom: 0;
}

&.aca-rule-details__form__description {
padding-top: 0;
Expand Down Expand Up @@ -40,7 +35,6 @@
&__field {
width: 100%;
max-width: 400px;
margin-top: -11px;
font-size: inherit;

&__textarea {
Expand Down