Skip to content

Commit df81fc0

Browse files
committed
fix(time-picker): remove duplicate box-shadow and stray background
1 parent dd732ba commit df81fc0

2 files changed

Lines changed: 17 additions & 5 deletions

File tree

projects/igniteui-angular/time-picker/src/time-picker/themes/_base.scss

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,15 @@
88
$theme: digest-schema($material-time-picker);
99

1010
@include layer(base) {
11+
$border-shadow: 0 0 0 rem(1px) var-get($theme, 'border-color');
12+
1113
@include b(igx-time-picker) {
1214
@include sizable();
1315

1416
--component-size: var(--ig-size, #{var-get($theme, 'default-size')});
1517

1618
display: flex;
1719
flex-flow: column nowrap;
18-
border-radius: var-get($theme, 'border-radius');
19-
box-shadow: 0 0 0 rem(1px) var-get($theme, 'border-color');
20-
background: var-get($theme, 'background-color');
21-
overflow: hidden;
2220
min-width: fit-content;
2321

2422
igx-divider {
@@ -161,12 +159,22 @@ $theme: digest-schema($material-time-picker);
161159
min-width: sizable(rem(290px), rem(314px), rem(360px));
162160
box-shadow: inset 0 0 0 rem(1px) var-get($theme, 'border-color'),
163161
var-get($theme, 'dropdown-elevation');
162+
background: var-get($theme, 'background-color');
163+
border-radius: var-get($theme, 'border-radius');
164+
overflow: hidden;
164165

165166
@include e(body) {
166167
min-width: auto;
167168
}
168169
}
169170

171+
@include m(dialog) {
172+
box-shadow: $border-shadow, var-get($theme, 'modal-elevation');
173+
background: var-get($theme, 'background-color');
174+
border-radius: var-get($theme, 'border-radius');
175+
overflow: hidden;
176+
}
177+
170178
@include m(vertical) {
171179
@include e(main) {
172180
display: flex;

projects/igniteui-angular/time-picker/src/time-picker/time-picker.component.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,11 @@
6060
</ng-template>
6161

6262
<div #toggleDirective="toggle" igxToggle role="dialog" class="igx-time-picker"
63-
[ngClass]="{'igx-time-picker--dropdown': isDropdown, 'igx-time-picker--vertical': isVertical && !isDropdown}">
63+
[ngClass]="{
64+
'igx-time-picker--dropdown': isDropdown,
65+
'igx-time-picker--dialog': !isDropdown,
66+
'igx-time-picker--vertical': isVertical && !isDropdown
67+
}">
6468
<div class="igx-time-picker__main">
6569
@if (!this.isDropdown && !this.hideHeader) {
6670
<div class="igx-time-picker__header">

0 commit comments

Comments
 (0)