From 9449518ede8a6e69152ca0fdc15d6cf200f6064e Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Sun, 22 Mar 2015 22:52:01 -0500
Subject: [PATCH] mega changes

---
 src/components/app/_colors.scss   |  7 ++++++-
 src/components/button/button.scss | 22 +++++++++++-----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/components/app/_colors.scss b/src/components/app/_colors.scss
index 9fdec9940a..1b144cc938 100644
--- a/src/components/app/_colors.scss
+++ b/src/components/app/_colors.scss
@@ -1,4 +1,9 @@
 
+// inverse: A color that looks good as a foreground to the base
+// light: A lighter tone of the base color
+// dark: A darker tone of teh base color
+
+
 $colors: (
 
   light: (
@@ -36,4 +41,4 @@ $colors: (
     dark: #000
   ),
 
-);
+) !default;
diff --git a/src/components/button/button.scss b/src/components/button/button.scss
index 122861545e..31d52eced7 100644
--- a/src/components/button/button.scss
+++ b/src/components/button/button.scss
@@ -174,6 +174,17 @@ $button-bar-button-icon-size:     20px !default;
   border-radius: 0;
 }
 
+button.button-block,
+button.button-full,
+.button-full > button.button,
+input.button.button-block  {
+  width: 100%;
+}
+
+.padding > .button.button-block:first-child {
+  margin-top: 0;
+}
+
 
 // Button Color Generation
 // --------------------------------------------------
@@ -208,14 +219,3 @@ a.button {
   pointer-events: none;
 }
 
-button.button-block,
-button.button-full,
-.button-full > button.button,
-input.button.button-block  {
-  width: 100%;
-}
-
-.padding > .button.button-block:first-child {
-  margin-top: 0;
-}
-