From 82c650e2e56581883286b32edd38170b5afe52ed Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Fri, 24 Jul 2015 15:08:09 -0500 Subject: [PATCH] iOS tab-bar hairline --- ionic/components/nav-bar/extensions/ios.scss | 4 ---- ionic/components/tabs/extensions/ios.scss | 22 +++++++++++++------- ionic/components/toolbar/extensions/ios.scss | 5 +++++ ionic/platform/registry.ts | 1 + 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/ionic/components/nav-bar/extensions/ios.scss b/ionic/components/nav-bar/extensions/ios.scss index 146103737c..f46842dda4 100644 --- a/ionic/components/nav-bar/extensions/ios.scss +++ b/ionic/components/nav-bar/extensions/ios.scss @@ -3,14 +3,10 @@ // -------------------------------------------------- $navbar-ios-height: 4.4rem !default; -$navbar-ios-border-color: #c4c4c4 !default; .nav[mode="ios"] .navbar-container { min-height: $navbar-ios-height; - - // navbar on top, border on bottom (default) - @include hairline(bottom, $navbar-ios-border-color); } .navbar[mode="ios"] { diff --git a/ionic/components/tabs/extensions/ios.scss b/ionic/components/tabs/extensions/ios.scss index 8c8a199573..b3d8c0bb40 100644 --- a/ionic/components/tabs/extensions/ios.scss +++ b/ionic/components/tabs/extensions/ios.scss @@ -12,6 +12,12 @@ $tab-bar-ios-height: 50px !default; .tab-bar { min-height: $tab-bar-ios-height; + border-top: 1px solid $toolbar-ios-border-color; + } + + &[tab-bar-placement="top"] .tab-bar { + border-top: none; + border-bottom: 1px solid $toolbar-ios-border-color; } .tab-button { @@ -37,16 +43,16 @@ $tab-bar-ios-height: 50px !default; } } - &[tab-bar-placement="bottom"] .tab-bar-container { - @include hairline(top, $toolbar-ios-border-color); +} + +.hairlines .tabs[mode="ios"] { + + .tab-bar { + border-top-width: 0.5px; } - &[tab-bar-placement="top"] .tab-bar-container { - @include hairline(bottom, $toolbar-ios-border-color); - } - - &[tab-bar-placement="top"] .toolbar-container .toolbar { - @include hairline(bottom, none); + &[tab-bar-placement="top"] .tab-bar { + border-bottom-width: 0.5px; } } diff --git a/ionic/components/toolbar/extensions/ios.scss b/ionic/components/toolbar/extensions/ios.scss index a5e3fcf6df..71839b79ec 100644 --- a/ionic/components/toolbar/extensions/ios.scss +++ b/ionic/components/toolbar/extensions/ios.scss @@ -16,6 +16,7 @@ $toolbar-ios-title-font-size: 1.7rem !default; .toolbar[mode="ios"] { + border-bottom: 1px solid $toolbar-ios-border-color; .toolbar-title { order: map-get($toolbar-order-ios, title); @@ -54,3 +55,7 @@ $toolbar-ios-title-font-size: 1.7rem !default; } } + +.hairlines .toolbar[mode="ios"] { + border-bottom-width: 0.5px; +} diff --git a/ionic/platform/registry.ts b/ionic/platform/registry.ts index 31b0ecc26f..1d0db59257 100644 --- a/ionic/platform/registry.ts +++ b/ionic/platform/registry.ts @@ -5,6 +5,7 @@ Platform.register({ name: 'core', settings: { backButtonText: 'Back', + backButtonIcon: 'ion-ios-arrow-back', mode: 'ios', iconMode: 'ios', viewTransition: 'ios'