Skip to content

Commit edc276f

Browse files
committed
Modals: fix buttons in modals;
Tooltips: fix titles; Cards: fix buttons.
1 parent 050189c commit edc276f

File tree

14 files changed

+23
-59
lines changed

14 files changed

+23
-59
lines changed

src/app/modules/templates/ui-elements/components/cards-page/cards-page.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ div + mat-card {
113113
}
114114

115115
button + button {
116-
margin-left: 8px;
116+
margin-left: 16px;
117117

118118
@media (min-width: $small) and (max-width: ($normal - 1px)) {
119119
margin-left: 0;

src/app/modules/templates/ui-elements/components/icons-page/icons-page.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
padding: 0 16px;
4646

4747
&__icon-wrapper {
48-
width: 158px;
48+
width: 170px;
4949
padding: 8px;
5050
color: $grey;
5151
display: flex;

src/app/modules/templates/ui-elements/components/tooltips-page/tooltips-page.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575

7676
mat-card-content.content {
7777
display: flex;
78-
justify-content: space-between;
78+
justify-content: start;
7979

8080
@media (max-width: $medium) {
8181
flex-wrap: wrap;

src/app/modules/templates/ui-elements/containers/notification-page/notification-page.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<mat-card class="page-content__first-item-wrapper">
55
<div class="page-content__first-item-element">
66
<mat-card-title>
7-
<h5>Layout Options</h5>
7+
<p>Layout Options</p>
88
</mat-card-title>
99
<mat-card-subtitle>
1010
<p>There are few position options available for notifications. You can click any of them to change notifications position:</p>
@@ -51,7 +51,7 @@ <h5>Layout Options</h5>
5151
</div>
5252
<div class="page-content__first-item-element">
5353
<mat-card-title>
54-
<h5>Notifications Types</h5>
54+
<p>Notifications Types</p>
5555
</mat-card-title>
5656
<mat-card-subtitle>
5757
<p>Different types of notifications for lost of use cases. Custom classes are also supported.</p>
@@ -78,7 +78,7 @@ <h5>Notifications Types</h5>
7878
</div>
7979
<div class="page-content__first-item-element">
8080
<mat-card-title>
81-
<h5>Usage</h5>
81+
<p>Usage</p>
8282
</mat-card-title>
8383
<mat-card-subtitle>
8484
<p>Notifications are created with the help of <a class="link" [href]="toastrLink">ngx-toastr</a></p>

src/app/modules/templates/ui-elements/popups/form/form.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ <h3 class="title">Subscribe</h3>
99
</mat-form-field>
1010

1111
<div class="button-wrapper">
12-
<button class="button" mat-flat-button (click)="close()" tabindex="-1">cancel</button>
13-
<button class="button" mat-flat-button tabindex="-1" [mat-dialog-close]="data.email">subscribe</button>
12+
<button class="button" mat-stroked-button color="primary" (click)="close()" tabindex="-1">CANCEL</button>
13+
<button class="button" mat-raised-button color="primary" tabindex="-1" [mat-dialog-close]="data.email">SUBSCRIBE</button>
1414
</div>

src/app/modules/templates/ui-elements/popups/form/form.component.scss

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,6 @@
2020
justify-content: flex-end;
2121
}
2222

23-
.button {
24-
color: $blue;
25-
background-color: transparent;
26-
box-shadow: none;
27-
28-
&:hover {
29-
background-color: $white-gray;
30-
}
31-
32-
& + .button {
23+
.button + .button {
3324
margin-left: 8px;
34-
}
3525
}

src/app/modules/templates/ui-elements/popups/grid/grid.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ <h3 class="title">Grid system</h3>
5151
</div>
5252

5353
<div class="button-wrapper">
54-
<button class="button" mat-flat-button (click)="close()" tabindex="-1">cancel</button>
55-
<button class="button" mat-flat-button (click)="close()" tabindex="-1">ok</button>
54+
<button class="button" mat-stroked-button color="primary" (click)="close()" tabindex="-1">CANCEL</button>
55+
<button class="button" mat-raised-button color="primary" (click)="close()" tabindex="-1">OK</button>
5656
</div>

src/app/modules/templates/ui-elements/popups/grid/grid.component.scss

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,8 @@
1212
justify-content: flex-end;
1313
}
1414

15-
.button {
16-
color: $blue;
17-
background-color: transparent;
18-
box-shadow: none;
19-
20-
&:hover {
21-
background-color: $white-gray;
22-
}
23-
24-
& + .button {
15+
.button + .button {
2516
margin-left: 8px;
26-
}
2717
}
2818

2919
@mixin grid-item-2 {

src/app/modules/templates/ui-elements/popups/location/location.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ <h3 class="title">Use Google's location service?</h3>
66
</p>
77

88
<div class="button-wrapper">
9-
<button class="button" mat-flat-button (click)="close()" tabindex="-1">disagree</button>
10-
<button class="button" mat-flat-button (click)="close()" tabindex="-1">agree</button>
9+
<button class="button" mat-stroked-button color="primary" (click)="close()" tabindex="-1">DISAGREE</button>
10+
<button class="button" mat-raised-button color="primary" (click)="close()" tabindex="-1">AGREE</button>
1111
</div>

src/app/modules/templates/ui-elements/popups/location/location.component.scss

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,6 @@
1616
justify-content: flex-end;
1717
}
1818

19-
.button {
20-
color: $blue;
21-
background-color: transparent;
22-
box-shadow: none;
23-
24-
&:hover {
25-
background-color: $white-gray;
26-
}
27-
28-
& + .button {
19+
.button + .button {
2920
margin-left: 8px;
3021
}
31-
}

0 commit comments

Comments
 (0)