Skip to content

Commit 0691e91

Browse files
authored
Navbar - Fix button size in context of navbar and add missing border variable (#14253)
1 parent 7496fde commit 0691e91

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
"@types/source-map": "0.5.2",
7171
"express": "^4.19.2",
7272
"fflate": "^0.8.1",
73-
"igniteui-theming": "^6.3.0",
73+
"igniteui-theming": "^6.3.1",
7474
"igniteui-trial-watermark": "^3.0.2",
7575
"lodash-es": "^4.17.21",
7676
"rxjs": "^7.8.0",

projects/igniteui-angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"igniteui-trial-watermark": "^3.0.2",
7575
"lodash-es": "^4.17.21",
7676
"uuid": "^9.0.0",
77-
"igniteui-theming": "^6.3.0",
77+
"igniteui-theming": "^6.3.1",
7878
"@igniteui/material-icons-extended": "^3.0.0"
7979
},
8080
"peerDependencies": {

projects/igniteui-angular/src/lib/core/styles/components/navbar/_navbar-theme.scss

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212

1313
/// @param {Map} $schema [$light-material-schema] - The schema used as basis for styling the component.
1414
/// @param {Map} $elevations [null] - The elevations (shadows) map to be used.
15-
///
1615
/// @param {Color} $background [null] - The navbar background color.
1716
/// @param {Color} $text-color [null] - The navbar text color.
17+
/// @param {Color} $border-color [null] - The navbar border color.
1818
/// @param {box-shadow} $shadow [null] - The shadow of the navbar.
1919
/// @param {Color} $idle-icon-color [null] - The navbar idle icon color.
2020
/// @param {Color} $hover-icon-color [null] - The navbar hover icon color.
@@ -27,8 +27,8 @@
2727
@function navbar-theme(
2828
$schema: $light-material-schema,
2929
$elevations: null,
30-
3130
$background: null,
31+
$border-color: null,
3232
$text-color: null,
3333
$shadow: null,
3434
$idle-icon-color: null,
@@ -71,6 +71,7 @@
7171
@return extend($theme, (
7272
name: $name,
7373
background: $background,
74+
border-color: $border-color,
7475
text-color: $text-color,
7576
idle-icon-color: $idle-icon-color,
7677
hover-icon-color: $hover-icon-color,
@@ -111,18 +112,21 @@
111112

112113
igx-avatar,
113114
igx-input-group,
114-
[igxButton],
115115
[igxIconButton],
116116
igc-avatar,
117117
igc-input,
118-
igc-button,
119118
igc-icon-button {
120119
--ig-size: 1;
121120
}
122-
121+
122+
[igxButton],
123+
igc-button {
124+
--ig-size: 2;
125+
}
126+
123127
@if $variant == 'indigo-design' {
124128
igc-icon-button,
125-
[igxIconButton], {
129+
[igxIconButton] {
126130
--ig-size: 2;
127131
}
128132
}

0 commit comments

Comments
 (0)