Skip to content

Commit 58998a1

Browse files
mattjokexflord
authored andcommitted
feat: rounded design for components
* added rounded design for buttons, dialogs, tables... * updated _styles.scss, to include the changes
1 parent 5e55ea1 commit 58998a1

File tree

16 files changed

+54
-32
lines changed

16 files changed

+54
-32
lines changed

apps/admin-gui/src/_styles.scss

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ body {
556556
}
557557

558558
button {
559-
border-radius: 0 !important;
559+
border-radius: var(--bs-border-radius) !important;
560560
}
561561

562562
button:focus {
@@ -1325,19 +1325,15 @@ textarea.cdk-textarea-autosize-measuring {
13251325

13261326
// sharp design
13271327
.mat-mdc-outlined-button {
1328-
border-radius: 0 !important;
1328+
border-radius: var(--bs-border-radius) !important;
13291329
}
13301330

13311331
.mat-mdc-unelevated-button {
1332-
border-radius: 0 !important;
1332+
border-radius: var(--bs-border-radius) !important;
13331333
}
13341334

13351335
.mat-mdc-button {
1336-
border-radius: 0 !important;
1337-
}
1338-
1339-
.card {
1340-
border-radius: 0 !important;
1336+
border-radius: var(--bs-border-radius) !important;
13411337
}
13421338

13431339
//colors for material icons
@@ -1597,6 +1593,7 @@ td.mat-mdc-cell {
15971593
font-size: 16px !important;
15981594
color: black !important;
15991595
opacity: 1 !important;
1596+
border-radius: var(--bs-border-radius) !important;
16001597
}
16011598

16021599
.mdc-tab__icon {
@@ -1687,7 +1684,7 @@ table .mdc-text-field--outlined {
16871684
// angular 15 button fixes
16881685

16891686
.mdc-button {
1690-
border-radius: 0 !important;
1687+
border-radius: var(--bs-border-radius) !important;
16911688
white-space: nowrap !important;
16921689
letter-spacing: normal;
16931690
}
@@ -1706,12 +1703,13 @@ table .mdc-text-field--outlined {
17061703

17071704
.mat-mdc-tab-header {
17081705
border-bottom: 1px solid rgba(0, 0, 0, 0.12) !important;
1706+
border-radius: var(--bs-border-radius) var(--bs-border-radius) 0 0 !important;
17091707
}
17101708

17111709
.mat-mdc-tab.mdc-tab--active {
17121710
background-color: #e8e4e4;
1711+
border-radius: var(--bs-border-radius) var(--bs-border-radius) 0 0 !important;
17131712
}
1714-
17151713
.mdc-data-table__cell {
17161714
border-bottom: 1px solid rgba(0, 0, 0, 0.12) !important;
17171715
}
@@ -1727,3 +1725,7 @@ table .mdc-text-field--outlined {
17271725
.mb-25 {
17281726
margin-bottom: 0.75rem;
17291727
}
1728+
1729+
.card {
1730+
border-radius: var(--bs-border-radius) !important;
1731+
}

apps/admin-gui/src/app/users/pages/user-detail-page/user-dashboard/dashboard-recently-viewed-button-field/dashboard-recently-viewed-button-field.component.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@
1919

2020
.item-itself-container {
2121
margin: 8px;
22+
transition: 250ms;
23+
24+
&:hover {
25+
box-shadow: 0 0 25px 5px rgba(0, 0, 0, 0.33);
26+
transform: scale(1.02);
27+
border-radius: var(--bs-border-radius);
28+
}
2229
}
2330

2431
.item-itself {
@@ -33,6 +40,7 @@
3340
overflow-wrap: break-word;
3441
word-break: break-word;
3542
text-decoration: none;
43+
border-radius: var(--bs-border-radius);
3644

3745
& img {
3846
height: 120px;

apps/admin-gui/src/app/users/pages/user-detail-page/user-overview/user-overview.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div *ngIf="inMyProfile" class="align-cards">
2-
<mat-card appearance="outlined" class="mat-elevation-z3">
2+
<mat-card appearance="outlined" class="card mat-elevation-z3">
33
<mat-card-header>
44
<mat-card-title>
55
<h1 class="page-subtitle">{{'USER_DETAIL.OVERVIEW.GENERAL_SETTINGS' | translate}}</h1>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.align-cards {
2-
margin: 1rem 1rem 1rem 1rem;
2+
margin: 1rem 0;
33
display: inline-block;
44
vertical-align: top;
55
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
.cursor-pointer {
22
cursor: pointer;
33
}
4+
5+
table {
6+
border-radius: 30px;
7+
}

apps/consolidator/src/_styles.scss

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ $perun-theme: mat.define-light-theme(
111111
}
112112

113113
button {
114-
border-radius: 0 !important;
114+
border-radius: var(--bs-border-radius) !important;
115115
}
116116

117117
button:focus {
@@ -244,6 +244,12 @@ button:focus {
244244

245245
.noBorderDialog .mat-mdc-dialog-container {
246246
background-color: black;
247+
border-radius: var(--bs-border-radius);
248+
}
249+
250+
.noBorderDialog .mat-mdc-dialog-container .mdc-dialog__surface {
251+
background-color: black !important;
252+
border-radius: var(--bs-border-radius);
247253
}
248254

249255
mat-mdc-chip-grid {
@@ -257,7 +263,7 @@ mat-icon {
257263
// angular 15 button fixes
258264

259265
.mdc-button {
260-
border-radius: 0 !important;
266+
border-radius: var(--bs-border-radius) !important;
261267
white-space: nowrap !important;
262268
letter-spacing: normal;
263269
}

apps/linker/src/_styles.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ $perun-theme: mat.define-light-theme(
209209
}
210210

211211
button {
212-
border-radius: 0 !important;
212+
border-radius: var(--bs-border-radius) !important;
213213
}
214214

215215
button:focus {
@@ -228,7 +228,7 @@ mat-icon {
228228
// angular 15 button fixes
229229

230230
.mdc-button {
231-
border-radius: 0 !important;
231+
border-radius: var(--bs-border-radius) !important;
232232
white-space: nowrap !important;
233233
letter-spacing: normal;
234234
}

apps/password-reset/src/_styles.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ $password-reset-theme: mat.define-light-theme(
9191
}
9292

9393
.mat-mdc-unelevated-button {
94-
border-radius: 0 !important;
94+
border-radius: var(--bs-border-radius) !important;
9595
}
9696

9797
.dialog-container {
@@ -152,7 +152,7 @@ mat-form-field mat-icon {
152152
// angular 15 button fixes
153153

154154
.mdc-button {
155-
border-radius: 0 !important;
155+
border-radius: var(--bs-border-radius) !important;
156156
white-space: nowrap !important;
157157
letter-spacing: normal;
158158
}

apps/publications/src/_styles.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ $perun-theme: mat.define-light-theme(
111111
}
112112

113113
button {
114-
border-radius: 0 !important;
114+
border-radius: var(--bs-border-radius) !important;
115115
}
116116

117117
button:focus {
@@ -415,7 +415,7 @@ mat-form-field mat-icon {
415415
// angular 15 button fixes
416416

417417
.mdc-button {
418-
border-radius: 0 !important;
418+
border-radius: var(--bs-border-radius) !important;
419419
white-space: nowrap !important;
420420
letter-spacing: normal;
421421
}

apps/user-profile/src/_styles.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ $perun-theme: mat.define-light-theme(
113113
}
114114

115115
button {
116-
border-radius: 0 !important;
116+
border-radius: var(--bs-border-radius) !important;
117117
}
118118

119119
button:focus {
@@ -167,6 +167,7 @@ td.mat-mdc-cell {
167167
display: flex;
168168
align-items: center;
169169
justify-content: center;
170+
border-radius: var(--bs-card-border-radius) !important;
170171
}
171172

172173
#preloader {
@@ -298,7 +299,7 @@ mat-list-item .mat-mdc-form-field-subscript-wrapper {
298299
// angular 15 button fixes
299300

300301
.mdc-button {
301-
border-radius: 0 !important;
302+
border-radius: var(--bs-border-radius) !important;
302303
white-space: nowrap !important;
303304
letter-spacing: normal;
304305
}

libs/lib-linker/src/lib/consolidation-result/consolidation-result.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="p-4 m-3" [ngStyle]="{'background-color': color }">
1+
<div class="p-4 m-3 card" [ngStyle]="{'background-color': color }">
22
<div class="d-flex pb-5 flex-row">
33
<div>
44
<mat-icon *ngIf="result !== 'OK'" class="mat-icon-war me-4"> {{icon}} </mat-icon>

libs/perun/components/src/lib/groups-list/groups-list.component.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
.card {
2-
border-radius: 0 !important;
3-
}
4-
51
.static-column-size {
62
width: 80px;
73
}

libs/perun/components/src/lib/menu-buttons-field/menu-buttons-field.component.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@
1818

1919
.item-itself-container {
2020
margin: 8px;
21+
transition: 250ms;
22+
23+
&:hover {
24+
box-shadow: 0 0 25px 5px rgba(0, 0, 0, 0.33);
25+
transform: scale(1.02);
26+
border-radius: var(--bs-border-radius);
27+
}
2128
}
2229

2330
.item-itself {
@@ -30,6 +37,7 @@
3037
align-items: center;
3138
font-size: 1.25rem;
3239
text-decoration: none;
40+
border-radius: var(--bs-border-radius);
3341

3442
& img {
3543
height: 120px;

libs/perun/components/src/lib/notification/notification.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div
2-
class="notification {{inDialog ? '' : 'mat-elevation-z7'}}"
2+
class="card notification {{inDialog ? '' : 'mat-elevation-z7'}}"
33
[class.error]="data.type === 'error'"
44
[class.success]="data.type === 'success'">
55
<div class="notification-container" (click)="!alreadyClosed && !waiting ? closeSelf(): ''">

libs/perun/components/src/lib/vos-list/vos-list.component.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
.card {
2-
border-radius: 0 !important;
3-
}
4-
51
.static-column-size {
62
width: 80px;
73
}

libs/ui/alerts/src/lib/alert/alert.component.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
padding: 0.75rem 1.25rem;
44
margin-top: 1rem;
55
margin-bottom: 1rem;
6+
border-radius: 10px;
67
}
78

89
.perun-alert.info-alert {

0 commit comments

Comments
 (0)