From 706832f031c5d60fa3f0989c2759a180cc13b965 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Fri, 22 Jan 2016 14:14:33 -0500 Subject: [PATCH] fix(toolbar): make iOS toolbar closer to native aligned title and back button, increased font size of back icon, removed color shade from toolbar buttons, increased font weight of title, changed primary color, reduced back button text letter spacing. Fixes #5149 --- ionic/components/toolbar/toolbar.ios.scss | 14 ++++++++++---- ionic/components/toolbar/toolbar.md.scss | 4 ++-- ionic/themes/default.scss | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ionic/components/toolbar/toolbar.ios.scss b/ionic/components/toolbar/toolbar.ios.scss index b27a79e011..f40aa79cbd 100644 --- a/ionic/components/toolbar/toolbar.ios.scss +++ b/ionic/components/toolbar/toolbar.ios.scss @@ -61,7 +61,8 @@ ion-navbar-section { .toolbar-title { font-size: $toolbar-ios-title-font-size; - font-weight: 500; + font-weight: 600; + margin-top: 1px; text-align: center; pointer-events: auto; color: $toolbar-ios-text-color; @@ -134,12 +135,12 @@ ion-buttons[right] { @mixin ios-bar-button-default($color-name, $color-value) { .bar-button-#{$color-name} { - $fg-color: color-shade($color-value); + $fg-color: $color-value; color: $fg-color; background-color: transparent; &:hover:not(.disable-hover) { - color: color-shade($fg-color); + color: $fg-color; } &.activated { @@ -256,6 +257,7 @@ ion-buttons[right] { .back-button { margin: 0; + margin-top: 2px; min-height: 3.2rem; line-height: 1; order: map-get($toolbar-order-ios, back-button); @@ -267,7 +269,11 @@ ion-buttons[right] { display: inherit; margin: 0; min-width: 18px; - font-size: 3.2rem; + font-size: 3.3rem; +} + +.back-button-text { + letter-spacing: -0.01em; } diff --git a/ionic/components/toolbar/toolbar.md.scss b/ionic/components/toolbar/toolbar.md.scss index ca9ca66807..ad3acdae00 100644 --- a/ionic/components/toolbar/toolbar.md.scss +++ b/ionic/components/toolbar/toolbar.md.scss @@ -136,12 +136,12 @@ ion-buttons[right] { @mixin md-bar-button-default($color-name, $color-value) { .bar-button-#{$color-name} { - $fg-color: color-shade($color-value); + $fg-color: $color-value; color: $fg-color; background-color: transparent; &:hover:not(.disable-hover) { - color: color-shade($fg-color); + color: $fg-color; } } diff --git a/ionic/themes/default.scss b/ionic/themes/default.scss index 8b58770a76..005835e87b 100644 --- a/ionic/themes/default.scss +++ b/ionic/themes/default.scss @@ -4,7 +4,7 @@ $colors: ( - primary: #387ef5, + primary: #327eff, secondary: #32db64, danger: #f53d3d, light: #f4f4f4,