Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(navbar): bundle styles with component #15345

Open
wants to merge 1 commit into
base: simeonoff/scoped-styles
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -504,13 +504,13 @@
@include label($label-theme-map);
}

@if is-used('igx-navbar', $exclude) {
$navbar-theme-map: navbar-theme(
$schema: $schema,
);
$navbar-theme-map: meta.call($theme-handler, $navbar-theme-map);
@include navbar($navbar-theme-map);
}
// @if is-used('igx-navbar', $exclude) {
// $navbar-theme-map: navbar-theme(
// $schema: $schema,
// );
// $navbar-theme-map: meta.call($theme-handler, $navbar-theme-map);
// @include navbar($navbar-theme-map);
// }

@if is-used('igx-nav-drawer', $exclude) {
$navdrawer-theme-map: navdrawer-theme(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@use 'themes/base';
@use 'themes/shared';
@use 'themes/light';
@use 'themes/dark';
5 changes: 4 additions & 1 deletion projects/igniteui-angular/src/lib/navbar/navbar.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import {
Output,
Directive,
ContentChild,
booleanAttribute
booleanAttribute,
ViewEncapsulation
} from '@angular/core';

import { IgxIconComponent } from '../icon/icon.component';
Expand Down Expand Up @@ -55,6 +56,8 @@ let NEXT_ID = 0;
}
`
],
styleUrl: 'navbar.component.css',
encapsulation: ViewEncapsulation.None,
imports: [NgIf, IgxIconComponent]
})

Expand Down
110 changes: 110 additions & 0 deletions projects/igniteui-angular/src/lib/navbar/themes/_base.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
@use 'igniteui-theming/sass/animations/easings' as *;
@use 'igniteui-theming/sass/typography' as *;
@use 'igniteui-theming/sass/bem' as *;
@use 'igniteui-theming/sass/themes' as *;
@use 'styles/themes/standalone' as *;
@use 'light/tokens' as *;

$_theme: $material;

@include layer(base) {
%igx-navbar-title {
@include type-style(h6);
@include line-clamp(4, true, true);
margin: 0;
flex-grow: 1;
user-select: text;
display: flex;
flex-direction: row;
}

%igx-navbar-icon {
display: flex;
align-items: center;

igx-icon,
igc-icon {
--component-size: 3;
cursor: pointer;
}

> igx-icon,
> igc-icon {
transition: color .15s $out-quad;
color: var-get($_theme, 'idle-icon-color');

&:hover {
color: var-get($_theme, 'hover-icon-color');
}

user-select: none;
}
}

igx-navbar-action,
[igxNavbarAction] {
display: flex;
align-items: center;
}

igx-navbar-title,
[igxNavbarTitle] {
@extend %igx-navbar-title;

align-items: center;
}

@include b(igx-navbar) {
display: flex;
align-items: center;
position: relative;
flex-flow: row nowrap;
gap: rem(16px);
width: 100%;
min-height: rem(56px);
max-height: rem(128px);
padding-inline: rem(16px);
background: var-get($_theme, 'background');
color: var-get($_theme, 'text-color');
box-shadow: var-get($_theme, 'elevation');
z-index: 4;
overflow: hidden;
border-bottom: rem(1px) solid var-get($_theme, 'border-color');

igx-avatar {
--ig-size: 1;
}

@include e(title) {
@extend %igx-navbar-title;
}

@include e(left) {
@extend %igx-navbar-icon;

&:not(:empty) {
margin-inline-end: rem(16px);
}

&:empty {
display: none;
}
}

@include e(middle) {
@extend %igx-navbar-icon;

flex-grow: 1;
}

@include e(right) {
@extend %igx-navbar-icon;

gap: rem(16px);

&:empty {
display: none;
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@use 'sass:meta';
@use 'tokens';
@use 'styles/themes/standalone' as *;

$tokens: meta.module-variables(tokens);
@include themes(igx-navbar, $tokens, dark);
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@use 'igniteui-theming/sass/themes' as *;
@use 'igniteui-theming/sass/themes/schemas/components/dark/navbar' as *;

$material: digest-schema($dark-material-navbar);
$bootstrap: digest-schema($dark-bootstrap-navbar);
$fluent: digest-schema($dark-fluent-navbar);
$indigo: digest-schema($dark-indigo-navbar);
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@use 'sass:meta';
@use 'tokens';
@use 'styles/themes/standalone' as *;

$tokens: meta.module-variables(tokens);
@include themes(igx-navbar, $tokens, light);
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@use 'igniteui-theming/sass/themes' as *;
@use 'igniteui-theming/sass/themes/schemas/components/light/navbar' as *;

$base: digest-schema($light-navbar);
$material: digest-schema($material-navbar);
$bootstrap: digest-schema($bootstrap-navbar);
$fluent: digest-schema($fluent-navbar);
$indigo: digest-schema($indigo-navbar);
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
@use 'igniteui-theming/sass/typography' as *;
@use 'igniteui-theming/sass/bem' as *;
@use 'styles/themes/standalone' as *;

@include themed-block(igx-navbar, bootstrap) {
@include e(title) {
@include type-style(h5);
}

igx-navbar-title,
[igxNavbarTitle] {
@include type-style(h5);
}

igc-input,
igc-icon-button {
--ig-size: 1;
}

[igxButton],
igc-button,
[igxIconButton],
igx-input-group {
--ig-size: 2;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
@use 'igniteui-theming/sass/typography' as *;
@use 'igniteui-theming/sass/bem' as *;
@use 'styles/themes/standalone' as *;

@include themed-block(igx-navbar, fluent) {
@include e(title) {
@include type-style(subtitle-2);
}

igx-navbar-title,
[igxNavbarTitle] {
@include type-style(subtitle-2);
}

igx-input-group {
--ig-size: 2;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@forward 'material';
@forward 'bootstrap';
@forward 'fluent';
@forward 'indigo';
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
@use 'igniteui-theming/sass/typography' as *;
@use 'igniteui-theming/sass/bem' as *;
@use 'styles/themes/standalone' as *;

@include themed-block(igx-navbar, indigo) {
%icon-size {
igx-icon,
igc-icon {
--component-size: 2;

margin-inline: rem(6px);
}
}

igx-avatar,
igc-icon-button,
[igxIconButton] {
--ig-size: 2;
}

igx-navbar-title,
[igxNavbarTitle] {
@include type-style(h5);
}

@include e(title) {
@extend %icon-size;
@include type-style(h5);
}

@include e(right) {
@extend %icon-size;

gap: rem(8px);
}

@include e(left) {
@extend %icon-size;

&:not(:empty) {
margin-inline-end: unset;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@use 'igniteui-theming/sass/bem' as *;
@use 'styles/themes/standalone' as *;

@include themed-block(igx-navbar, material) {
igx-input-group {
--ig-size: 1;
}
}