studio - soft landing: various fixes/tweaks

cms/static/js/base.js

@@ -63,7 +63,7 @@ $(document).ready(function() {
   });
 
   // general link management - new window/tab
-  $('a[rel="external"]').attr('title','This link will open in a new browser/window tab').click(function(e) {
+  $('a[rel="external"]').attr('title','This link will open in a new browser window/tab').click(function(e) {
     window.open($(this).attr('href'));
     e.preventDefault();
   });

cms/static/sass/_cms_mixins.scss

@@ -28,7 +28,7 @@
 		}
 	}
 
-	&:hover {
+	&:hover, &.active {
 		@include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset, 0 1px 1px rgba(0, 0, 0, .15));
 	}
 }
@@ -41,7 +41,7 @@
 	background-color: $blue;
 	color: #fff;
 
-	&:hover {
+	&:hover, &.active {
 		background-color: #62aaf5;
 		color: #fff;
 	}

cms/static/sass/_header.scss

@@ -63,12 +63,9 @@ nav .nav-item {
   vertical-align: top;
 }
 
-.branding, .info-course {
-  margin: 0 ($baseline*0.75) 0 0;
-}
-
 .branding {
   position: relative;
+  margin: 0 ($baseline*0.75) 0 0;
   padding-right: ($baseline*0.75);
 
   a {
@@ -85,7 +82,7 @@ nav .nav-item {
 // specific elements - course name/info
 .info-course {
   position: relative;
-  margin-top: -3px;
+  margin: -3px ($baseline/2) 0 0;
   padding-right: ($baseline*0.75);
   @include font-size(14);
 
@@ -475,8 +472,9 @@ nav .nav-item {
 
 .nav-item.is-current,
 body.howitworks .nav-not-signedin-hiw,
-body.signin .nav-not-signedin-signin,
-body.signup .nav-not-signedin-signup,
+
+// dashboard
+body.dashboard .nav-account-dashboard,
 
 // course content
 body.course.outline .nav-course-courseware .title,
@@ -509,10 +507,26 @@ body.course.export .nav-course-tools-export,
 
 {
 
-  color: $blue !important;
+  color: $blue;
+
+  a {
+    color: $blue;
+  }
+}
+
+body.signup .nav-not-signedin-signin {
+
+  a {
+    background-color: #d9e3ee;
+    color: #6d788b;    
+  }
+}
 
+body.signin .nav-not-signedin-signup {
+  
   a {
-    color: $blue !important;
+    background-color: #62aaf5;
+    color: #fff;    
   }
 }
 

cms/templates/widgets/footer.html

@@ -3,7 +3,7 @@
 <div class="wrapper-footer wrapper">
   <footer class="primary" role="contentinfo">
     <div class="colophon">
-      <p>&copy; 2013 <a href="http://www.edx.org" rel="external">edX</a>. All rights reversed.</p>
+      <p>&copy; 2013 <a href="http://www.edx.org" rel="external">edX</a>. All rights reserved.</p>
     </div>
     
     <nav class="nav-peripheral">

cms/templates/widgets/header.html

@@ -84,9 +84,9 @@
             <div class="wrapper wrapper-nav-sub">
               <div class="nav-sub">
                 <ul>
-                  <li class="nav-item"><a href="${reverse('course_index', kwargs=dict(org=ctx_loc.org, course=ctx_loc.course, name=ctx_loc.name))}">My Courses</a></li>
-                  <li class="nav-item"><a href="http://help.edge.edx.org/" rel="external">Help</a></li>
-                  <li class="nav-item"><a class="action action-logout" href="${reverse('logout')}">Logout</a></li>
+                  <li class="nav-item nav-account-dashboard"><a href="#">My Courses</a></li>
+                  <li class="nav-item nav-account-help"><a href="http://help.edge.edx.org/" rel="external">Studio Help</a></li>
+                  <li class="nav-item nav-account-signout"><a class="action action-signout" href="${reverse('logout')}">Sign Out</a></li>
                 </ul>
               </div>
             </div>