Skip to content

Focus: the focused field is hidden under the action bar #1224

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

Merged
sofyakurilova merged 1 commit into from
Apr 8, 2025
Merged

Focus: the focused field is hidden under the action bar #1224

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
52 changes: 26 additions & 26 deletions ...ges/devices/components/device-qualification-from/device-qualification-from.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,34 +150,34 @@
[format]="format"
[optionKey]="'text'"></app-dynamic-form>
</section>
<div class="device-qualification-form-actions">
<div>
<button
[disabled]="
deviceHasNoChanges(initialDevice(), createDeviceFromForm()) ||
((formIsLoaded$ | async) && !deviceQualificationForm.valid)
"
mat-flat-button
class="save-button"
(click)="onSaveClicked()">
Save
</button>
<button
mat-flat-button
[disabled]="deviceHasNoChanges(initialDevice(), createDeviceFromForm())"
type="button"
class="close-button"
(click)="onCancelClicked()">
Discard
</button>
</div>
</form>
<div class="device-qualification-form-actions">
<div>
<button
[disabled]="
deviceHasNoChanges(initialDevice(), createDeviceFromForm()) ||
((formIsLoaded$ | async) && !deviceQualificationForm.valid)
"
mat-flat-button
class="save-button"
(click)="onSaveClicked()">
Save
</button>
<button
mat-flat-button
[disabled]="initialDevice() === null"
[disabled]="deviceHasNoChanges(initialDevice(), createDeviceFromForm())"
type="button"
class="delete-button"
(click)="onDeleteClick()">
Delete
class="close-button"
(click)="onCancelClicked()">
Discard
</button>
</div>
</form>
<button
mat-flat-button
[disabled]="initialDevice() === null"
type="button"
class="delete-button"
(click)="onDeleteClick()">
Delete
</button>
</div>
5 changes: 3 additions & 2 deletions ...ges/devices/components/device-qualification-from/device-qualification-from.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@ $form-min-width: 285px;
box-shadow:
0px 4px 8px 3px rgba(60, 64, 67, 0.15),
0px 1px 3px 0px rgba(60, 64, 67, 0.3);
box-sizing: border-box;
}

.device-qualification-form {
overflow: scroll;
overflow-y: scroll;
}

::ng-deep .device-form-test-modules {
Expand Down Expand Up @@ -87,7 +88,7 @@ $form-min-width: 285px;
.device-qualification-form-page {
display: grid;
align-content: start;
padding: 24px 60px;
padding: 24px 60px 0 60px;
}

.device-qualification-form-journey {
Expand Down
4 changes: 2 additions & 2 deletions modules/ui/src/app/pages/risk-assessment/profile-form/profile-form.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
}

.profile-form {
overflow: scroll;
overflow-y: scroll;

.name-field-label {
margin: 0;
Expand All @@ -34,7 +34,7 @@
display: flex;
flex-direction: column;
align-items: flex-start;
padding: 16px 32px 32px;
padding: 16px 32px 11px 32px;
}

.profile-form-field {
Expand Down
5 changes: 2 additions & 3 deletions modules/ui/src/theming/mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,8 @@
}

@mixin form-actions {
position: sticky;
left: 32px;
bottom: 25px;
margin-left: 32px;
margin-bottom: 25px;
display: flex;
flex-wrap: wrap;
align-items: center;
Expand Down