diff --git a/ionic/components/icon/icon.ts b/ionic/components/icon/icon.ts index 7b5671f50c..4515030fbd 100644 --- a/ionic/components/icon/icon.ts +++ b/ionic/components/icon/icon.ts @@ -68,11 +68,13 @@ export class IconDirective { onInit() { if (this.name) { this.ele.classList.add(this.name); - this.label = this.name; + this.label = this.name.replace('ion-', '').replace('ios-', '').replace('md-', '').replace('-', ''); } } } + + @IonicComponent({ selector: 'ion-icon', properties: [ diff --git a/ionic/components/nav-bar/extensions/material.scss b/ionic/components/nav-bar/extensions/material.scss index 12fe098bb1..2de74970f7 100644 --- a/ionic/components/nav-bar/extensions/material.scss +++ b/ionic/components/nav-bar/extensions/material.scss @@ -9,8 +9,8 @@ $navbar-order-material: ( secondary: 40 ); -$navbar-material-height: 6.4rem !default; -$navbar-material-background: get-color(primary, base) !default;//#f7f7f8 !default; +$navbar-material-height: 5.6rem !default; +$navbar-material-background: get-color(primary, base) !default; $navbar-material-title-font-size: 2rem !default; $navbar-material-button-font-size: 24px !default; @@ -22,7 +22,7 @@ $navbar-material-button-text-color: #fff !default; //#007aff !default; background: $navbar-material-background; .toolbar-inner-title { - padding: 0px 16px; + padding: 0; } .toolbar-inner { @@ -57,7 +57,6 @@ $navbar-material-button-text-color: #fff !default; //#007aff !default; border: none; box-shadow: none; - padding: 0; margin: 0 10px; @@ -65,4 +64,16 @@ $navbar-material-button-text-color: #fff !default; //#007aff !default; min-width: 0; } + .back-button { + margin: 0; + } + + .back-button-icon { + margin: 0; + font-weight: normal; + font-size: 24px; + min-width: 56px; + text-align: left; + } + } diff --git a/ionic/components/nav-bar/nav-bar.scss b/ionic/components/nav-bar/nav-bar.scss index f7ed0ea488..4814c2b0b4 100644 --- a/ionic/components/nav-bar/nav-bar.scss +++ b/ionic/components/nav-bar/nav-bar.scss @@ -43,15 +43,13 @@ @each $color, $value in $colors { .navbar[#{$color}] { - background-color: get-color($color, base); + background-color: get-color($color, base); - ion-title { - color: white; - } - button, - [button] { - color: white; - } + ion-title, + button, + [button] { + color: get-color($color, inverse); + } } } diff --git a/ionic/components/nav-bar/nav-bar.ts b/ionic/components/nav-bar/nav-bar.ts index f722547839..264533da4a 100644 --- a/ionic/components/nav-bar/nav-bar.ts +++ b/ionic/components/nav-bar/nav-bar.ts @@ -15,8 +15,8 @@ import * as dom from '../../util/dom'; @IonicView({ template: `
-