Skip to content

Commit eea1b99

Browse files
authored
Merge pull request #5423 from IgniteUI/fix-#5418-8.1.x
refactor(navdrawer): fix default border radius
2 parents 8977f4c + 3e95cde commit eea1b99

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

projects/igniteui-angular/src/lib/core/styles/components/navdrawer/_navdrawer-theme.scss

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -343,9 +343,7 @@
343343

344344
@include igx-scope('.igx-typography') {
345345
%item {
346-
@include igx-type-style($type-scale, $item) {
347-
margin: 0;
348-
}
346+
@include igx-type-style($type-scale, $item);
349347
}
350348

351349
%item--header {

projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_navdrawer.scss

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
/// @prop {map} item-hover-text-color [igx-color: 'surface', text-contrast: (), rgba: .87] - The item's hover text color.
2323
/// @prop {map} item-hover-icon-color [igx-color: 'surface', text-contrast: (), rgba: .87] - The item's hover icon color.
2424
/// @prop {map} elevation [16] - The elevation level of the drawer, between 0 - 24.
25-
/// @prop {Number} border-radius [.16667] - The border radius fraction, between 0 - 36 to be used for the navdrawer component.
25+
/// @prop {Number} border-radius [0] - The border radius fraction, between 0 - 36 to be used for the navdrawer component.
2626
/// @prop {Number} item-border-radius [.16667] - The border radius fraction, between 0 - 24 to be used for the navdrawer item.
2727
///
2828
/// @see $default-palette
@@ -37,10 +37,6 @@ $_light-navdrawer: extend(
3737

3838
border-color: rgba(0, 0, 0, .14),
3939

40-
border-radius: 0,
41-
42-
item-border-radius: .16667,
43-
4440
item-header-text-color: (
4541
igx-color: 'surface',
4642
text-contrast: (),

projects/igniteui-angular/src/lib/core/styles/themes/schemas/shape/_navdrawer.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@
44
/// @author <a href="https://github.com/simeonoff" target="_blank">Simeon Simeonoff</a>
55
////
66
$_default-shape-navdrawer: (
7-
border-radius: .2,
7+
border-radius: 0,
8+
item-border-radius: .16667,
89
);
910

1011
$_round-shape-navdrawer: (
1112
border-radius: 1,
13+
item-border-radius: 1,
1214
);
1315

1416
$_square-shape-navdrawer: (
1517
border-radius: 0%,
16-
border-radius-item: 0%
18+
item-border-radius: 0%
1719
);

0 commit comments

Comments
 (0)