Skip to content

Commit b0a9482

Browse files
authored
Themes: Indigo Updates for Calendar, Grid, Combo, and Select (#14607)
1 parent 72a060f commit b0a9482

23 files changed

+1253
-519
lines changed

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"@types/source-map": "0.5.2",
7575
"express": "^4.21.0",
7676
"fflate": "^0.8.1",
77-
"igniteui-theming": "^12.0.0",
77+
"igniteui-theming": "^12.2.1",
7878
"igniteui-trial-watermark": "^3.0.2",
7979
"lodash-es": "^4.17.21",
8080
"rxjs": "^7.8.0",

projects/igniteui-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"igniteui-trial-watermark": "^3.0.2",
7575
"lodash-es": "^4.17.21",
7676
"uuid": "^9.0.0",
77-
"igniteui-theming": "^12.0.0",
77+
"igniteui-theming": "^12.2.1",
7878
"@igniteui/material-icons-extended": "^3.0.0"
7979
},
8080
"peerDependencies": {

projects/igniteui-angular/src/lib/combo/combo.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
[width]="itemsWidth || '100%'" (opening)="handleOpening($event)" (closing)="handleClosing($event)"
3737
(opened)="handleOpened()" (closed)="handleClosed()">
3838
<div class="igx-combo__search">
39-
<igx-input-group *ngIf="displaySearchInput" theme="material" >
39+
<igx-input-group *ngIf="displaySearchInput">
4040
<input igxInput #searchInput name="searchInput" autocomplete="off" type="text"
4141
[(ngModel)]="searchValue" (ngModelChange)="handleInputChange($event)" (keyup)="handleKeyUp($event)"
4242
(keydown)="handleKeyDown($event)" (focus)="dropdown.onBlur($event)" [attr.placeholder]="searchPlaceholder"

projects/igniteui-angular/src/lib/core/styles/components/calendar/_calendar-component.scss

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,10 @@
146146
@extend %date-selected-special !optional;
147147
}
148148

149+
@include e(date, $mods: ('selected', 'special', 'active')) {
150+
@extend %date-selected-special-active !optional;
151+
}
152+
149153
@include e(date, $mods: ('selected', 'range')) {
150154
@extend %date-selected-range !optional;
151155
}
@@ -219,10 +223,22 @@
219223
@extend %date-range-selected-special-last !optional;
220224
}
221225

222-
@include e(date, $mods: ('selected', 'special', 'first', 'last')) {
226+
@include e(date, $mods: ('range', 'selected', 'special', 'first', 'last')) {
223227
@extend %date-selected-special-first-last !optional;
224228
}
225229

230+
@include e(date, $mods: ('selected', 'special', 'current', 'first', 'last')) {
231+
@extend %date-selected-special-current-first-last !optional;
232+
}
233+
234+
@include e(date, $mods: ('selected', 'special', 'current', 'preview', 'first')) {
235+
@extend %date-selected-special-current-last !optional;
236+
}
237+
238+
@include e(date, $mods: ('selected', 'special', 'current', 'preview', 'last')) {
239+
@extend %date-selected-special-current-first !optional;
240+
}
241+
226242
@include e(date, $mods: ('range', 'selected', 'active')) {
227243
@extend %date-range-selected-active !optional;
228244
}
@@ -299,6 +315,14 @@
299315
@extend %date-selected-current-active !optional;
300316
}
301317

318+
@include e(date, $mods: ('current', 'selected', 'special')) {
319+
@extend %date-selected-current-special !optional;
320+
}
321+
322+
@include e(date, $mods: ('current', 'selected', 'special', 'active')) {
323+
@extend %date-selected-current-special-active !optional;
324+
}
325+
302326
@include e(date, 'special') {
303327
@extend %date-special !optional;
304328
}
@@ -307,16 +331,26 @@
307331
@extend %date-special-current !optional;
308332
}
309333

334+
@include e(date, $mods: ('special', 'current', 'selected')) {
335+
@extend %date-special-current-selected !optional;
336+
}
337+
338+
@include e(date, $mods: ('special', 'current', 'selected', 'active')) {
339+
@extend %date-special-current-selected-active !optional;
340+
}
341+
310342
@include e(date, $mods: ('special' 'active')) {
311343
@extend %date-special-active !optional;
312344
}
313345

314346
@include e(date, $mods: ('special', 'current', 'active')) {
315347
@extend %date-special-current !optional;
348+
@extend %date-special-current-active !optional;
316349
}
317350

318351
@include e(date, $mods: ('special', 'current', 'active', 'range')) {
319352
@extend %date-special-current !optional;
353+
@extend %date-special-current-active !optional;
320354
}
321355

322356
@include e(date, 'first') {

0 commit comments

Comments
 (0)