From d14615cebc1ab06b5b403191d4792d7fd386a431 Mon Sep 17 00:00:00 2001 From: Zak Henry Date: Mon, 3 Aug 2015 20:23:07 +1000 Subject: [PATCH] Added separate admin navigation theming, adjustments to admin nav appearance --- app/src/app/_layouts/admin.tpl.html | 2 +- app/src/app/admin/navigation/navigation.tpl.html | 8 +++++--- app/src/app/app.ts | 9 ++++++++- app/src/common/directives/menuToggle/menuToggle.tpl.html | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app/src/app/_layouts/admin.tpl.html b/app/src/app/_layouts/admin.tpl.html index bdc04635..ee96896b 100644 --- a/app/src/app/_layouts/admin.tpl.html +++ b/app/src/app/_layouts/admin.tpl.html @@ -1,4 +1,4 @@ -
+
CMS + + -

{{ stateGroup.name }}

+

{{ stateGroup.name | uppercase}}

{{state.data.icon}} -

{{state.data.title}}

+

{{state.data.title | uppercase}}

@@ -27,7 +29,7 @@

CMS

> - +
diff --git a/app/src/app/app.ts b/app/src/app/app.ts index 87f5a459..c2dc02bb 100644 --- a/app/src/app/app.ts +++ b/app/src/app/app.ts @@ -8,11 +8,18 @@ module app { constructor($mdThemingProvider:ng.material.IThemingProvider, $mdIconProvider:ng.material.IIconProvider, ngHttpProgressProvider:NgHttpProgress.IngHttpProgressServiceProvider) { - $mdThemingProvider.theme('default') + $mdThemingProvider.theme('defaultTheme') .primaryPalette('green') .accentPalette('grey') ; + $mdThemingProvider.theme('adminTheme') + .primaryPalette('blue-grey') + .accentPalette('deep-orange') + ; + + $mdThemingProvider.setDefaultTheme('defaultTheme'); + let httpProgressConfig:NgHttpProgress.INgHttpProgressServiceConfig = { color: 'green', height: '2px', diff --git a/app/src/common/directives/menuToggle/menuToggle.tpl.html b/app/src/common/directives/menuToggle/menuToggle.tpl.html index 792a896f..cb37ecdd 100644 --- a/app/src/common/directives/menuToggle/menuToggle.tpl.html +++ b/app/src/common/directives/menuToggle/menuToggle.tpl.html @@ -5,7 +5,7 @@ aria-expanded="{{isOpen()}}"> {{navigationState.data.icon}} -

{{navigationState.data.title}}

+

{{navigationState.data.title | uppercase}}