From 2962a2c05d572d25af8aa330c83235066dbc9ca3 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Wed, 12 Aug 2015 13:57:03 -0500 Subject: [PATCH] toolbar border colors --- ionic/components/toolbar/modes/ios.scss | 3 ++- ionic/components/toolbar/toolbar.scss | 11 +++++++---- ionic/themes/default.scss | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ionic/components/toolbar/modes/ios.scss b/ionic/components/toolbar/modes/ios.scss index 40cdfd89f8..d21e4b627f 100644 --- a/ionic/components/toolbar/modes/ios.scss +++ b/ionic/components/toolbar/modes/ios.scss @@ -17,7 +17,8 @@ $toolbar-ios-title-font-size: 1.7rem !default; .nav[mode=ios] .toolbar, .toolbar[mode=ios] { - border-bottom: 1px solid $toolbar-ios-border-color; + border-bottom-width: 1px; + border-bottom-style: solid; min-height: $toolbar-ios-height; .toolbar-title { diff --git a/ionic/components/toolbar/toolbar.scss b/ionic/components/toolbar/toolbar.scss index 943f59d501..516d6eb4a9 100644 --- a/ionic/components/toolbar/toolbar.scss +++ b/ionic/components/toolbar/toolbar.scss @@ -24,6 +24,8 @@ $toolbar-order: ( order: $flex-order-toolbar-top; flex: 0; + border: 0; + border-color: $toolbar-border-color; background-color: $toolbar-background-color; button, @@ -89,15 +91,16 @@ ion-title { // Toolbar Color Generation // -------------------------------------------------- -@each $color, $value in $colors { +@each $color-name, $color-value in $colors { - .toolbar[#{$color}] { - background-color: $value; + .toolbar[#{$color-name}] { + background-color: $color-value; + border-color: darken($color-value, 15%); ion-title, button, [button] { - color: inverse($value); + color: inverse($color-value); } } diff --git a/ionic/themes/default.scss b/ionic/themes/default.scss index b9d659436a..00f2b44658 100644 --- a/ionic/themes/default.scss +++ b/ionic/themes/default.scss @@ -24,8 +24,8 @@ $list-border-color: #c8c7cc !default; $link-color: map-get($colors, primary) !default; $link-hover-color: darken($link-color, 15%) !default; -$toolbar-background-color: #f9f9f9 !default; -$toolbar-border-color: #c4c4c4 !default; +$toolbar-background-color: #f8f8f8 !default; +$toolbar-border-color: #b2b2b2 !default; $toolbar-text-color: $text-color !default; $toolbar-active-color: $link-color !default; $toolbar-inactive-color: #8c8c8c !default;