From 7cba7c9b41327c559d04f63327bc135eddee256f Mon Sep 17 00:00:00 2001
From: Tom Giannattasio <tom@mitx.mit.edu>
Date: Tue, 4 Dec 2012 13:49:07 -0500
Subject: [PATCH] tweaked body color and window styles; adjusting new buttons

---
 cms/static/js/base.js            |  4 ++++
 cms/static/sass/_base.scss       | 15 +++++++++++----
 cms/static/sass/_courseware.scss | 14 ++++----------
 cms/static/sass/_dashboard.scss  |  7 -------
 cms/templates/edit-tabs.html     |  7 ++++---
 cms/templates/index.html         |  2 +-
 6 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/cms/static/js/base.js b/cms/static/js/base.js
index 2efc4c6b4a..baad5b7177 100644
--- a/cms/static/js/base.js
+++ b/cms/static/js/base.js
@@ -629,11 +629,14 @@ function saveNewSection(e) {
 
 function cancelNewSection(e) {
     e.preventDefault();
+    $('.new-courseware-section-button').show();
     $(this).parents('section.new-section').remove();
 }
 
 function addNewCourse(e) {
     e.preventDefault();
+
+    $(e.target).hide();
     var $newCourse = $($('#new-course-template').html());
     var $cancelButton = $newCourse.find('.new-course-cancel');
     $('.new-course-button').after($newCourse);
@@ -674,6 +677,7 @@ function saveNewCourse(e) {
 
 function cancelNewCourse(e) {
     e.preventDefault();
+    $('.new-course-button').show();
     $(this).parents('section.new-course').remove();
 }
 
diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index 4696638af4..699ffdc653 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -6,13 +6,17 @@
 
 body {
     min-width: 980px;
-    background: #f3f4f5;
-    font-family: 'Open Sans', sans-serif;
+    background: #eaebed;
     font-size: 16px;
     line-height: 1.6;
     color: #3c3c3c;
 }
 
+body,
+input {
+    font-family: 'Open Sans', sans-serif;
+}
+
 a {
     text-decoration: none;
     color: $blue;
@@ -56,9 +60,8 @@ h1 {
 
 .window {
     background: #fff;
-    border: 1px solid $darkGrey;
     border-radius: 3px;
-    @include box-shadow(0 1px 2px rgba(0, 0, 0, .1));
+    @include box-shadow(0 1px 1px rgba(0, 0, 0, .2));
 }
 
 .sidebar {
@@ -184,6 +187,10 @@ code {
     .details {
       margin-bottom: 30px;
       font-size: 14px;
+
+      .new-button {
+        margin-right: 30px;
+      }
     }
 
     h4 {
diff --git a/cms/static/sass/_courseware.scss b/cms/static/sass/_courseware.scss
index 73b55618b6..291241b7e0 100644
--- a/cms/static/sass/_courseware.scss
+++ b/cms/static/sass/_courseware.scss
@@ -4,19 +4,13 @@ input.courseware-unit-search-input {
 	background-color: #fff;
 }
 
-.courseware-overview {
-	
-}
-
-
 .courseware-section {
 	position: relative;
 	background: #fff;
-	border: 1px solid $darkGrey;
 	border-radius: 3px;
-	margin: 10px 0;
+	margin: 15px 0;
 	padding-bottom: 12px;
-	@include box-shadow(0 1px 2px rgba(0, 0, 0, .1));
+	@include box-shadow(0 1px 1px rgba(0, 0, 0, .2));
 
 	&:first-child {
 		margin-top: 0;
@@ -205,7 +199,7 @@ input.courseware-unit-search-input {
 .new-section-name-save,
 .new-subsection-name-save {
 	@include blue-button;
-	padding: 6px 20px 8px;
+	padding: 4px 20px 7px;
 	margin: 0 5px;
 	color: #fff !important;
 }
@@ -213,7 +207,7 @@ input.courseware-unit-search-input {
 .new-section-name-cancel,
 .new-subsection-name-cancel {
 	@include white-button;
-	padding: 6px 20px 8px;
+	padding: 4px 20px 7px;
 	color: #8891a1 !important;
 }
 
diff --git a/cms/static/sass/_dashboard.scss b/cms/static/sass/_dashboard.scss
index 8821f3736c..06eb8d8a9d 100644
--- a/cms/static/sass/_dashboard.scss
+++ b/cms/static/sass/_dashboard.scss
@@ -36,13 +36,6 @@
 	}
 }
 
-.new-course-button {
-	@include grey-button;
-	display: block;
-	padding: 20px;
-	text-align: center;
-}
-
 .new-course {
 	padding: 15px 25px;
 	margin-top: 20px;
diff --git a/cms/templates/edit-tabs.html b/cms/templates/edit-tabs.html
index 41dee15a7a..bf68b2b72c 100644
--- a/cms/templates/edit-tabs.html
+++ b/cms/templates/edit-tabs.html
@@ -22,6 +22,9 @@
     </div>
     <article class="unit-body window">
       <div class="details">
+        <a href="#" class="new-button new-tab left">
+          <span class="plus-icon white"></span>New Tab
+        </a>
         <p>Here you can add and manage additional pages for your course. These pages will be added to the primary navigation menu alongside Courseware, Course Info, Discussion, etc.</p>
       </div>
       <div class="tab-list">
@@ -31,9 +34,7 @@
           % endfor
                    
           <li class="new-component-item">
-            <a href="#" class="new-button big new-tab">
-              <span class="plus-icon"></span>New Tab
-            </a>
+            
           </li>
         </ol>      
       </div>
diff --git a/cms/templates/index.html b/cms/templates/index.html
index d41bcc23ac..92987babda 100644
--- a/cms/templates/index.html
+++ b/cms/templates/index.html
@@ -37,7 +37,7 @@
 			<h1>My Courses</h1>
 			<article class="my-classes">
 				% if user.is_active:
-				<a href="#" class="new-course-button"><span class="plus-icon"></span> New Course</a>
+				<a href="#" class="new-button new-course-button"><span class="plus-icon white"></span> New Course</a>
 				<ul class="class-list">
 					%for course, url in courses:
 			    <li>