Skip to content

Commit 009309e

Browse files
committed
refactor(navbar): update theme and templates
1 parent 6079f6b commit 009309e

File tree

3 files changed

+41
-19
lines changed

3 files changed

+41
-19
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@
1616
}
1717

1818
@include e(left) {
19-
@extend %igx-navbar-bundle !optional;
20-
@extend %igx-navbar-icon-display !optional;
19+
@extend %igx-navbar-left !optional;
2120
}
2221

2322
@include e(right) {
24-
@extend %igx-navbar-bundle !optional;
25-
@extend %igx-navbar-icon-display !optional;
23+
@extend %igx-navbar-right !optional;
2624
}
2725
}

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

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@
9090
@mixin igx-navbar($theme) {
9191
@include igx-root-css-vars($theme);
9292

93-
$navbar-padding: 0 em(16px);
94-
$navbar-title-fz: em(18px, 16px);
95-
$navbar-title-lh: em(18px, 16px);
93+
$navbar-padding: 0 rem(16px);
94+
$navbar-title-fz: rem(18px, 16px);
95+
$navbar-title-lh: rem(18px, 16px);
9696
$navbar-title-margin: 0;
9797
$left: if-ltr(left, right);
9898

@@ -111,17 +111,23 @@
111111
z-index: 4;
112112
}
113113

114+
%igx-navbar-part {
115+
display: flex;
116+
align-items: center;
117+
}
118+
114119
%igx-navbar-title {
115120
margin: $navbar-title-margin;
121+
flex-grow: 1;
122+
user-select: text;
116123
}
117124

118125
%igx-navbar-bundle {
119-
display: flex;
120-
align-items: center;
126+
@extend %igx-navbar-part;
121127
user-select: none;
122128

123129
> * + * {
124-
margin-#{$left}: 16px;
130+
margin-#{$left}: rem(16px);
125131
}
126132
}
127133

@@ -137,17 +143,26 @@
137143
}
138144
}
139145

146+
%igx-navbar-left {
147+
@extend %igx-navbar-bundle;
148+
@extend %igx-navbar-icon-display;
149+
flex-grow: 1;
150+
}
151+
152+
%igx-navbar-right {
153+
@extend %igx-navbar-bundle;
154+
@extend %igx-navbar-icon-display;
155+
}
156+
140157
igx-navbar-action,
141158
[igxNavbarAction] {
142-
display: flex;
143-
align-items: center;
159+
@extend %igx-navbar-part;
144160
}
145161

146162
igx-navbar-title,
147163
[igxNavbarTitle] {
148-
display: flex;
149-
align-items: center;
150-
user-select: none;
164+
@extend %igx-navbar-part;
165+
@extend %igx-navbar-title;
151166
}
152167
}
153168

projects/igniteui-angular/src/lib/navbar/navbar.component.html

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
11
<nav class="igx-navbar" role="navigation" [attr.aria-labelledby]="titleId">
22
<div class="igx-navbar__left">
3-
<igx-icon (click)="_triggerAction()" fontSet="material" *ngIf="isActionButtonVisible">{{actionButtonIcon}}
3+
<igx-icon
4+
(click)="_triggerAction()"
5+
fontSet="material"
6+
*ngIf="isActionButtonVisible">
7+
{{actionButtonIcon}}
48
</igx-icon>
5-
<ng-content select="igx-navbar-action,[igxNavbarAction]"></ng-content>
6-
<h1 *ngIf="!isTitleContentVisible" class="igx-navbar__title" [attr.id]="titleId">{{ title }}</h1>
7-
<ng-content select="igx-navbar-title,[igxNavbarTitle]"></ng-content>
9+
<ng-content select="igx-navbar-action, [igxNavbarAction]"></ng-content>
10+
<h1
11+
*ngIf="!isTitleContentVisible"
12+
class="igx-navbar__title"
13+
[attr.id]="titleId">
14+
{{ title }}
15+
</h1>
16+
<ng-content select="igx-navbar-title, [igxNavbarTitle]"></ng-content>
817
</div>
918
<div class="igx-navbar__right">
1019
<ng-content></ng-content>

0 commit comments

Comments
 (0)