From bf9a03f172e2bd97de98bf3f3e4b52e92bc269c5 Mon Sep 17 00:00:00 2001 From: eksrha <58111764+eksrha@users.noreply.github.com> Date: Mon, 18 Dec 2023 09:26:14 +0100 Subject: [PATCH] make toolbar items felx --- .../lib-workspace/src/app/app.component.html | 25 +++++------ projects/lib-workspace/src/styles.scss | 44 +++++++++++++------ .../fs-nav-frame-toolbar.component.scss | 9 +++- 3 files changed, 51 insertions(+), 27 deletions(-) diff --git a/projects/lib-workspace/src/app/app.component.html b/projects/lib-workspace/src/app/app.component.html index 316947f..57c4897 100644 --- a/projects/lib-workspace/src/app/app.component.html +++ b/projects/lib-workspace/src/app/app.component.html @@ -14,26 +14,25 @@ - -
- - Search - - -
+ + + Search + + + - - - {{route.icon}} - {{route.title}} + + {{ route.icon }} + {{ route.title }} - - + Some User Enginer diff --git a/projects/lib-workspace/src/styles.scss b/projects/lib-workspace/src/styles.scss index c66cf6e..f0a94da 100644 --- a/projects/lib-workspace/src/styles.scss +++ b/projects/lib-workspace/src/styles.scss @@ -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); @@ -41,4 +51,12 @@ $light-theme: mat.define-light-theme((color: (primary: mat.define-palette(palett html * { font-family: 'Roboto-local'; -} \ No newline at end of file +} + +.dense-search { + @include mat.form-field-density(-5); + + .mat-mdc-form-field-subscript-wrapper { + display: none; + } +} diff --git a/projects/ng-mat-components/src/fs-nav-frame/nav-frame-toolbar/fs-nav-frame-toolbar.component.scss b/projects/ng-mat-components/src/fs-nav-frame/nav-frame-toolbar/fs-nav-frame-toolbar.component.scss index 10796b8..6a92bdc 100644 --- a/projects/ng-mat-components/src/fs-nav-frame/nav-frame-toolbar/fs-nav-frame-toolbar.component.scss +++ b/projects/ng-mat-components/src/fs-nav-frame/nav-frame-toolbar/fs-nav-frame-toolbar.component.scss @@ -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 { @@ -32,4 +39,4 @@ button.mat-badge { margin: 0 4px; -} \ No newline at end of file +}