Skip to content

Fix paddings; change label to placeholder #1226

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 2 commits into from
Apr 8, 2025
Merged

Fix paddings; change label to placeholder #1226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9b3eba
Fix paddings; change label to placeholder
sofyakurilova Apr 8, 2025
f918d7b
Merge branch 'feature/ui/material3_theme' into bug/ui/setting_paddings
sofyakurilova Apr 8, 2025
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 .../app/pages/general-settings/components/settings-dropdown/settings-dropdown.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
</div>

<mat-form-field appearance="outline" class="setting-field">
<mat-label>{{ label }}</mat-label>
<mat-select
aria-labelledby="{{ key }}-group-label"
id="{{ key }}-group"
ngDefaultControl
class="setting-radio-group"
[placeholder]="label"
[compareWith]="compare"
[formControlName]="controlName">
<mat-select-trigger>
Expand Down
3 changes: 2 additions & 1 deletion .../app/pages/general-settings/components/settings-dropdown/settings-dropdown.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,11 @@
font-family: variables.$font-text;
}

.info-column {
::ng-deep .info-column {
display: flex;
flex-direction: column;
gap: 6px;
width: 260px;
padding: 0 12px;
justify-content: center;
}
1 change: 1 addition & 0 deletions modules/ui/src/app/pages/general-settings/general-settings.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
data: 'analytics',
}
"></ng-container>
<mat-divider></mat-divider>
</section>
<mat-error
*ngIf="vm.isSubmitting && isFormError"
Expand Down
16 changes: 5 additions & 11 deletions modules/ui/src/app/pages/general-settings/general-settings.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@
display: flex;
flex-direction: column;
flex: 1 0 auto;
padding: 6px 22px;
padding-top: 4px;
}

.setting-drawer-content {
overflow-y: scroll;
height: max-content;
padding: 10px;
padding: 8px 32px;

.setting-drawer-content-form-empty {
grid-template-rows: repeat(2, auto) 1fr;
Expand All @@ -54,7 +54,7 @@
}

.setting-drawer-footer {
padding: 0 8px;
padding: 16px 40px;
margin-top: auto;
display: flex;
flex-shrink: 0;
Expand All @@ -80,6 +80,7 @@
}

.section-item {
height: 88px;
display: grid;
grid-template-columns: 1fr 1fr 1.1fr;
gap: 46px;
Expand All @@ -88,6 +89,7 @@
p {
margin: 0;
}

.label-column {
display: flex;
flex-direction: column;
Expand All @@ -97,14 +99,6 @@
font-family: variables.$font-text;
}

.info-column {
display: flex;
flex-direction: column;
gap: 6px;
width: 260px;
padding: 0 12px;
}

.data-column {
display: flex;
}
Expand Down
Loading