Skip to content

make toolbar items flex #66

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Dec 18, 2023
Merged

make toolbar items flex #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 12 additions & 13 deletions projects/lib-workspace/src/app/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,25 @@
</button>
</fs-nav-frame-toolbar-center>

<fs-nav-frame-toolbar-end>
<div style="font-size: 12px">
<mat-form-field appearance="outline" dense>
<mat-label>Search</mat-label>
<input matInput placeholder="Searching..." />
</mat-form-field>
</div>
<fs-nav-frame-toolbar-end style="gap: 1rem">
<mat-form-field appearance="outline" class="dense-search">
<mat-label>Search</mat-label>
<input matInput placeholder="Searching..." />
</mat-form-field>
<button mat-icon-button>
<mat-icon>notifications</mat-icon>
</button>
</fs-nav-frame-toolbar-end>
</fs-nav-frame-toolbar>

<fs-nav-frame-sidebar>

<fs-nav-frame-sidebar-item *ngFor="let route of navRoutes" routerLink="{{route.path}}">
<i class="material-icons">{{route.icon}}</i>
<span>{{route.title}}</span>
<fs-nav-frame-sidebar-item *ngFor="let route of navRoutes" routerLink="{{ route.path }}">
<i class="material-icons">{{ route.icon }}</i>
<span>{{ route.title }}</span>
</fs-nav-frame-sidebar-item>

</fs-nav-frame-sidebar>

<fs-nav-user-profile >
<fs-nav-user-profile>
<!-- profilePicture="https://material.angular.io/assets/img/examples/shiba1.jpg" -->
<fs-nav-user-profile-name>Some User</fs-nav-user-profile-name>
<fs-nav-user-profile-subname>Enginer</fs-nav-user-profile-subname>
Expand Down
44 changes: 31 additions & 13 deletions projects/lib-workspace/src/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,32 @@
@include fsc.core();
@include fsc.roboto();

$my-typography: mat.define-typography-config($font-family: 'Roboto-local');
$my-typography: mat.define-typography-config(
$font-family: 'Roboto-local',
);

// Define a dark theme
$dark-theme: mat.define-dark-theme((color: (primary: mat.define-palette(palettes.$md-primary),
accent: mat.define-palette(palettes.$md-accent),
),
// Only include `typography` and `density` in the default dark theme.
typography: $my-typography,
density: 0,
));
$dark-theme: mat.define-dark-theme(
(
color: (
primary: mat.define-palette(palettes.$md-primary),
accent: mat.define-palette(palettes.$md-accent),
),
// Only include `typography` and `density` in the default dark theme.
typography: $my-typography,
density: 0,
)
);

// Define a light theme
$light-theme: mat.define-light-theme((color: (primary: mat.define-palette(palettes.$md-primary),
accent: mat.define-palette(palettes.$md-accent),
),
));
$light-theme: mat.define-light-theme(
(
color: (
primary: mat.define-palette(palettes.$md-primary),
accent: mat.define-palette(palettes.$md-accent),
),
)
);

// Apply the dark theme by default
@include mat.all-component-themes($dark-theme);
Expand All @@ -41,4 +51,12 @@ $light-theme: mat.define-light-theme((color: (primary: mat.define-palette(palett

html * {
font-family: 'Roboto-local';
}
}

.dense-search {
@include mat.form-field-density(-5);

.mat-mdc-form-field-subscript-wrapper {
display: none;
}
}
9 changes: 8 additions & 1 deletion .../ng-mat-components/src/fs-nav-frame/nav-frame-toolbar/fs-nav-frame-toolbar.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@
display: flex;
align-items: center;
justify-content: space-between;

fs-nav-frame-toolbar-start,
fs-nav-frame-toolbar-center,
fs-nav-frame-toolbar-end {
display: inline-flex;
align-items: center;
}
}

.mat-badge-medium.mat-badge-above .mat-badge-content {
Expand All @@ -32,4 +39,4 @@

button.mat-badge {
margin: 0 4px;
}
}