Skip to content

Commit a8449d9

Browse files
xflordHejdaJakub
authored andcommitted
fix: minor visual bug fixes after angular 15 migration
* added user style to defaultConfig.json in apps it was missing, since it now won't load without it * fixed mailing lists checkbox misalignment * added the visibility icon to the form field in settings-samba-password.component * fixed a bug that made password form jump when spinner was visible (global spinner margin was removed, it was added just for a slight visual change, I believe we can do without it)
1 parent 7b0d55d commit a8449d9

File tree

10 files changed

+34
-37
lines changed

10 files changed

+34
-37
lines changed

apps/admin-gui/src/_styles.scss

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1682,11 +1682,6 @@ table .mdc-text-field--outlined {
16821682
flex-wrap: wrap;
16831683
}
16841684

1685-
// extra spinner padding in dialog
1686-
.mat-mdc-dialog-container .mat-mdc-progress-spinner {
1687-
margin: 24px;
1688-
}
1689-
16901685
.mat-mdc-checkbox label,
16911686
.mat-mdc-radio-button label,
16921687
.mat-mdc-slide-toggle label {

apps/consolidator/src/assets/config/defaultConfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
"footer_bg_color": "#263238",
8181
"footer_headers_text_color": "#ffffff",
8282
"footer_links_text_color": "#e0e0e0",
83-
"footer_copyright_text_color": "#9e9e9e"
83+
"footer_copyright_text_color": "#9e9e9e",
84+
"user_color": "#00796b"
8485
}
8586
}

apps/linker/src/assets/config/defaultConfig.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
"mfa": {
1616
"url_en": "https://mfa.id.muni.cz/"
1717
},
18+
"theme": {
19+
"user_color": "#00796b"
20+
},
1821
"application": "Linker",
1922
"document_title": "Linker",
2023
"support_mail": "[email protected]",

apps/password-reset/src/_styles.scss

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,16 @@ $password-reset-theme: mat.define-light-theme(
7878
$user-primary: mat.define-palette($user-dynamic-colors, 500);
7979
$user-accent: mat.define-palette(mat.$green-palette, 600);
8080

81-
$user-theme: mat.define-light-theme($user-primary, $user-accent);
81+
$user-theme: mat.define-light-theme(
82+
(
83+
color: (
84+
primary: $user-primary,
85+
accent: $user-accent,
86+
),
87+
)
88+
);
8289

83-
@include mat.all-component-themes($user-theme);
90+
@include mat.all-component-colors($user-theme);
8491
}
8592

8693
.mat-mdc-unelevated-button {

apps/password-reset/src/assets/config/defaultConfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@
100100
"footer_bg_color": "#263238",
101101
"footer_headers_text_color": "#ffffff",
102102
"footer_links_text_color": "#e0e0e0",
103-
"footer_copyright_text_color": "#9e9e9e"
103+
"footer_copyright_text_color": "#9e9e9e",
104+
"user_color": "#00796b"
104105
},
105106
"password_help": {
106107
"default": "Password must be at least 8 characters long. Please <b>avoid using accented characters</b>. It might not be supported by all backend components and services.",

apps/publications/src/_styles.scss

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -436,11 +436,6 @@ mat-form-field mat-icon {
436436
letter-spacing: normal;
437437
}
438438

439-
// extra spinner padding in dialog
440-
.mat-mdc-dialog-container .mat-mdc-progress-spinner {
441-
margin: 24px;
442-
}
443-
444439
.mat-mdc-checkbox label,
445440
.mat-mdc-radio-button label,
446441
.mat-mdc-slide-toggle label {

apps/user-profile/src/_styles.scss

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -325,11 +325,6 @@ mat-list-item .mat-mdc-form-field-subscript-wrapper {
325325
flex-wrap: wrap;
326326
}
327327

328-
// extra spinner padding in dialog
329-
.mat-mdc-dialog-container .mat-mdc-progress-spinner {
330-
margin: 24px;
331-
}
332-
333328
.mat-mdc-checkbox label,
334329
.mat-mdc-radio-button label,
335330
.mat-mdc-slide-toggle label {

apps/user-profile/src/app/pages/settings-page/settings-samba-password/settings-samba-password.component.html

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,20 @@ <h1 class="page-title">{{'SAMBA_PASSWORD.TITLE' | customTranslate | translate}}<
99
<mat-form-field class="input-width">
1010
<mat-label>{{'SAMBA_PASSWORD.INPUT_PLACEHOLDER'|customTranslate | translate}}</mat-label>
1111
<input [formControl]="sambaControl" [type]="showPassword ? 'text': 'password'" matInput />
12+
<mat-icon matIconSuffix (click)="showPassword = !showPassword">
13+
{{showPassword ? "visibility_off": "visibility"}}
14+
</mat-icon>
1215
</mat-form-field>
13-
<button
14-
(click)="showPassword = !showPassword"
15-
[matTooltip]="showPassword ? hidePwdTooltip : showPwdTooltip"
16-
disableRipple
17-
mat-icon-button>
18-
<mat-icon>{{showPassword ? 'visibility_off' : 'visibility'}}</mat-icon>
19-
</button>
20-
<button
21-
(click)="setSambaPassword()"
22-
[disabled]="sambaControl.value.length === 0 || sambaControl.invalid"
23-
color="accent"
24-
mat-flat-button>
25-
{{'SAMBA_PASSWORD.SET_PASSWORD'|customTranslate | translate}}
26-
</button>
16+
17+
<div>
18+
<button
19+
(click)="setSambaPassword()"
20+
[disabled]="sambaControl.value.length === 0 || sambaControl.invalid"
21+
color="accent"
22+
mat-flat-button>
23+
{{'SAMBA_PASSWORD.SET_PASSWORD'|customTranslate | translate}}
24+
</button>
25+
</div>
2726

2827
<perun-web-apps-alert
2928
*ngIf="sambaControl.invalid"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.input-width {
2+
min-width: 500px;
3+
}

libs/perun/components/src/lib/settings-mailing-lists/mailing-lists.component.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,10 @@ <h1 class="page-title">
3535
</mat-expansion-panel-header>
3636
<div class="row">
3737
<mat-checkbox
38-
class="ms-3 me-2"
3938
[checked]="optOutAttribute && optOutAttribute.value !== null"
40-
(change)="setOptOut()"></mat-checkbox>
41-
<p>
39+
(change)="setOptOut()">
4240
{{'SHARED_LIB.PERUN.COMPONENTS.OPT_OUT_MAILING_LISTS.OPT_OUT_LABEL' | customTranslate | translate}}
43-
</p>
41+
</mat-checkbox>
4442
</div>
4543
</mat-expansion-panel>
4644
</mat-accordion>

0 commit comments

Comments
 (0)