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-6078] Fixed layout for create from template component #3467

Merged
merged 7 commits into from
Oct 12, 2023
Merged

[ACS-6078] Fixed layout for create from template component #3467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
26ae1bd
ACS-6078 Fixed layout for create from template component
AleksanderSklorz Oct 6, 2023
7788b52
ACS-6078 Added selector
AleksanderSklorz Oct 6, 2023
07aef99
ACS-6078 Custom class instead of mat class
AleksanderSklorz Oct 9, 2023
2a5f05e
ACS-6078 Used component selector
AleksanderSklorz Oct 9, 2023
5b7e94f
ACS-6078 Removed unused styles
AleksanderSklorz Oct 9, 2023
0564f77
ACS-6078 Fixed e2e
AleksanderSklorz Oct 9, 2023
c0c58b2
ACS-6078 Empty commit
AleksanderSklorz Oct 11, 2023
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
6 changes: 3 additions & 3 deletions projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<h2 mat-dialog-title [innerHTML]="title"></h2>
<div mat-dialog-content>
<form [formGroup]="form" novalidate>
<mat-form-field class="adf-full-width">
<mat-form-field class="app-create-from-template-field">
<input
cdkFocusInitial
placeholder="{{ 'NODE_FROM_TEMPLATE.FORM.PLACEHOLDER.NAME' | translate }}"
Expand All @@ -15,7 +15,7 @@ <h2 mat-dialog-title [innerHTML]="title"></h2>
</mat-error>
</mat-form-field>

<mat-form-field class="adf-full-width">
<mat-form-field class="app-create-from-template-field">
<input
placeholder="{{ 'NODE_FROM_TEMPLATE.FORM.PLACEHOLDER.TITLE' | translate }}"
matInput
Expand All @@ -27,7 +27,7 @@ <h2 mat-dialog-title [innerHTML]="title"></h2>
</mat-error>
</mat-form-field>

<mat-form-field class="adf-full-width">
<mat-form-field class="app-create-from-template-field">
<textarea
matInput
placeholder="{{ 'NODE_FROM_TEMPLATE.FORM.PLACEHOLDER.DESCRIPTION' | translate }}"
Expand Down
20 changes: 10 additions & 10 deletions projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
.aca-create-from-template-dialog {
ng-component {
overflow: visible;
}
app-create-from-template-dialog {
overflow: visible;
display: block;
margin-left: -24px;
margin-right: -24px;

.mat-dialog-title {
margin-left: 24px;
Expand All @@ -21,13 +22,12 @@
}
}

.mat-form-field {
margin-bottom: 20px;
}
.app-create-from-template-field {
width: 100%;

nikita-web-ua marked this conversation as resolved.
Show resolved Hide resolved
.mat-dialog-container {
padding-left: 0;
padding-right: 0;
&:not(:last-of-type) {
margin-bottom: 20px;
}
}

.mat-dialog-content {
Expand Down
1 change: 1 addition & 0 deletions projects/aca-content/src/lib/dialogs/node-template/create-from-template.dialog.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import { MatButtonModule } from '@angular/material/button';
imports: [CommonModule, TranslateModule, MatDialogModule, ReactiveFormsModule, MatFormFieldModule, MatInputModule, MatButtonModule],
templateUrl: './create-from-template.dialog.html',
styleUrls: ['./create-from-template.dialog.scss'],
selector: 'app-create-from-template-dialog',
swapnil-verma-gl marked this conversation as resolved.
Show resolved Hide resolved
encapsulation: ViewEncapsulation.None
})
export class CreateFromTemplateDialogComponent implements OnInit {
Expand Down
2 changes: 1 addition & 1 deletion ...right-shared/src/page-objects/components/dialogs/create-from-template-dialog-component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { BaseComponent } from '../base.component';
import { timeouts } from '../../../utils';

export class CreateFromTemplateDialogComponent extends BaseComponent {
private static rootElement = 'ng-component';
private static rootElement = 'app-create-from-template-dialog';

constructor(page: Page) {
super(page, CreateFromTemplateDialogComponent.rootElement);
Expand Down
Loading