From 10dad46d7c3aad85c100701c26a16d5254547bc9 Mon Sep 17 00:00:00 2001 From: Sercan Yemen Date: Sat, 5 May 2018 15:28:05 +0300 Subject: [PATCH] Updated the position attribute of the sidenav Did some changes on the core styles + forced input font sizes to 16px --- src/@fuse/scss/core.scss | 10 ++++++++-- src/@fuse/scss/fuse.scss | 7 ++++--- .../scss/{variables/_theme.scss => theming.scss} | 11 +++++++++-- .../content/apps/academy/course/course.component.html | 2 +- src/app/main/content/apps/chat/chat.component.html | 4 ++-- .../content/apps/contacts/contacts.component.html | 2 +- .../apps/dashboards/project/project.component.html | 2 +- .../apps/file-manager/file-manager.component.html | 4 ++-- .../main/content/apps/mail-ngrx/mail.component.html | 2 +- src/app/main/content/apps/mail/mail.component.html | 2 +- .../apps/scrumboard/board/board.component.html | 2 +- src/app/main/content/apps/todo/todo.component.html | 2 +- .../left-sidenav-2-tabbed.component.html | 2 +- .../left-sidenav-2/left-sidenav-2.component.html | 2 +- .../left-sidenav-tabbed.component.html | 2 +- .../carded/left-sidenav/left-sidenav.component.html | 2 +- .../right-sidenav-2-tabbed.component.html | 2 +- .../right-sidenav-2/right-sidenav-2.component.html | 2 +- .../right-sidenav-tabbed.component.html | 2 +- .../carded/right-sidenav/right-sidenav.component.html | 2 +- .../left-sidenav-2/left-sidenav-2.component.html | 2 +- .../left-sidenav-3/left-sidenav-3.component.html | 2 +- .../simple/left-sidenav/left-sidenav.component.html | 2 +- .../right-sidenav-2/right-sidenav-2.component.html | 2 +- .../right-sidenav-3/right-sidenav-3.component.html | 2 +- .../simple/right-sidenav/right-sidenav.component.html | 2 +- src/app/main/main.component.html | 2 +- src/styles.scss | 2 +- 28 files changed, 48 insertions(+), 34 deletions(-) rename src/@fuse/scss/{variables/_theme.scss => theming.scss} (80%) diff --git a/src/@fuse/scss/core.scss b/src/@fuse/scss/core.scss index 96b899b3..56402cf3 100644 --- a/src/@fuse/scss/core.scss +++ b/src/@fuse/scss/core.scss @@ -1,3 +1,6 @@ +// This file meant to be imported only once! Use fuse.scss to access +// to the core Fuse and Angular Material mixins + // ngx-datatable @import '~@swimlane/ngx-datatable/release/themes/material'; @@ -7,10 +10,13 @@ // Fuse @import "fuse"; -// Theming +// Include core Angular Material styles @include mat-core(); -// Include theme styles for core and each component used in your app. +// Setup the typography +@include angular-material-typography($typography); + +// Create an Angular Material theme from the $theme map @include angular-material-theme($theme); // Partials diff --git a/src/@fuse/scss/fuse.scss b/src/@fuse/scss/fuse.scss index f73440c3..dc21c9b7 100644 --- a/src/@fuse/scss/fuse.scss +++ b/src/@fuse/scss/fuse.scss @@ -1,4 +1,5 @@ -// Variables -@import "variables/theme"; -// Mixins +// Material theming +@import "theming"; + +// Breakpoint mixins @import "mixins/breakpoints"; diff --git a/src/@fuse/scss/variables/_theme.scss b/src/@fuse/scss/theming.scss similarity index 80% rename from src/@fuse/scss/variables/_theme.scss rename to src/@fuse/scss/theming.scss index 05256ad7..0b060ca7 100644 --- a/src/@fuse/scss/variables/_theme.scss +++ b/src/@fuse/scss/theming.scss @@ -1,5 +1,6 @@ @import '~@angular/material/theming'; +// Custom color maps $mat-white: ( 500: white, contrast: ( @@ -47,13 +48,19 @@ $mat-fusedark: ( ) ); -// Palettes +// Define the Material palettes $primary: mat-palette($mat-fusedark); $accent: mat-palette($mat-light-blue, 600, 400, 700); $warn: mat-palette($mat-red); -// Create the theme object (a Sass map containing all of the palettes). +// Create the Material theme object $theme: mat-light-theme($primary, $accent, $warn); +// Store the background and foreground colors for easier access $background: map-get($theme, background); $foreground: map-get($theme, foreground); + +// Force the input field font sizes to 16px +$typography: mat-typography-config( + $input: mat-typography-level(16px, 1.125, 400) +) \ No newline at end of file diff --git a/src/app/main/content/apps/academy/course/course.component.html b/src/app/main/content/apps/academy/course/course.component.html index e892864c..2095ee05 100644 --- a/src/app/main/content/apps/academy/course/course.component.html +++ b/src/app/main/content/apps/academy/course/course.component.html @@ -3,7 +3,7 @@ -
diff --git a/src/app/main/content/apps/chat/chat.component.html b/src/app/main/content/apps/chat/chat.component.html index c4256f34..2a903f8f 100644 --- a/src/app/main/content/apps/chat/chat.component.html +++ b/src/app/main/content/apps/chat/chat.component.html @@ -13,7 +13,7 @@ - @@ -26,7 +26,7 @@ - diff --git a/src/app/main/content/apps/contacts/contacts.component.html b/src/app/main/content/apps/contacts/contacts.component.html index 1e9ba451..33be7cd0 100644 --- a/src/app/main/content/apps/contacts/contacts.component.html +++ b/src/app/main/content/apps/contacts/contacts.component.html @@ -42,7 +42,7 @@ - diff --git a/src/app/main/content/apps/dashboards/project/project.component.html b/src/app/main/content/apps/dashboards/project/project.component.html index 6014c4ee..bb9c07b7 100644 --- a/src/app/main/content/apps/dashboards/project/project.component.html +++ b/src/app/main/content/apps/dashboards/project/project.component.html @@ -750,7 +750,7 @@ -
diff --git a/src/app/main/content/apps/file-manager/file-manager.component.html b/src/app/main/content/apps/file-manager/file-manager.component.html index 8d7c09bf..8f7991ff 100644 --- a/src/app/main/content/apps/file-manager/file-manager.component.html +++ b/src/app/main/content/apps/file-manager/file-manager.component.html @@ -3,7 +3,7 @@ - @@ -69,7 +69,7 @@ - diff --git a/src/app/main/content/apps/mail-ngrx/mail.component.html b/src/app/main/content/apps/mail-ngrx/mail.component.html index 477b0355..d8da153a 100644 --- a/src/app/main/content/apps/mail-ngrx/mail.component.html +++ b/src/app/main/content/apps/mail-ngrx/mail.component.html @@ -7,7 +7,7 @@ - diff --git a/src/app/main/content/apps/mail/mail.component.html b/src/app/main/content/apps/mail/mail.component.html index dd561c82..e81586b5 100644 --- a/src/app/main/content/apps/mail/mail.component.html +++ b/src/app/main/content/apps/mail/mail.component.html @@ -7,7 +7,7 @@ - diff --git a/src/app/main/content/apps/scrumboard/board/board.component.html b/src/app/main/content/apps/scrumboard/board/board.component.html index 937ce6e2..f4898f32 100644 --- a/src/app/main/content/apps/scrumboard/board/board.component.html +++ b/src/app/main/content/apps/scrumboard/board/board.component.html @@ -80,7 +80,7 @@
- + diff --git a/src/app/main/content/apps/todo/todo.component.html b/src/app/main/content/apps/todo/todo.component.html index 0d864ac7..d1d25c3a 100644 --- a/src/app/main/content/apps/todo/todo.component.html +++ b/src/app/main/content/apps/todo/todo.component.html @@ -7,7 +7,7 @@ - diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component.html b/src/app/main/content/ui/page-layouts/carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component.html index 0c11e93c..0be5ba59 100644 --- a/src/app/main/content/ui/page-layouts/carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component.html +++ b/src/app/main/content/ui/page-layouts/carded/left-sidenav-2-tabbed/left-sidenav-2-tabbed.component.html @@ -7,7 +7,7 @@ - diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html index 58a074c0..1be993f0 100644 --- a/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html +++ b/src/app/main/content/ui/page-layouts/carded/left-sidenav-2/left-sidenav-2.component.html @@ -7,7 +7,7 @@ - diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav-tabbed/left-sidenav-tabbed.component.html b/src/app/main/content/ui/page-layouts/carded/left-sidenav-tabbed/left-sidenav-tabbed.component.html index 943c86a3..075cf263 100644 --- a/src/app/main/content/ui/page-layouts/carded/left-sidenav-tabbed/left-sidenav-tabbed.component.html +++ b/src/app/main/content/ui/page-layouts/carded/left-sidenav-tabbed/left-sidenav-tabbed.component.html @@ -7,7 +7,7 @@ - diff --git a/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html b/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html index 6731ec41..e41f9ac2 100644 --- a/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html +++ b/src/app/main/content/ui/page-layouts/carded/left-sidenav/left-sidenav.component.html @@ -7,7 +7,7 @@ - diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component.html b/src/app/main/content/ui/page-layouts/carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component.html index 3b2d6fa7..eda7c584 100644 --- a/src/app/main/content/ui/page-layouts/carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component.html +++ b/src/app/main/content/ui/page-layouts/carded/right-sidenav-2-tabbed/right-sidenav-2-tabbed.component.html @@ -126,7 +126,7 @@ - diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html index 11c58da2..8a7be8ce 100644 --- a/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html +++ b/src/app/main/content/ui/page-layouts/carded/right-sidenav-2/right-sidenav-2.component.html @@ -45,7 +45,7 @@ - diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav-tabbed/right-sidenav-tabbed.component.html b/src/app/main/content/ui/page-layouts/carded/right-sidenav-tabbed/right-sidenav-tabbed.component.html index d557d0cf..a55e58df 100644 --- a/src/app/main/content/ui/page-layouts/carded/right-sidenav-tabbed/right-sidenav-tabbed.component.html +++ b/src/app/main/content/ui/page-layouts/carded/right-sidenav-tabbed/right-sidenav-tabbed.component.html @@ -126,7 +126,7 @@ - diff --git a/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html b/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html index 6d8bc416..3372d9be 100644 --- a/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html +++ b/src/app/main/content/ui/page-layouts/carded/right-sidenav/right-sidenav.component.html @@ -45,7 +45,7 @@ - diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html index c12cd085..7a7471fa 100644 --- a/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html +++ b/src/app/main/content/ui/page-layouts/simple/left-sidenav-2/left-sidenav-2.component.html @@ -3,7 +3,7 @@ - diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html b/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html index 65e95140..5cea7e9c 100644 --- a/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html +++ b/src/app/main/content/ui/page-layouts/simple/left-sidenav-3/left-sidenav-3.component.html @@ -19,7 +19,7 @@ -
diff --git a/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html b/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html index 5f51c15f..d1453059 100644 --- a/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html +++ b/src/app/main/content/ui/page-layouts/simple/left-sidenav/left-sidenav.component.html @@ -3,7 +3,7 @@ -
diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html b/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html index c1da4750..bb3a4bf0 100644 --- a/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html +++ b/src/app/main/content/ui/page-layouts/simple/right-sidenav-2/right-sidenav-2.component.html @@ -33,7 +33,7 @@ - diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html b/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html index 975c6a8d..92e6c0cf 100644 --- a/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html +++ b/src/app/main/content/ui/page-layouts/simple/right-sidenav-3/right-sidenav-3.component.html @@ -33,7 +33,7 @@ -
diff --git a/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html b/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html index e7691363..4a48eacf 100644 --- a/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html +++ b/src/app/main/content/ui/page-layouts/simple/right-sidenav/right-sidenav.component.html @@ -33,7 +33,7 @@ -
diff --git a/src/app/main/main.component.html b/src/app/main/main.component.html index d7931489..a2cc7980 100644 --- a/src/app/main/main.component.html +++ b/src/app/main/main.component.html @@ -67,7 +67,7 @@
- + diff --git a/src/styles.scss b/src/styles.scss index d71a4d52..47998044 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1,2 +1,2 @@ -// Import Fuse main library +// Import Fuse core library @import "@fuse/scss/core"; \ No newline at end of file