From e9a2413c0483f0b15dff6882f015777ccfd9dbba Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Fri, 8 Mar 2013 12:35:28 -0500
Subject: [PATCH] studio - further small cleanup on Sass

---
 cms/static/sass/base-style.scss           | 46 +++++++++++------------
 cms/static/sass/elements/_header.scss     |  4 ++
 cms/static/sass/elements/_navigation.scss |  7 ----
 3 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/cms/static/sass/base-style.scss b/cms/static/sass/base-style.scss
index 33b312d235..4b9edea40c 100644
--- a/cms/static/sass/base-style.scss
+++ b/cms/static/sass/base-style.scss
@@ -9,39 +9,39 @@
 
 // utilities
 @import 'mixins';
-@import "variables";
-@import "cms_mixins";
+@import 'variables';
+@import 'cms_mixins';
 
 // assets
-@import "assets/fonts";
-@import "assets/graphics";
+@import 'assets/fonts';
+@import 'assets/graphics';
 @import 'assets/keyframes';
 
 // base
-@import "base";
+@import 'base';
 
 // elements
-@import "elements/header";
-@import "elements/footer";
-@import "elements/navigation";
-@import "elements/modal";
-@import "elements/alerts";
+@import 'elements/header';
+@import 'elements/footer';
+@import 'elements/navigation';
+@import 'elements/modal';
+@import 'elements/alerts';
 @import 'elements/jquery-ui-calendar';
 
 // specific views
-@import "views/account";
-@import "views/assets";
-@import "views/updates";
-@import "views/dashboard";
-@import "views/export";
-@import "views/index";
-@import "views/import";
-@import "views/outline";
-@import "views/settings";
-@import "views/static-pages";
-@import "views/subsection";
-@import "views/unit";
-@import "views/users";
+@import 'views/account';
+@import 'views/assets';
+@import 'views/updates';
+@import 'views/dashboard';
+@import 'views/export';
+@import 'views/index';
+@import 'views/import';
+@import 'views/outline';
+@import 'views/settings';
+@import 'views/static-pages';
+@import 'views/subsection';
+@import 'views/unit';
+@import 'views/users';
 
 @import 'assets/content-types';
 
diff --git a/cms/static/sass/elements/_header.scss b/cms/static/sass/elements/_header.scss
index 1e09184801..432e78895a 100644
--- a/cms/static/sass/elements/_header.scss
+++ b/cms/static/sass/elements/_header.scss
@@ -29,6 +29,10 @@
     margin: 0 auto;
     color: $gray-l1;
   }
+
+  nav .nav-item {
+    display: inline-block;
+  }
 }
 
 // ====================
diff --git a/cms/static/sass/elements/_navigation.scss b/cms/static/sass/elements/_navigation.scss
index 8c123db64f..066c47298b 100644
--- a/cms/static/sass/elements/_navigation.scss
+++ b/cms/static/sass/elements/_navigation.scss
@@ -6,13 +6,6 @@
 // ====================
 
 // primary
-nav.primary {
-
-  .nav-item {
-    display: inline-block;
-  }
-}
-
 
 // ====================