From d67ba6f7c11a3402fd33afbf30e79dd2f49db394 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Wed, 22 Jul 2015 14:38:17 -0500
Subject: [PATCH] md toolbar css

---
 ionic/components/icon/icon.ts                     | 14 ++++++++------
 ionic/components/nav-bar/extensions/ios.scss      |  6 +-----
 ionic/components/nav-bar/extensions/material.scss |  6 ++++--
 ionic/components/toolbar/extensions/material.scss |  2 +-
 ionic/components/toolbar/test/scenarios/main.html | 14 +++++++-------
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/ionic/components/icon/icon.ts b/ionic/components/icon/icon.ts
index 3801b54130..b351707df8 100644
--- a/ionic/components/icon/icon.ts
+++ b/ionic/components/icon/icon.ts
@@ -58,16 +58,18 @@ Custom Font Icon
   ],
   host: {
     '[attr.aria-label]': 'label',
-    'role': 'img',
-    '[className]': 'className'
+    'role': 'img'
   }
 })
 export class IconDirective {
+  constructor(elementRef: ElementRef) {
+    this.ele = elementRef.nativeElement;
+  }
+
   onInit() {
-    let name = this.name || this.iconName;
-    if (name) {
-      this.className = name;
-      this.label = name.replace('ion-', '').replace('ios-', '').replace('md-', '').replace('-', '');
+    if (this.name) {
+      this.ele.classList.add(this.name);
+      this.label = this.name.replace('ion-', '').replace('ios-', '').replace('md-', '').replace('-', '');
     }
   }
 }
diff --git a/ionic/components/nav-bar/extensions/ios.scss b/ionic/components/nav-bar/extensions/ios.scss
index 94864b24a8..146103737c 100644
--- a/ionic/components/nav-bar/extensions/ios.scss
+++ b/ionic/components/nav-bar/extensions/ios.scss
@@ -21,14 +21,10 @@ $navbar-ios-border-color:                  #c4c4c4 !default;
 
     order: map-get($toolbar-order-ios, 'back-button');
     overflow: inherit;
-
-    icon {
-      padding-right: 8px;
-    }
   }
 
   .back-button-icon {
-    padding-right: 0.6rem;
+    padding-right: 8px;
   }
 
 }
diff --git a/ionic/components/nav-bar/extensions/material.scss b/ionic/components/nav-bar/extensions/material.scss
index 3f1d9daeae..fa23fa0861 100644
--- a/ionic/components/nav-bar/extensions/material.scss
+++ b/ionic/components/nav-bar/extensions/material.scss
@@ -12,14 +12,16 @@ $navbar-material-height:                  5.6rem !default;
 .navbar[mode="md"] {
 
   .back-button {
-    margin: 0;
+    padding: 0;
+    margin: 0 0 0 12px;
+    box-shadow: none;
   }
 
   .back-button-icon {
     margin: 0;
     font-weight: normal;
     font-size: 2.4rem;
-    min-width: 5.6rem;
+    min-width: 44px;
     text-align: left;
   }
 
diff --git a/ionic/components/toolbar/extensions/material.scss b/ionic/components/toolbar/extensions/material.scss
index 0b8cb652ea..2ff156d162 100644
--- a/ionic/components/toolbar/extensions/material.scss
+++ b/ionic/components/toolbar/extensions/material.scss
@@ -9,7 +9,7 @@ $toolbar-material-button-font-size:        1.8rem !default;
 .toolbar[mode="md"] {
 
   .toolbar-inner-title {
-    padding: 0px 11px;
+    padding: 0px 12px;
   }
 
   ion-title {
diff --git a/ionic/components/toolbar/test/scenarios/main.html b/ionic/components/toolbar/test/scenarios/main.html
index e20de8fffe..42bd11d348 100644
--- a/ionic/components/toolbar/test/scenarios/main.html
+++ b/ionic/components/toolbar/test/scenarios/main.html
@@ -5,25 +5,25 @@
 <ion-toolbar><ion-title>This is the title that never ends. It just goes on and on my friend.</ion-title></ion-toolbar>
 
 
-<ion-toolbar><ion-nav-items primary><button>Pri. Item</button></ion-nav-items><ion-title>Title</ion-title></ion-toolbar>
+<ion-toolbar><ion-nav-items primary><button>Pri. Item</button></ion-nav-items><ion-title>Primary Only</ion-title></ion-toolbar>
 
 
-<ion-toolbar><ion-nav-items secondary><button>Sec. Item</button></ion-nav-items><ion-title>Title</ion-title></ion-toolbar>
+<ion-toolbar><ion-nav-items secondary><button>Sec. Item</button></ion-nav-items><ion-title>Secondary Only</ion-title></ion-toolbar>
 
 
-<ion-toolbar><ion-nav-items primary><button><icon name="ion-navicon"></icon></button><button><icon name="ion-heart"></icon></button></ion-nav-items><ion-nav-items secondary><button><icon name="ion-ionic"></icon></button></ion-nav-items><ion-title>Title</ion-title></ion-toolbar>
+<ion-toolbar><ion-nav-items primary><button><icon name="ion-navicon"></icon></button><button><icon name="ion-heart"></icon></button></ion-nav-items><ion-nav-items secondary><button><icon name="ion-ionic"></icon></button></ion-nav-items><ion-title>Defaults</ion-title></ion-toolbar>
 
 
-<ion-toolbar><ion-nav-items primary><button clear primary><icon name="ion-navicon"></icon>Menu</button></ion-nav-items><ion-title>Title</ion-title><ion-nav-items secondary><button clear secondary><icon name="ion-help-circled"></icon>Help</button></ion-nav-items></ion-toolbar>
+<ion-toolbar><ion-nav-items primary><button clear primary><icon name="ion-navicon"></icon>Menu</button></ion-nav-items><ion-title>Button Clear</ion-title><ion-nav-items secondary><button clear secondary><icon name="ion-help-circled"></icon>Help</button></ion-nav-items></ion-toolbar>
 
 
-<ion-toolbar><ion-nav-items primary><button primary outline><icon name="ion-navicon"></icon></button primary><button primary outline><icon name="ion-star"></icon></button></ion-nav-items><ion-nav-items secondary><button secondary outline><icon name="ion-flag"></icon></button></ion-nav-items><ion-title>Title</ion-title></ion-toolbar>
+<ion-toolbar><ion-nav-items primary><button primary outline><icon name="ion-navicon"></icon></button primary><button primary outline><icon name="ion-star"></icon></button></ion-nav-items><ion-nav-items secondary><button secondary outline><icon name="ion-flag"></icon></button></ion-nav-items><ion-title>Button Outline</ion-title></ion-toolbar>
 
 
-<ion-toolbar><ion-nav-items primary><button primary>Btn</button></ion-nav-items><ion-title>Title</ion-title><ion-nav-items secondary><button secondary>Btn</button><button secondary>Btn</button><button secondary>Btn</button></ion-nav-items></ion-toolbar>
+<ion-toolbar><ion-nav-items primary><button primary>Btn</button></ion-nav-items><ion-nav-items secondary><button secondary>Btn</button></ion-nav-items><ion-title>Added Color Attr</ion-title></ion-toolbar>
 
 
-<ion-toolbar><ion-nav-items primary><button primary><icon name="ion-navicon"></icon>Menu</button></ion-nav-items><ion-nav-items secondary><button primary><icon name="ion-help-circled"></icon>Help</button></ion-nav-items><ion-title>Title</ion-title></ion-toolbar>
+<ion-toolbar><ion-nav-items primary><button primary><icon name="ion-navicon"></icon>Menu</button></ion-nav-items><ion-nav-items secondary><button primary><icon name="ion-help-circled"></icon>Help</button></ion-nav-items><ion-title>Icon/Color Attr</ion-title></ion-toolbar>