From c2136421190e4c86c86b5950ceb3d4e63b1679ca Mon Sep 17 00:00:00 2001
From: Joel Glovier <jglovier@github.com>
Date: Fri, 15 Aug 2014 12:52:45 -0400
Subject: [PATCH] combine mixins and variables into on partial

---
 app/styles/_mixins.scss           |  5 -----
 app/styles/_variables.scss        |  4 ----
 app/styles/_variables_mixins.scss | 24 ++++++++++++++++++++++++
 app/styles/app.scss               |  3 +--
 4 files changed, 25 insertions(+), 11 deletions(-)
 delete mode 100644 app/styles/_mixins.scss
 delete mode 100644 app/styles/_variables.scss
 create mode 100644 app/styles/_variables_mixins.scss

diff --git a/app/styles/_mixins.scss b/app/styles/_mixins.scss
deleted file mode 100644
index 6cf34cba22..0000000000
--- a/app/styles/_mixins.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@mixin vertically_centered {
-  position: relative;
-  top: 50%;
-  margin-top: -50%;
-}
\ No newline at end of file
diff --git a/app/styles/_variables.scss b/app/styles/_variables.scss
deleted file mode 100644
index a993e9a17c..0000000000
--- a/app/styles/_variables.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-$green:                  #00bd9c;
-$green_light:            #13d8b6;
-$navy:                   #2e4359;
-$navy_drk:               #253649;
\ No newline at end of file
diff --git a/app/styles/_variables_mixins.scss b/app/styles/_variables_mixins.scss
new file mode 100644
index 0000000000..4c09e8364e
--- /dev/null
+++ b/app/styles/_variables_mixins.scss
@@ -0,0 +1,24 @@
+// Variables
+// -------------------------------------------/
+
+$green:                  #00bd9c;
+$green_light:            #13d8b6;
+$navy:                   #2e4359;
+$navy_drk:               #253649;
+
+// end variables ------------/
+
+
+// Mixins
+// -------------------------------------------/
+
+@mixin vertically_centered {
+  position: relative;
+  top: 50%;
+  margin-top: -50%;
+}
+
+@mixin transition($value) {
+  transition: $value .2s ease;
+}
+// end mixins ------------/
\ No newline at end of file
diff --git a/app/styles/app.scss b/app/styles/app.scss
index 917935a15b..83e2d0e7a4 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -1,5 +1,4 @@
-@import "mixins";
-@import "variables";
+@import "variables_mixins";
 @import "bootstrap";
 @import "bootstrap-theme";
 @import "typography";