Added separate admin navigation theming, adjustments to admin nav app…

…earance
spira · Aug 3, 2015 · d14615c · d14615c
1 parent 7ff39cf
commit d14615c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/app/src/app/_layouts/admin.tpl.html b/app/src/app/_layouts/admin.tpl.html
@@ -1,4 +1,4 @@
-<div layout="row">
+<div layout="row" md-theme="adminTheme">
 
     <md-sidenav
             class="navigation site-sidenav md-sidenav-left md-whiteframe-z2"

diff --git a/app/src/app/admin/navigation/navigation.tpl.html b/app/src/app/admin/navigation/navigation.tpl.html
@@ -9,15 +9,17 @@ <h1 class="md-toolbar-tools">CMS</h1>
     </md-list-item>
 </md-list>
 
+<md-divider></md-divider>
+
 <md-list ng-repeat="stateGroup in AdminNavigationController.groupedNavigableStates">
 
     <md-list-item ng-if="!!stateGroup.name">
-        <p>{{ stateGroup.name }}</p>
+        <p><small>{{ stateGroup.name | uppercase}}</small></p>
     </md-list-item>
 
     <md-list-item ng-repeat-start="state in stateGroup.states" ng-if="!state.abstract" ng-click="AdminNavigationController.$state.go(state.name)" ui-sref-active="selected">
         <md-icon>{{state.data.icon}}</md-icon>
-        <p>{{state.data.title}}</p>
+        <p>{{state.data.title | uppercase}}</p>
 
     </md-list-item>
 
@@ -27,7 +29,7 @@ <h1 class="md-toolbar-tools">CMS</h1>
     >
     </menu-toggle>
 
-    <md-divider ng-repeat-end ng-if="!$last"></md-divider>
+    <md-divider ng-repeat-end></md-divider>
 
 </md-list>
 

diff --git 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
@@ -5,7 +5,7 @@
             aria-expanded="{{isOpen()}}">
 
         <md-icon>{{navigationState.data.icon}}</md-icon>
-        <p>{{navigationState.data.title}}</p>
+        <p>{{navigationState.data.title | uppercase}}</p>
 
         <span aria-hidden="true" class="md-toggle-icon"
               ng-class="{'toggled' : isOpen()}">