From 6ade6983aea3370c06ef580d8700a6f64f1e988f Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Thu, 14 Feb 2013 09:38:32 -0500
Subject: [PATCH] studio - page headers: added in logic to style page actions'
 height based on title having a subtitle or not

---
 cms/static/sass/_base.scss          | 10 +++++++++-
 cms/templates/asset_index.html      |  2 +-
 cms/templates/course_info.html      |  2 +-
 cms/templates/edit-tabs.html        |  2 +-
 cms/templates/export.html           |  2 +-
 cms/templates/import.html           |  2 +-
 cms/templates/index.html            |  2 +-
 cms/templates/manage_users.html     |  2 +-
 cms/templates/overview.html         |  2 +-
 cms/templates/settings.html         |  2 +-
 cms/templates/settings_graders.html |  2 +-
 11 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index 3ecbbb81e1..a22592b5d5 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -133,7 +133,7 @@ h1 {
 
       .nav-actions {
         position: relative;
-        bottom: -($baseline*1.5);
+        bottom: -($baseline*0.75);
         float: right;
         width: flex-grid(4,12);
         text-align: right;
@@ -164,6 +164,14 @@ h1 {
         }
       }
     }
+
+    // layout with actions
+    &.has-subtitle {
+
+      .nav-actions {
+        bottom: -($baseline*1.5);
+      }
+    }
   }
 
   // page metadata/action bar
diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html
index 82aa4efb91..5ace98df56 100644
--- a/cms/templates/asset_index.html
+++ b/cms/templates/asset_index.html
@@ -34,7 +34,7 @@
   </script>
 
   <div class="wrapper-mast wrapper">
-    <header class="mast has-actions">
+    <header class="mast has-actions has-subtitle">
       <div class="title">
         <span class="title-sub">Course Content</span>
         <h1 class="title-1">Files &amp; Uploads</h1>        
diff --git a/cms/templates/course_info.html b/cms/templates/course_info.html
index fa0b19d954..203173f724 100644
--- a/cms/templates/course_info.html
+++ b/cms/templates/course_info.html
@@ -43,7 +43,7 @@
 
 <%block name="content">
   <div class="wrapper-mast wrapper">
-    <header class="mast has-actions">
+    <header class="mast has-actions has-subtitle">
       <div class="title">
         <span class="title-sub">Course Content</span>
         <h1 class="title-1">Course Updates</h1>
diff --git a/cms/templates/edit-tabs.html b/cms/templates/edit-tabs.html
index d0c5db0265..5cb633b053 100644
--- a/cms/templates/edit-tabs.html
+++ b/cms/templates/edit-tabs.html
@@ -16,7 +16,7 @@
 
 <%block name="content">
 <div class="wrapper-mast wrapper">
-  <header class="mast has-actions">
+  <header class="mast has-actions has-subtitle">
     <div class="title">
       <span class="title-sub">Course Content</span>
       <h1 class="title-1">Static Pages</h1>
diff --git a/cms/templates/export.html b/cms/templates/export.html
index febdf2c50a..27045d82ce 100644
--- a/cms/templates/export.html
+++ b/cms/templates/export.html
@@ -7,7 +7,7 @@
 
 <%block name="content">
 <div class="wrapper-mast wrapper">
-  <header class="mast">
+  <header class="mast has-subtitle">
     <div class="title">
       <span class="title-sub">Tools</span>
       <h1 class="title-1">Course Export</h1>
diff --git a/cms/templates/import.html b/cms/templates/import.html
index 70c081c3bc..b0a9f04903 100644
--- a/cms/templates/import.html
+++ b/cms/templates/import.html
@@ -7,7 +7,7 @@
 
 <%block name="content">
 <div class="wrapper-mast wrapper">
-  <header class="mast">
+  <header class="mast has-subtitle">
     <div class="title">
       <span class="title-sub">Tools</span>
       <h1 class="title-1">Course Import</h1>
diff --git a/cms/templates/index.html b/cms/templates/index.html
index 2b6cd5913e..50d8933484 100644
--- a/cms/templates/index.html
+++ b/cms/templates/index.html
@@ -45,7 +45,7 @@
         <ul>
           <li class="nav-item">
             % if not disable_course_creation:
-              <a href="#" class="new-button new-course-button"><span class="plus-icon white"></span> New Course</a>
+              <a href="#" class="button new-button new-course-button"><i class="ss-icon ss-symbolicons-standard icon icon-create">&#x002B;</i> New Course</a>
             % endif
           </li>
         </ul>
diff --git a/cms/templates/manage_users.html b/cms/templates/manage_users.html
index 2a8dea4c88..722e756203 100644
--- a/cms/templates/manage_users.html
+++ b/cms/templates/manage_users.html
@@ -5,7 +5,7 @@
 
 <%block name="content">
 <div class="wrapper-mast wrapper">
-  <header class="mast has-actions">
+  <header class="mast has-actions has-subtitle">
     <div class="title">
       <span class="title-sub">Course Settings</span>
       <h1 class="title-1">Course Team</h1>
diff --git a/cms/templates/overview.html b/cms/templates/overview.html
index 565c8c760f..dc7fe2506e 100644
--- a/cms/templates/overview.html
+++ b/cms/templates/overview.html
@@ -121,7 +121,7 @@
   </div>
 
   <div class="wrapper-mast wrapper">
-    <header class="mast has-actions">
+    <header class="mast has-actions has-subtitle">
       <div class="title">
         <span class="title-sub">Course Content</span>
         <h1 class="title-1">Course Outline</h1>
diff --git a/cms/templates/settings.html b/cms/templates/settings.html
index 0e9bebef9f..92d5d5d99a 100644
--- a/cms/templates/settings.html
+++ b/cms/templates/settings.html
@@ -43,7 +43,7 @@ from contentstore import utils
 
 <%block name="content">
 <div class="wrapper-mast wrapper">
-  <header class="mast">
+  <header class="mast has-subtitle">
     <div class="title">
       <span class="title-sub">Settings</span>
       <h1 class="title-1">Schedule &amp; Details</h1>
diff --git a/cms/templates/settings_graders.html b/cms/templates/settings_graders.html
index 7a9cac9c7a..c53a7af834 100644
--- a/cms/templates/settings_graders.html
+++ b/cms/templates/settings_graders.html
@@ -40,7 +40,7 @@ from contentstore import utils
 
 <%block name="content">
 <div class="wrapper-mast wrapper">
-  <header class="mast">
+  <header class="mast has-subtitle">
     <div class="title">
       <span class="title-sub">Settings</span>
       <h1 class="title-1">Grading</h1>