From 8cf2cc6f78c34b8f16506e291c7993f71b3ccb32 Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Wed, 20 Mar 2013 10:42:35 -0400
Subject: [PATCH] studio - sass cleanup: local merge with master and small
 comment/organization tweaks to variables and base-styles

---
 cms/static/sass/_variables.scss | 4 ++--
 cms/static/sass/base-style.scss | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cms/static/sass/_variables.scss b/cms/static/sass/_variables.scss
index 78b6f2b221..15654fe3c4 100644
--- a/cms/static/sass/_variables.scss
+++ b/cms/static/sass/_variables.scss
@@ -15,7 +15,6 @@ $fg-min-width: 900px;
 // type
 $sans-serif: 'Open Sans', $verdana;
 $body-line-height: golden-ratio(.875em, 1);
-$error-red: rgb(253, 87, 87);
 
 // colors - new for re-org
 $black: rgb(0,0,0);
@@ -97,4 +96,5 @@ $brightGreen: rgb(22, 202, 87);
 $disabledGreen: rgb(124, 206, 153);
 $darkGreen: rgb(52, 133, 76);
 $lightBluishGrey: rgb(197, 207, 223);
-$lightBluishGrey2: rgb(213, 220, 228);
\ No newline at end of file
+$lightBluishGrey2: rgb(213, 220, 228);
+$error-red: rgb(253, 87, 87);
\ No newline at end of file
diff --git a/cms/static/sass/base-style.scss b/cms/static/sass/base-style.scss
index b092f0054b..c7ec38e756 100644
--- a/cms/static/sass/base-style.scss
+++ b/cms/static/sass/base-style.scss
@@ -46,5 +46,6 @@
 
 @import 'assets/content-types';
 
+// xblock-related
 @import 'module/module-styles.scss';
 @import 'descriptor/module-styles.scss';