From 54d612bf65ab13f954211106a17cb100a5fedc24 Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Mon, 28 Sep 2015 15:55:36 -0500
Subject: [PATCH] fix(ripple): outline colors

---
 ionic/components/button/modes/md.scss   | 19 ++++++++++++-------
 ionic/components/popup/modes/md.scss    |  1 -
 ionic/components/segment/modes/ios.scss |  4 ----
 ionic/components/tap-click/ripple.ts    | 14 +++-----------
 ionic/components/tap-click/tap-click.ts |  2 +-
 ionic/util/mixins.scss                  |  4 ----
 6 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/ionic/components/button/modes/md.scss b/ionic/components/button/modes/md.scss
index 0998a46443..568dfa6172 100644
--- a/ionic/components/button/modes/md.scss
+++ b/ionic/components/button/modes/md.scss
@@ -60,6 +60,10 @@ button,
     &.activated {
       opacity: 1;
     }
+
+    md-ripple {
+      background: rgba( red($button-color), green($button-color), blue($button-color), 0.1);
+    }
   }
 
   &[round] {
@@ -104,15 +108,16 @@ button,
 
     &[outline] {
 
+      md-ripple {
+        background: rgba( red($color-value), green($color-value), blue($color-value), 0.2);
+      }
+
       &.activated {
-
-        @if lightness(get-color($color-name, base)) > 90 {
-          $fg-color: get-color($color-name, inverse);
-        } @else {
-          $fg-color: get-color($color-name, base);
-        }
-
         opacity: 1;
+
+        md-ripple {
+          background: rgba(0, 0, 0, 0.1);
+        }
       }
     }
 
diff --git a/ionic/components/popup/modes/md.scss b/ionic/components/popup/modes/md.scss
index 3a026e9592..17bea16991 100644
--- a/ionic/components/popup/modes/md.scss
+++ b/ionic/components/popup/modes/md.scss
@@ -25,7 +25,6 @@ popup-wrapper {
 
   .button {
     min-height: 42px;
-    color: get-color('primary', base);
     font-size: 14px;
 
     &:last-child {
diff --git a/ionic/components/segment/modes/ios.scss b/ionic/components/segment/modes/ios.scss
index e28aaef046..523c44483c 100644
--- a/ionic/components/segment/modes/ios.scss
+++ b/ionic/components/segment/modes/ios.scss
@@ -11,18 +11,14 @@
 
     transition: 100ms all linear;
 
-    color: get-color(primary, base);
-
     min-height: 3.3rem;
     line-height: 3.3rem;
 
     &.active {
-      background-color: get-color(primary, base);
       color: white;
     }
 
     border-style: solid;
-    border-color: get-color(primary, base);
 
     &:first-of-type {
       border-right-width: 0px;
diff --git a/ionic/components/tap-click/ripple.ts b/ionic/components/tap-click/ripple.ts
index ceb796c3b6..f299d8b3a3 100644
--- a/ionic/components/tap-click/ripple.ts
+++ b/ionic/components/tap-click/ripple.ts
@@ -62,22 +62,14 @@ export class RippleActivator extends Activator {
       this.next();
   }
 
-  upAction() {
+  upAction(forceFadeOut) {
     this.deactivate();
 
     let ripple;
     for (let rippleId in this.ripples) {
       ripple = this.ripples[rippleId];
-      if(ripple.expand) {
-        let currentTime = ripple.expand.getCurrentTime();
 
-        // How much more time do we need to finish the radius animation?
-        // Math: (radius/second) * ((total_radius_time) - current_time)
-        ripple.expand.remainingTime = (ripple.radius / ripple.duration) *
-          ((ripple.duration / EXPAND_DOWN_PLAYBACK_RATE) - (currentTime));
-      }
-
-      if (!ripple.fade) {
+      if (!ripple.fade || forceFadeOut) {
         // ripple has not been let up yet
         // speed up the rate if the animation is still going
         setTimeout(() => {
@@ -85,7 +77,7 @@ export class RippleActivator extends Activator {
           ripple.fade = new Animation(ripple.ele);
           ripple.fade
             .fadeOut()
-            .duration(ripple.epxand && ripple.expand.remainingTime || OPACITY_OUT_DURATION)
+            .duration(OPACITY_OUT_DURATION)
             .playbackRate(1)
             .onFinish(() => {
               ripple.fade && ripple.fade.dispose();
diff --git a/ionic/components/tap-click/tap-click.ts b/ionic/components/tap-click/tap-click.ts
index 0bd058a607..09c42b12e3 100644
--- a/ionic/components/tap-click/tap-click.ts
+++ b/ionic/components/tap-click/tap-click.ts
@@ -16,7 +16,7 @@ export class TapClick {
     self.lastTouch = 0;
     self.lastActivated = 0;
     self.disableClick = 0;
-    self.disableClickLimit = 2500;
+    self.disableClickLimit = 1500;
 
     self.tapPolyfill = (config.setting('tapPolyfill') !== false);
 
diff --git a/ionic/util/mixins.scss b/ionic/util/mixins.scss
index a48ca45970..d68f842f0c 100644
--- a/ionic/util/mixins.scss
+++ b/ionic/util/mixins.scss
@@ -2,10 +2,6 @@
 // Color Functions
 // --------------------------------------------------
 
-@function get-color($color, $tone: base) {
-  @return red;
-}
-
 @function inverse($color-value) {
   @if (lightness($color-value) > 70) {
     @return #000;