From e237cdca842d00127445ff0d678942de7f2f6ce4 Mon Sep 17 00:00:00 2001
From: Frances Botsford <frances@edx.org>
Date: Tue, 28 May 2013 14:32:18 -0400
Subject: [PATCH] round 2 on html and sass for textbook upload

---
 cms/static/sass/elements/_controls.scss | 20 -----------------
 cms/static/sass/views/_textbooks.scss   | 29 +++++++++++++++++++------
 cms/templates/js/chapter.underscore     |  2 +-
 cms/templates/js/textbook.underscore    |  2 +-
 common/static/sass/_mixins.scss         |  9 --------
 5 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/cms/static/sass/elements/_controls.scss b/cms/static/sass/elements/_controls.scss
index 2bddbbc0a0..8de152892e 100644
--- a/cms/static/sass/elements/_controls.scss
+++ b/cms/static/sass/elements/_controls.scss
@@ -133,27 +133,7 @@
   }
 }
 
-// blue small/inline button
-.btn-flat-blue {
-  @extend .btn-flat;
-  color: $white;
-  background-color: $blue;
 
-  &:hover, &:active {
-    background: $blue-l4;
-    color: $blue-s2;
-  }
-
-  &.current, &.active {
-    border-color: $blue-l3;
-    background: $blue-l3;
-    color: $blue-d1;
-
-    &:hover, &:active {
-
-    }
-  }
-}
 
 // ====================
 
diff --git a/cms/static/sass/views/_textbooks.scss b/cms/static/sass/views/_textbooks.scss
index 26f4b1c4e1..c9d604eb14 100644
--- a/cms/static/sass/views/_textbooks.scss
+++ b/cms/static/sass/views/_textbooks.scss
@@ -16,12 +16,13 @@ body.course.textbooks {
         margin-top: $baseline;
 
         .action-add-chapter {
-            @extend .btn-flat-blue;
             @extend .t-action2;
+            @include grey-button;
             @include transition(all .15s);
             display: block;
             width: 100%;
             margin-bottom: ($baseline*1.5);
+            border: 1px solid #B3C4DA;
             padding: ($baseline/5) $baseline;
             font-weight: 600;
         }
@@ -31,7 +32,7 @@ body.course.textbooks {
           @extend .t-action2;
           @include transition(all .15s);
           display: inline-block;
-          padding: ($baseline/5) $baseline ($baseline/4) $baseline;
+          padding: ($baseline/5) $baseline;
           font-weight: 600;
           text-transform: uppercase;
         }
@@ -41,12 +42,25 @@ body.course.textbooks {
           @extend .t-action2;
           @include transition(all .15s);
           display: inline-block;
-          padding: ($baseline/5) $baseline ($baseline/4) $baseline;
+          padding: ($baseline/5) $baseline;
           font-weight: 600;
           text-transform: uppercase;
         }
 
 
+      }
+
+      .copy {
+        @include font-size(12);
+        margin: ($baseline) 0 ($baseline/2) 0;
+        color: $gray;
+
+
+        strong {
+          font-weight: 600;
+        }
+
+
       }
 
       .list-input {
@@ -155,7 +169,7 @@ body.course.textbooks {
 
           .field {
             display: block;
-            width: 46%;
+            width: 46.5%;
             border-bottom: none;
             margin: 0 $baseline 0 0;
             padding: ($baseline/4) 0 0 0;
@@ -168,14 +182,15 @@ body.course.textbooks {
 
             .action-uploadasset {
                 @extend .t-action4;
-                @extend .btn-flat-blue;
+                @include blue-button;
                 @include transition(all .15s);
+                @include font-size(12);
                 font-weight: 600;
                 text-align: center;
                 position: absolute;
-                top: 0;
+                top: 2px;
                 right: 0;
-                padding: ($baseline/5) ($baseline/2) ($baseline/10) ($baseline/2);
+                padding: 3px ($baseline/2) 1px ($baseline/2);
             }
 
           }
diff --git a/cms/templates/js/chapter.underscore b/cms/templates/js/chapter.underscore
index 9cdf4fd76f..af3398154a 100644
--- a/cms/templates/js/chapter.underscore
+++ b/cms/templates/js/chapter.underscore
@@ -7,7 +7,7 @@
   <div class="input-wrap field text required field-add-chapter-asset chapter<%= order %>-asset">
     <label for="chapter<%= order %>-asset-path"><%= gettext("Chapter Asset") %>:</label>
     <input id="chapter<%= order %>-asset-path" name="chapter<%= order %>-asset-path" placeholder="<%= _.str.sprintf(gettext("path/to/introductionToCookieBaking-CH%d.pdf"), order) %>" value="<%= asset_path %>" type="text">
-    <span class="tip tip-stacked"><%= gettext("provide the path for a file or asset already added to this course") %></span>
+    <span class="tip tip-stacked"><%= gettext("provide the path to a file added to this course or upload a new one") %></span>
   <button class="action action-uploadasset"><%= gettext("Upload Asset") %></button>
   </div>
   <a class="action action-close"><i class="icon-remove-sign"></i> <span class="sr">delete chapter</span></a>
diff --git a/cms/templates/js/textbook.underscore b/cms/templates/js/textbook.underscore
index 25dda42b26..2b955fd5e5 100644
--- a/cms/templates/js/textbook.underscore
+++ b/cms/templates/js/textbook.underscore
@@ -14,7 +14,7 @@
         <ol class="chapters list-input enum"></ol>
        </li>
     </ol>
-  <p><%= gettext("Note: <strong>It's best practice to break your course's textbook into multiple chapters</strong> to reduce loading times for students. Breaking up textbooks into chapters can also help with students more easily finding a concept or topic-based information.") %></p>
+  <p class="copy"><%= gettext("Note: <strong>It's best practice to break your course's textbook into multiple chapters</strong> to reduce loading times for students. Breaking up textbooks into chapters can also help with students more easily finding a concept or topic-based information.") %></p>
   </fieldset>
   <div class="actions">
     <button class="action action-add-chapter"><%= gettext("Add a Chapter") %></button>
diff --git a/common/static/sass/_mixins.scss b/common/static/sass/_mixins.scss
index f947d05f1e..96f5170d9b 100644
--- a/common/static/sass/_mixins.scss
+++ b/common/static/sass/_mixins.scss
@@ -205,12 +205,3 @@
   padding:($baseline/5) $baseline/2;
   line-height: 1.3;
   text-align: center;
-
-  &:hover, &:active {
-
-  }
-
-  &.current, &.active {
-
-  }
-}