Skip to content

Commit a33a319

Browse files
author
Vitor Durante
committed
Fix theme color issues
1 parent d3f4b8d commit a33a319

File tree

2 files changed

+53
-23
lines changed

2 files changed

+53
-23
lines changed

angular/src/app/roles/roles.component.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ export class RolesComponent extends PagedListingComponentBase<RoleDto> {
3434
pageNumber: number,
3535
finishedCallback: Function
3636
): void {
37-
//abp.ui.setBusy($("#roles-table"));
38-
3937
this._rolesService
4038
.getAll(request.skipCount, request.maxResultCount)
4139
.pipe(
@@ -46,8 +44,6 @@ export class RolesComponent extends PagedListingComponentBase<RoleDto> {
4644
.subscribe((result: PagedResultDtoOfRoleDto) => {
4745
this.roles = result.items;
4846
this.showPaging(result, pageNumber);
49-
50-
//abp.ui.clearBusy($("#roles-table"));
5147
});
5248
}
5349

angular/src/shared/core.less

Lines changed: 53 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
@grey: #9E9E9E;
2020
@blue-grey: #607D8B;
2121
@black: #000;
22-
2322
.make-theme(@color) {
2423
.sidebar .menu .list .ml-menu li.active a.toggled:not(.menu-toggle):before {
2524
color: @color;
@@ -30,7 +29,9 @@
3029
.mat-slide-toggle.mat-checked:not(.mat-disabled) .mat-slide-toggle-bar {
3130
background-color: fade(@color, 50%);
3231
}
33-
.mat-fab.mat-primary, .mat-mini-fab.mat-primary, .mat-raised-button.mat-primary {
32+
.mat-fab.mat-primary,
33+
.mat-mini-fab.mat-primary,
34+
.mat-raised-button.mat-primary {
3435
background-color: @color;
3536
}
3637
.mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle {
@@ -39,114 +40,147 @@
3940
.mat-radio-button.mat-accent .mat-radio-inner-circle {
4041
background-color: @color;
4142
}
42-
.mat-checkbox-checked.mat-accent .mat-checkbox-background, .mat-checkbox-indeterminate.mat-accent .mat-checkbox-background {
43+
.mat-checkbox-checked.mat-accent:not(.mat-checkbox-disabled) .mat-checkbox-background,
44+
.mat-checkbox-indeterminate.mat-accent:not(.mat-checkbox-disabled) .mat-checkbox-background {
4345
background-color: @color;
4446
}
4547
.card .action .material-icons {
46-
color: @color !important;
48+
color: @color !important;
4749
}
4850
/* add theme-links to a parent element to indicate that all children anchors should use the current theme's color */
4951
.theme-links a {
50-
color: @color !important;
52+
color: @color !important;
5153
}
5254
.theme-active-link {
5355
.active a {
54-
color: @color !important;
56+
color: @color !important;
5557
}
5658
a:hover {
57-
color: @color !important;
59+
color: @color !important;
5860
}
5961
a:focus {
60-
color: @color !important;
62+
color: @color !important;
6163
}
6264
}
6365
.ngx-pagination .current {
6466
background-color: @color;
6567
}
66-
.btn-primary, .btn-primary:hover, .btn-primary:active, .btn-primary:focus {
67-
background-color: @color !important;
68-
}
69-
a.dropdown-toggle {
70-
color: @color !important;
71-
}
72-
.mat-tab-group.mat-primary .mat-ink-bar, .mat-tab-nav-bar.mat-primary .mat-ink-bar {
68+
.btn-primary,
69+
.btn-primary:hover,
70+
.btn-primary:active,
71+
.btn-primary:focus {
72+
background-color: @color !important;
73+
}
74+
// a.dropdown-toggle {
75+
// color: @color !important;
76+
// }
77+
.mat-tab-group.mat-primary .mat-ink-bar,
78+
.mat-tab-nav-bar.mat-primary .mat-ink-bar {
7379
background-color: @color;
7480
}
75-
.mat-fab.mat-primary, .mat-flat-button.mat-primary, .mat-mini-fab.mat-primary, .mat-raised-button.mat-primary {
81+
.mat-fab.mat-primary:not([disabled]),
82+
.mat-flat-button.mat-primary:not([disabled]),
83+
.mat-mini-fab.mat-primary:not([disabled]),
84+
.mat-raised-button.mat-primary:not([disabled]) {
7685
background-color: @color;
7786
}
78-
.mat-form-field-invalid .mat-input-element, .mat-warn .mat-input-element {
87+
.mat-form-field-invalid .mat-input-element,
88+
.mat-warn .mat-input-element {
7989
caret-color: @color;
8090
}
8191
.form-group .form-line:after {
8292
border-bottom-color: @color;
8393
}
8494
.mat-form-field.mat-focused {
85-
.mat-form-field-label { color: @color; }
86-
.mat-form-field-ripple{ background-color: @color; }
95+
.mat-form-field-label {
96+
color: @color;
97+
}
98+
.mat-form-field-ripple {
99+
background-color: @color;
100+
}
87101
}
88102
}
89103

90104
.theme-red {
91105
.make-theme(@red)
92106
}
107+
93108
.theme-pink {
94109
.make-theme(@pink)
95110
}
111+
96112
.theme-purple {
97113
.make-theme(@purple)
98114
}
115+
99116
.theme-deep-purple {
100117
.make-theme(@deep-purple)
101118
}
119+
102120
.theme-indigo {
103121
.make-theme(@indigo)
104122
}
123+
105124
.theme-blue {
106125
.make-theme(@blue)
107126
}
127+
108128
.theme-light-blue {
109129
.make-theme(@light-blue)
110130
}
131+
111132
.theme-cyan {
112133
.make-theme(@cyan)
113134
}
135+
114136
.theme-teal {
115137
.make-theme(@teal)
116138
}
139+
117140
.theme-indigo {
118141
.make-theme(@indigo)
119142
}
143+
120144
.theme-green {
121145
.make-theme(@green)
122146
}
147+
123148
.theme-light-green {
124149
.make-theme(@light-green)
125150
}
151+
126152
.theme-lime {
127153
.make-theme(@lime)
128154
}
155+
129156
.theme-yellow {
130157
.make-theme(@yellow)
131158
}
159+
132160
.theme-amber {
133161
.make-theme(@amber)
134162
}
163+
135164
.theme-orange {
136165
.make-theme(@orange)
137166
}
167+
138168
.theme-deep-orange {
139169
.make-theme(@deep-orange)
140170
}
171+
141172
.theme-brown {
142173
.make-theme(@brown)
143174
}
175+
144176
.theme-grey {
145177
.make-theme(@grey)
146178
}
179+
147180
.theme-blue-grey {
148181
.make-theme(@blue-grey)
149182
}
183+
150184
.theme-black {
151185
.make-theme(@black)
152186
}

0 commit comments

Comments
 (0)