-
Notifications
You must be signed in to change notification settings - Fork 162
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '7.1.x' into indeterminate-progress
- Loading branch information
Showing
29 changed files
with
1,809 additions
and
576 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 25 additions & 44 deletions
69
...s/igniteui-angular/src/lib/core/styles/components/time-picker/_time-picker-component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,90 +1,71 @@ | ||
| @include b(igx-time-picker) { | ||
| @extend %time-picker-display !optional; | ||
|
|
||
| @include e(header) { | ||
| @extend %igx-time-picker__header !optional; | ||
| @extend %time-picker__header !optional; | ||
| } | ||
|
|
||
| @include e(header-ampm) { | ||
| @extend %igx-time-picker__header-ampm !optional; | ||
| @extend %time-picker__header-ampm !optional; | ||
| } | ||
|
|
||
| @include e(header-hour){ | ||
| @extend %igx-time-picker__header-hour !optional; | ||
| @extend %time-picker__header-hour !optional; | ||
| } | ||
|
|
||
| @include e(main) { | ||
| @extend %time-picker__main !optional; | ||
| } | ||
|
|
||
| // COLUMN | ||
| @include e(column) { | ||
| @extend %igx-time-picker__column !optional; | ||
| @extend %time-picker__column !optional; | ||
| } | ||
|
|
||
| @include e(item) { | ||
| @extend %igx-time-picker__item !optional; | ||
| @extend %time-picker__item !optional; | ||
| } | ||
|
|
||
| @include e(item, $mod: selected) { | ||
| @extend %igx-time-picker__item--selected !optional; | ||
| @extend %time-picker__item--selected !optional; | ||
| } | ||
|
|
||
| @include e(item, $m: active) { | ||
| @extend %igx-time-picker__item--active !optional; | ||
| @extend %time-picker__item--active !optional; | ||
| } | ||
|
|
||
| // HOUR | ||
| @include e(hourList) { | ||
| @extend %igx-time-picker__hourList !optional; | ||
| @extend %time-picker__hourList !optional; | ||
| } | ||
|
|
||
|
|
||
| // MINUTE | ||
| @include e(minuteList) { | ||
| @extend %igx-time-picker__minuteList !optional; | ||
| @extend %time-picker__minuteList !optional; | ||
| } | ||
|
|
||
| // AM PM | ||
| @include e(ampmList) { | ||
| @extend %igx-time-picker__ampmList !optional; | ||
| @extend %time-picker__ampmList !optional; | ||
| } | ||
|
|
||
| @include e(body) { | ||
| @extend %igx-time-picker__body !optional; | ||
| @extend %time-picker__body !optional; | ||
| } | ||
|
|
||
| .igx-dialog__window { | ||
| @extend %time-picker-display !optional; | ||
| @include e(buttons) { | ||
| @extend %time-picker__buttons !optional; | ||
| } | ||
|
|
||
| @include m(vertical) { | ||
| .igx-dialog__window { | ||
| @extend %time-picker-display--vertical !optional; | ||
| } | ||
|
|
||
| .igx-time-picker__wrapper { | ||
| @extend %igx-time-picker__wrapper !optional; | ||
| } | ||
|
|
||
| .igx-time-picker__header { | ||
| @extend %igx-time-picker__header--vertical !optional; | ||
|
|
||
| &::after { | ||
| @extend %igx-time-picker__header--vertical-after !optional; | ||
| } | ||
| } | ||
|
|
||
| .igx-time-picker__body { | ||
| @extend %igx-time-picker__body--vertical !optional; | ||
| } | ||
| } | ||
|
|
||
| .igx-dialog__window, | ||
| .igx-dialog__window-content { | ||
| @extend %time-picker-content !optional; | ||
| @include m(dropdown) { | ||
| @extend %time-picker--dropdown !optional; | ||
| } | ||
|
|
||
| .igx-dialog__window-title { | ||
| @extend %time-picker-dialog-title !optional; | ||
| } | ||
| @include m(vertical) { | ||
| @extend %time-picker-display--vertical !optional; | ||
|
|
||
| .igx-dialog__window-actions { | ||
| @extend %time-picker-dialog-actions !optional; | ||
| @include e(header) { | ||
| @extend %time-picker__header--vertical !optional; | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.