From c2b7a0c75d2ebf7345363372a4e7d1396d90ce01 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Fri, 20 Nov 2015 13:25:04 -0500
Subject: [PATCH] refactor(sass): renaming Sass variables in each loops to be
 consistent

closes #603
---
 ionic/components/app/typography.scss        | 8 ++++----
 ionic/components/button/button-outline.scss | 8 ++++----
 ionic/components/button/button.scss         | 8 ++++----
 ionic/components/searchbar/modes/ios.scss   | 7 ++++---
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/ionic/components/app/typography.scss b/ionic/components/app/typography.scss
index f1f3847fc4..5660d41cea 100644
--- a/ionic/components/app/typography.scss
+++ b/ionic/components/app/typography.scss
@@ -101,7 +101,7 @@ sub {
   bottom: -0.25em;
 }
 
-@each $color, $value in $colors {
+@each $color-name, $color-value in $colors {
   h1, h2, h3, h4, h5, h6,
   p,
   span,
@@ -114,8 +114,8 @@ sub {
   em,
   sub,
   sup {
-     &[#{$color}] {
-        color: $value !important;
-     }
+    &[#{$color-name}] {
+      color: $color-value !important;
+    }
   }
 }
diff --git a/ionic/components/button/button-outline.scss b/ionic/components/button/button-outline.scss
index cf280ccc84..128b05cff9 100644
--- a/ionic/components/button/button-outline.scss
+++ b/ionic/components/button/button-outline.scss
@@ -42,12 +42,12 @@ button,
 // Outline Clear Button Colors
 // --------------------------------------------------
 
-@each $color, $value in auxiliary-colors() {
+@each $color-name, $color-value in auxiliary-colors() {
 
-  button[#{$color}],
-  [button][#{$color}] {
+  button[#{$color-name}],
+  [button][#{$color-name}] {
 
-    $fg-color: darken-or-lighten($value, 5%);
+    $fg-color: darken-or-lighten($color-value, 5%);
     @include button-outline($fg-color);
 
   }
diff --git a/ionic/components/button/button.scss b/ionic/components/button/button.scss
index 487944937f..3d37473677 100644
--- a/ionic/components/button/button.scss
+++ b/ionic/components/button/button.scss
@@ -142,12 +142,12 @@ a[button] {
 // Generate Default Button Colors
 // --------------------------------------------------
 
-@each $color, $value in $colors {
+@each $color-name, $color-value in $colors {
 
-  button[#{$color}],
-  [button][#{$color}] {
+  button[#{$color-name}],
+  [button][#{$color-name}] {
 
-    $bg-color: $value;
+    $bg-color: $color-value;
     $bg-color-activated: darken-or-lighten($bg-color);
     $text-color: inverse($bg-color);
     @include button-default($bg-color, $bg-color-activated, $text-color);
diff --git a/ionic/components/searchbar/modes/ios.scss b/ionic/components/searchbar/modes/ios.scss
index b04333da39..7493c4703f 100644
--- a/ionic/components/searchbar/modes/ios.scss
+++ b/ionic/components/searchbar/modes/ios.scss
@@ -129,12 +129,13 @@ ion-searchbar.left-align {
 // Generate Default Search Bar Colors
 // --------------------------------------------------
 
-@each $color, $value in $colors {
+@each $color-name, $color-value in $colors {
 
-  ion-searchbar[#{$color}] {
+  ion-searchbar[#{$color-name}] {
 
     .searchbar-cancel {
-      color: $value;
+      color: $color-value;
     }
   }
+  
 }