Skip to content

Commit fcd3aa2

Browse files
committed
fix(grid): remove duplicate border on pivot grid row-dimension headers
1 parent 887eb91 commit fcd3aa2

2 files changed

Lines changed: 35 additions & 24 deletions

File tree

projects/igniteui-angular/grids/themes/_base.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2838,6 +2838,11 @@ $z-grid-loading: 10003;
28382838
}
28392839
}
28402840

2841+
// Pivot's row-dimension headers reuse the MRL block but already have their own border
2842+
.igx-grid__mrl-block.igx-grid__tbody-pivot-dimension .igx-grid-th {
2843+
border-block-end: 0;
2844+
}
2845+
28412846
.igx-grid__tr--odd.igx-grid__tr--mrl {
28422847
.igx-grid__td {
28432848
--body-column-border-color-odd: #{var-get($theme, 'row-border-color')};

src/app/app.component.scss

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
::ng-deep {
44
app-root {
55
--demo-navbar-size: 56px;
6-
--demo-header-height: 72px;
6+
--demo-header-height: 72px;
77
--header-row: 1;
88
--content-row: 2;
99
--content-spacing: 1rem;
@@ -21,17 +21,17 @@
2121
background: var(--ig-gray-50);
2222
overflow-x: clip;
2323
overflow-y: hidden;
24-
min-width: 0;
24+
min-width: 0;
2525

2626
height: calc(100dvh - var(--demo-navbar-size));
2727
}
2828
}
2929

3030
.demos-main-nav {
31-
--sb-track-bg-color: var(--ig-gray-100);
32-
--sb-track-bg-color-hover: var(--ig-gray-100);
33-
--sb-thumb-bg-color: var(--ig-gray-200);
34-
--sb-thumb-bg-color-hover: var(--ig-gray-200);
31+
--sb-track-bg-color: var(--ig-gray-100);
32+
--sb-track-bg-color-hover: var(--ig-gray-100);
33+
--sb-thumb-bg-color: var(--ig-gray-200);
34+
--sb-thumb-bg-color-hover: var(--ig-gray-200);
3535

3636
.igx-nav-drawer__aside {
3737
padding-top: 0;
@@ -69,7 +69,7 @@
6969
margin: 0;
7070

7171
igx-icon {
72-
--color : var(--ig-primary-500);
72+
--color: var(--ig-primary-500);
7373
}
7474
}
7575
}
@@ -79,16 +79,17 @@
7979
flex-direction: column;
8080
min-height: calc(100% - (var(--demo-header-height) + (var(--demo-navbar-size) + var(--demos-gap)) + (var(--content-spacing) * 2)));
8181
height: 100%;
82-
overflow-y: auto;
82+
overflow-y: auto;
8383
padding: var(--content-spacing);
84-
color: var(--ig-gray-900);
85-
86-
> div {
87-
max-width: 1200px;
88-
width: 100%;
89-
min-width: 320px;
90-
margin: 0 auto;
91-
}
84+
color: var(--ig-gray-900);
85+
86+
> div {
87+
max-width: 1200px;
88+
width: 100%;
89+
height: 100%;
90+
min-width: 320px;
91+
margin: 0 auto;
92+
}
9293
}
9394

9495
.demos-filter {
@@ -107,20 +108,25 @@
107108
position: absolute;
108109
top: 100%;
109110
left: 0;
110-
background: linear-gradient(360deg,rgba(255, 255, 255, 0) 0%, var(--background) 70%);
111+
background: linear-gradient(
112+
360deg,
113+
rgba(255, 255, 255, 0) 0%,
114+
var(--background) 70%
115+
);
111116
}
112117
}
113118

114119
.demos-main-nav {
115120
grid-column: 1;
116121

117-
@include tokens(navdrawer-theme(
118-
$background: var(--ig-gray-100),
119-
$border-radius: 0,
120-
$item-border-radius: 0,
121-
$border-color: var(--ig-gray-300),
122-
123-
));
122+
@include tokens(
123+
navdrawer-theme(
124+
$background: var(--ig-gray-100),
125+
$border-radius: 0,
126+
$item-border-radius: 0,
127+
$border-color: var(--ig-gray-300)
128+
)
129+
);
124130
}
125131

126132
.demos-settings-nav {

0 commit comments

Comments
 (0)