resolving merge from feature/btalbot/studio-softlanding

cms/static/sass/_account.scss

@@ -145,6 +145,13 @@ body.signup, body.signin {
             :-ms-input-placeholder {  
                color: $gray-l3; 
             }
+
+            &:focus {
+
+              + .tip {
+                color: $gray;
+              }
+            }
           }
 
           textarea.long {
@@ -163,6 +170,7 @@ body.signup, body.signin {
           }
 
           .tip {
+            @include transition(color, 0.15s, ease-in-out);
             @include font-size(13);
             display: block;
             margin-top: ($baseline/4);

cms/static/sass/_base.scss

@@ -4,6 +4,7 @@
 // basic reset
 html {
   font-size: 62.5%;
+  overflow-y: scroll;
 }
 
 body {
@@ -194,6 +195,22 @@ h1 {
         margin-bottom: 0;
       }
     }
+
+    .nav-related {
+
+      .nav-item {
+        margin-bottom: ($baseline/4);
+        border-bottom: 1px dotted $gray-l4;
+        padding-bottom: ($baseline/4);
+
+
+        &:last-child {
+          margin-bottom: 0;
+          border: none;
+          padding-bottom: 0;
+        }
+      }
+    }
   }
 }
 
@@ -605,4 +622,14 @@ body.hide-wip {
   .wip-box {
     display: none;
   }
+}
+
+// ====================
+
+// needed fudges for now
+body.dashboard {
+
+  .my-classes {
+    margin-top: $baseline;
+  }
 }

cms/static/sass/_header.scss

@@ -53,9 +53,6 @@
   float: right;
 }
 
-// general nav styles
-// ====================
-
 // ====================
 
 // specific elements - branding
@@ -66,7 +63,7 @@
 
 .branding {
   position: relative;
-  margin: 0 ($baseline*0.75) 0 0;
+  margin: 0 ($baseline/2) 0 0;
   padding-right: ($baseline*0.75);
 
   a {
@@ -109,18 +106,21 @@
     width: 1px;
   }
 
-  .course-number, .course-title {
-    display: block;
+  .course-org {
+    margin-right: ($baseline/4);
   }
 
-  .course-number {
+  .course-number, .course-org {
     @include font-size(12);
+    display: inline-block;
   }
 
   .course-title {
+    display: block;
     width: 100%;
     max-width: 220px;
     overflow: hidden;
+    margin-top: -4px;
     white-space: nowrap;
     text-overflow: ellipsis;
     @include font-size(16);
@@ -151,8 +151,12 @@
       font-weight: 600;
       color: $gray-d3;
 
-      &:hover, &:active {
+      &:hover, &:active, &.is-selected {
         color: $blue;
+
+        .icon-expand {
+          color: $blue;
+        }
       }
 
       .label-prefix {
@@ -160,14 +164,6 @@
         @include font-size(11);
         font-weight: 400;
       }
-
-      &.is-selected {
-        color: $blue-d1;
-
-        .icon-expand {
-          color: $blue-d1;
-        }
-      }
     }
 
     // specific nav items
@@ -203,11 +199,17 @@
 
     .account-username {
       display: inline-block;
+      vertical-align: middle;
       width: 80%;
       overflow: hidden;
       white-space: nowrap;
       text-overflow: ellipsis;
     }
+
+    .icon-expand {
+      display: inline-block;
+      vertical-align: middle;
+    }
   }
 }
 
@@ -222,6 +224,7 @@
     .icon-expand {
       @include font-size(14);
       @include transition (color 0.5s ease-in-out, opacity 0.5s ease-in-out);
+      display: inline-block;
       margin-left: 2px;
       opacity: 0.5;
       color: $gray-l2;
@@ -306,7 +309,7 @@
     .wrapper-nav-sub {
       top: 27px;
       left: auto;
-      right: -($baseline/2);
+      right: -13px;
       width: 110px;
     }
 
@@ -513,6 +516,7 @@ body.course.export .nav-course-tools-export,
 
   a {
     color: $blue;
+    pointer-events: none;
   }
 }
 
@@ -540,6 +544,7 @@ body.signin .nav-not-signedin-signup {
   .nav-dropdown {
 
     .nav-item .title {
+      outline: 0;
       cursor: pointer;
     }
   }

cms/static/sass/_index.scss

@@ -36,7 +36,9 @@
       color: $gray-d2;
     
       header {
-
+        border: none;
+        padding-bottom: 0;
+        margin-bottom: 0;
       }
 
       h1, h2, h3, h4, h5, h6 {
@@ -238,7 +240,6 @@
               margin-right: flex-gutter();
               padding: ($baseline*0.75) $baseline;
               color: $gray-l1;
-              cursor: pointer;
 
               .title {
                 @include font-size(16);
@@ -252,7 +253,7 @@
                 background: $blue-l5;
                 top: -($baseline/5);
 
-                .title, strong {
+                .title {
                   color: $blue;
                 }
               }

cms/static/sass/_settings.scss

@@ -47,6 +47,7 @@ body.course.settings {
 
     // UI hints/tips/messages
     .tip {
+      @include transition(color, 0.15s, ease-in-out);
       @include font-size(13);
       display: block;
       margin-top: ($baseline/4);
@@ -127,6 +128,13 @@ body.course.settings {
           &.error {
             border-color: $red;
           }
+
+          &:focus {
+
+            + .tip {
+              color: $gray;
+            }
+          }
         }
 
         textarea.long {
@@ -157,10 +165,10 @@ body.course.settings {
           @include box-sizing(border-box);
           @include border-radius(3px);
           background: $gray-l5;
-          padding: ($baseline/2);
+          padding: $baseline;
 
           &:last-child {
-            padding-bottom: ($baseline/2); 
+            padding-bottom: $baseline; 
           }
 
           .actions {