Skip to content

Commit 8031d67

Browse files
authored
Merge branch '20.0.x' into rivanova/fix-15976-20.0.x
2 parents 8007aa9 + 6cc8206 commit 8031d67

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -758,8 +758,7 @@
758758
igx-time-picker {
759759
position: relative;
760760
height: calc(100% - #{$editing-outline-width * 2});
761-
width: calc(100% - #{$editing-outline-width * 2}) !important;
762-
inset-inline-start: $editing-outline-width;
761+
width: 100% !important;
763762
overflow: hidden;
764763
}
765764

@@ -1804,7 +1803,6 @@
18041803
padding-inline-end: rem(4px) !important;
18051804

18061805
> igx-icon {
1807-
margin-inline-start: auto;
18081806
color: color($color: 'error');
18091807
width: var(--igx-icon-size, rem(18px));
18101808
height: var(--igx-icon-size, rem(18px));
@@ -1910,11 +1908,10 @@
19101908
%igx-grid__td--editing {
19111909
background: var-get($theme, 'cell-editing-background') !important;
19121910
box-shadow: inset 0 0 0 $editing-outline-width var-get($theme, 'edit-mode-color');
1913-
padding: 0 !important;
1911+
padding-inline: rem(4px);
19141912

19151913
&.igx-grid__td--invalid {
19161914
box-shadow: inset 0 0 0 rem(2px) color($color: 'error') !important;
1917-
padding-inline-end: rem(4px) !important;
19181915
}
19191916

19201917
&%grid-cell-number {
@@ -2105,7 +2102,7 @@
21052102

21062103
.sort-icon {
21072104
color: var-get($theme, 'header-selected-text-color');
2108-
2105+
21092106
::after {
21102107
background: var-get($theme, 'header-selected-background');
21112108
}
@@ -2133,15 +2130,15 @@
21332130
&%igx-grid-th--sorted {
21342131
.sort-icon {
21352132
color: var-get($theme, 'header-selected-text-color');
2136-
2133+
21372134
> igx-icon {
21382135
color: inherit;
21392136
}
21402137

21412138
&:focus,
21422139
&:hover {
21432140
color: var-get($theme, 'header-selected-text-color');
2144-
2141+
21452142
> igx-icon {
21462143
color: inherit;
21472144
}
@@ -2198,14 +2195,14 @@
21982195
.sort-icon {
21992196
opacity: 1;
22002197
color: var-get($theme, 'sorted-header-icon-color');
2201-
2198+
22022199
> igx-icon {
22032200
color: inherit;
22042201
}
22052202

22062203
&:hover {
22072204
color: var-get($theme, 'sortable-header-icon-hover-color');
2208-
2205+
22092206
> igx-icon {
22102207
color: inherit;
22112208
}

0 commit comments

Comments
 (0)