From 75d73d497339983a4feffc4fe047643885a97910 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Sat, 16 Nov 2013 21:21:50 -0600
Subject: [PATCH] fix button-clear, outline

---
 dist/css/ionic.css | 80 +++++++++++++++++++++++-----------------------
 scss/_button.scss  | 40 +++++++++++------------
 2 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/dist/css/ionic.css b/dist/css/ionic.css
index 752d653ec7..8ca4caaa0a 100644
--- a/dist/css/ionic.css
+++ b/dist/css/ionic.css
@@ -4433,15 +4433,15 @@ input[type="range"] {
       box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15);
       border-color: #cccccc; }
     .button.button-light.button-clear {
-      color: white;
+      color: #dddddd;
       background: none;
       box-shadow: none; }
     .button.button-light.button-outline {
       background: transparent;
-      border-color: white;
-      color: white; }
+      border-color: #dddddd;
+      color: #dddddd; }
       .button.button-light.button-outline.active, .button.button-light.button-outline:active {
-        background-color: white;
+        background-color: #dddddd;
         color: #fff;
         box-shadow: none; }
   .button.button-stable {
@@ -4456,15 +4456,15 @@ input[type="range"] {
       box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15);
       border-color: #a2a2a2; }
     .button.button-stable.button-clear {
-      color: #f8f8f8;
+      color: #b2b2b2;
       background: none;
       box-shadow: none; }
     .button.button-stable.button-outline {
       background: transparent;
-      border-color: #f8f8f8;
-      color: #f8f8f8; }
+      border-color: #b2b2b2;
+      color: #b2b2b2; }
       .button.button-stable.button-outline.active, .button.button-stable.button-outline:active {
-        background-color: #f8f8f8;
+        background-color: #b2b2b2;
         color: #fff;
         box-shadow: none; }
   .button.button-positive {
@@ -4479,15 +4479,15 @@ input[type="range"] {
       box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15);
       border-color: #145dd7; }
     .button.button-positive.button-clear {
-      color: #4a87ee;
+      color: #145dd7;
       background: none;
       box-shadow: none; }
     .button.button-positive.button-outline {
       background: transparent;
-      border-color: #4a87ee;
-      color: #4a87ee; }
+      border-color: #145dd7;
+      color: #145dd7; }
       .button.button-positive.button-outline.active, .button.button-positive.button-outline:active {
-        background-color: #4a87ee;
+        background-color: #145dd7;
         color: #fff;
         box-shadow: none; }
   .button.button-calm {
@@ -4502,15 +4502,15 @@ input[type="range"] {
       box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15);
       border-color: #1aaac3; }
     .button.button-calm.button-clear {
-      color: #43cee6;
+      color: #1aaac3;
       background: none;
       box-shadow: none; }
     .button.button-calm.button-outline {
       background: transparent;
-      border-color: #43cee6;
-      color: #43cee6; }
+      border-color: #1aaac3;
+      color: #1aaac3; }
       .button.button-calm.button-outline.active, .button.button-calm.button-outline:active {
-        background-color: #43cee6;
+        background-color: #1aaac3;
         color: #fff;
         box-shadow: none; }
   .button.button-assertive {
@@ -4525,15 +4525,15 @@ input[type="range"] {
       box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15);
       border-color: #cc2511; }
     .button.button-assertive.button-clear {
-      color: #ef4e3a;
+      color: #cc2511;
       background: none;
       box-shadow: none; }
     .button.button-assertive.button-outline {
       background: transparent;
-      border-color: #ef4e3a;
-      color: #ef4e3a; }
+      border-color: #cc2511;
+      color: #cc2511; }
       .button.button-assertive.button-outline.active, .button.button-assertive.button-outline:active {
-        background-color: #ef4e3a;
+        background-color: #cc2511;
         color: #fff;
         box-shadow: none; }
   .button.button-balanced {
@@ -4548,15 +4548,15 @@ input[type="range"] {
       box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15);
       border-color: #478f24; }
     .button.button-balanced.button-clear {
-      color: #66cc33;
+      color: #478f24;
       background: none;
       box-shadow: none; }
     .button.button-balanced.button-outline {
       background: transparent;
-      border-color: #66cc33;
-      color: #66cc33; }
+      border-color: #478f24;
+      color: #478f24; }
       .button.button-balanced.button-outline.active, .button.button-balanced.button-outline:active {
-        background-color: #66cc33;
+        background-color: #478f24;
         color: #fff;
         box-shadow: none; }
   .button.button-energized {
@@ -4571,15 +4571,15 @@ input[type="range"] {
       box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15);
       border-color: #d39511; }
     .button.button-energized.button-clear {
-      color: #f0b840;
+      color: #d39511;
       background: none;
       box-shadow: none; }
     .button.button-energized.button-outline {
       background: transparent;
-      border-color: #f0b840;
-      color: #f0b840; }
+      border-color: #d39511;
+      color: #d39511; }
       .button.button-energized.button-outline.active, .button.button-energized.button-outline:active {
-        background-color: #f0b840;
+        background-color: #d39511;
         color: #fff;
         box-shadow: none; }
   .button.button-royal {
@@ -4594,15 +4594,15 @@ input[type="range"] {
       box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15);
       border-color: #552bdf; }
     .button.button-royal.button-clear {
-      color: #8a6de9;
+      color: #552bdf;
       background: none;
       box-shadow: none; }
     .button.button-royal.button-outline {
       background: transparent;
-      border-color: #8a6de9;
-      color: #8a6de9; }
+      border-color: #552bdf;
+      color: #552bdf; }
       .button.button-royal.button-outline.active, .button.button-royal.button-outline:active {
-        background-color: #8a6de9;
+        background-color: #552bdf;
         color: #fff;
         box-shadow: none; }
   .button.button-dark {
@@ -4617,15 +4617,15 @@ input[type="range"] {
       box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15);
       border-color: black; }
     .button.button-dark.button-clear {
-      color: #444444;
+      color: #111111;
       background: none;
       box-shadow: none; }
     .button.button-dark.button-outline {
       background: transparent;
-      border-color: #444444;
-      color: #444444; }
+      border-color: #111111;
+      color: #111111; }
       .button.button-dark.button-outline.active, .button.button-dark.button-outline:active {
-        background-color: #444444;
+        background-color: #111111;
         color: #fff;
         box-shadow: none; }
 
@@ -4672,7 +4672,7 @@ input[type="range"] {
   background: none;
   box-shadow: none; }
   .button-clear.button-clear {
-    color: #f8f8f8;
+    color: #b2b2b2;
     background: none;
     box-shadow: none; }
   .button-clear:active, .button-clear.active {
@@ -4685,10 +4685,10 @@ input[type="range"] {
   box-shadow: none; }
   .button-outline.button-outline {
     background: transparent;
-    border-color: #f8f8f8;
-    color: #f8f8f8; }
+    border-color: #b2b2b2;
+    color: #b2b2b2; }
     .button-outline.button-outline.active, .button-outline.button-outline:active {
-      background-color: #f8f8f8;
+      background-color: #b2b2b2;
       color: #fff;
       box-shadow: none; }
 
diff --git a/scss/_button.scss b/scss/_button.scss
index 6d4b2eaaf0..d88add7fdf 100644
--- a/scss/_button.scss
+++ b/scss/_button.scss
@@ -45,56 +45,56 @@
 
   &.button-light {
     @include button-style($button-light-bg, $button-light-border, $button-light-active-bg, $button-light-active-border, $button-light-text);
-    @include button-clear($button-light-bg);
-    @include button-outline($button-light-bg);
+    @include button-clear($button-light-border);
+    @include button-outline($button-light-border);
   }
 
   &.button-stable {
     @include button-style($button-stable-bg, $button-stable-border, $button-stable-active-bg, $button-stable-active-border, $button-stable-text);
-    @include button-clear($button-stable-bg);
-    @include button-outline($button-stable-bg);
+    @include button-clear($button-stable-border);
+    @include button-outline($button-stable-border);
   }
 
   &.button-positive {
     @include button-style($button-positive-bg, $button-positive-border, $button-positive-active-bg, $button-positive-active-border, $button-positive-text);
-    @include button-clear($button-positive-bg);
-    @include button-outline($button-positive-bg);
+    @include button-clear($button-positive-border);
+    @include button-outline($button-positive-border);
   }
 
   &.button-calm {
     @include button-style($button-calm-bg, $button-calm-border, $button-calm-active-bg, $button-calm-active-border, $button-calm-text);
-    @include button-clear($button-calm-bg);
-    @include button-outline($button-calm-bg);
+    @include button-clear($button-calm-border);
+    @include button-outline($button-calm-border);
   }
 
   &.button-assertive {
     @include button-style($button-assertive-bg, $button-assertive-border, $button-assertive-active-bg, $button-assertive-active-border, $button-assertive-text);
-    @include button-clear($button-assertive-bg);
-    @include button-outline($button-assertive-bg);
+    @include button-clear($button-assertive-border);
+    @include button-outline($button-assertive-border);
   }
 
   &.button-balanced {
     @include button-style($button-balanced-bg, $button-balanced-border, $button-balanced-active-bg, $button-balanced-active-border, $button-balanced-text);
-    @include button-clear($button-balanced-bg);
-    @include button-outline($button-balanced-bg);
+    @include button-clear($button-balanced-border);
+    @include button-outline($button-balanced-border);
   }
 
   &.button-energized {
     @include button-style($button-energized-bg, $button-energized-border, $button-energized-active-bg, $button-energized-active-border, $button-energized-text);
-    @include button-clear($button-energized-bg);
-    @include button-outline($button-energized-bg);
+    @include button-clear($button-energized-border);
+    @include button-outline($button-energized-border);
   }
 
   &.button-royal {
     @include button-style($button-royal-bg, $button-royal-border, $button-royal-active-bg, $button-royal-active-border, $button-royal-text);
-    @include button-clear($button-royal-bg);
-    @include button-outline($button-royal-bg);
+    @include button-clear($button-royal-border);
+    @include button-outline($button-royal-border);
   }
 
   &.button-dark {
     @include button-style($button-dark-bg, $button-dark-border, $button-dark-active-bg, $button-dark-active-border, $button-dark-text);
-    @include button-clear($button-dark-bg);
-    @include button-outline($button-dark-bg);
+    @include button-clear($button-dark-border);
+    @include button-outline($button-dark-border);
   }
 }
 
@@ -144,7 +144,7 @@
 }
 
 .button-clear {
-  @include button-clear($button-default-bg);
+  @include button-clear($button-default-border);
   @include transition(opacity .1s);
   padding: 0 $button-clear-padding;
   max-height: $button-height;
@@ -158,7 +158,7 @@
 }
 
 .button-outline {
-  @include button-outline($button-default-bg);
+  @include button-outline($button-default-border);
   @include transition(opacity .1s);
   background: none;
   box-shadow: none;