From 52436e45ebbe72ef1f56d9f6a4a0947c61f94a7d Mon Sep 17 00:00:00 2001
From: Adam Bradley
Date: Tue, 12 Nov 2013 13:51:41 -0600
Subject: [PATCH] bar stable fix
---
dist/css/ionic.css | 22 +++++++++++-----------
scss/_bar.scss | 8 ++++----
test/button-bar.html | 18 +-----------------
3 files changed, 16 insertions(+), 32 deletions(-)
diff --git a/dist/css/ionic.css b/dist/css/ionic.css
index 8b951dabaf..ef5a161aad 100644
--- a/dist/css/ionic.css
+++ b/dist/css/ionic.css
@@ -2622,12 +2622,12 @@ a.subdued {
color: #444444; }
.bar.bar-light .title {
color: #444444; }
- .bar.bar-light {
- background-color: white;
- border-color: #dddddd;
- background-image: linear-gradient(0deg, #dddddd, #dddddd 50%, transparent 50%);
+ .bar.bar-stable {
+ background-color: #f8f8f8;
+ border-color: #bbbbbb;
+ background-image: linear-gradient(0deg, #bbbbbb, #bbbbbb 50%, transparent 50%);
color: #444444; }
- .bar.bar-light .title {
+ .bar.bar-stable .title {
color: #444444; }
.bar.bar-dark {
background-color: #444444;
@@ -2847,18 +2847,18 @@ a.subdued {
box-shadow: none;
font-size: 18px; }
-.bar-light .button {
+.bar-stable .button {
color: #444444;
- background-color: white;
- border-color: #dddddd; }
- .bar-light .button:hover {
+ background-color: #f8f8f8;
+ border-color: #bbbbbb; }
+ .bar-stable .button:hover {
color: #444444;
text-decoration: none; }
- .bar-light .button.active, .bar-light .button:active {
+ .bar-stable .button.active, .bar-stable .button:active {
background-color: #222222;
box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15);
border-color: black; }
- .bar-light .button.button-clear {
+ .bar-stable .button.button-clear {
color: white;
background: none;
box-shadow: none;
diff --git a/scss/_bar.scss b/scss/_bar.scss
index 24d8e9762e..956a58ba5d 100644
--- a/scss/_bar.scss
+++ b/scss/_bar.scss
@@ -80,8 +80,8 @@
&.bar-light {
@include bar-style($bar-light-bg, $bar-light-border, $bar-light-text);
}
- &.bar-light {
- @include bar-style($bar-light-bg, $bar-light-border, $bar-light-text);
+ &.bar-stable {
+ @include bar-style($bar-stable-bg, $bar-stable-border, $bar-stable-text);
}
&.bar-dark {
@include bar-style($bar-dark-bg, $bar-dark-border, $bar-dark-text);
@@ -213,9 +213,9 @@
@include button-clear(#fff, $bar-title-font-size);
}
}
-.bar-light {
+.bar-stable {
.button {
- @include button-style($bar-light-bg, $bar-light-border, $bar-light-active-bg, $bar-light-active-border, $bar-light-text);
+ @include button-style($bar-stable-bg, $bar-stable-border, $bar-stable-active-bg, $bar-stable-active-border, $bar-stable-text);
@include button-clear(#fff, $bar-title-font-size);
}
}
diff --git a/test/button-bar.html b/test/button-bar.html
index 8029a68252..2560f6cc23 100644
--- a/test/button-bar.html
+++ b/test/button-bar.html
@@ -104,23 +104,7 @@
-
-
-
-
-
-
-
-
-