Merge pull request #384 from MITx/feature/tomg/fall-design

fixed course name title bar bug

lms/static/sass/base/_extends.scss

@@ -89,3 +89,9 @@
   border: 1px solid rgb(6, 65, 18);
   color: rgb(255, 255, 255);
 }
+
+.global {
+  h2 {
+    display: none;
+  }
+}

lms/static/sass/course/base/_base.scss

@@ -1,3 +1,7 @@
+body {
+  min-width: 980px;
+}
+
 body, h1, h2, h3, h4, h5, h6, p, p a:link, p a:visited, a {
   font-family: $sans-serif;
 }

lms/static/sass/course/base/_extends.scss

@@ -187,7 +187,13 @@ h1.top-header {
 }
 
 .global {
+  .find-courses-button {
+    display: none;
+  }
+
   h2 {
+    display: block;
+    width: 700px;
     float: left;
     font-size: 0.9em;
     font-weight: 600;
@@ -195,6 +201,9 @@ h1.top-header {
     letter-spacing: 0;
     text-transform: none;
     text-shadow: 0 1px 0 #fff;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
 
     .provider {
       font: inherit;

lms/templates/courseware.html

@@ -1,6 +1,5 @@
 <%inherit file="main.html" />
 <%namespace name='static' file='static_content.html'/>
-<%block name="bodyclass">courseware</%block>
 <%block name="title"><title>Courseware – MITx 6.002x</title></%block>
 
 <%block name="headextra">

lms/templates/navigation.html

@@ -7,16 +7,16 @@
 <header class="global" aria-label="Global Navigation">
   <nav>
     <h1 class="logo"><a href="${reverse('root')}"></a></h1>
-    
+
     %if course:
       <h2><span class="provider">${course.org}:</span> ${course.number} ${course.title}</h2>
-    %else:
-      <ol class="left">
+    %endif
+
+    <ol class="left find-courses-button">
       <li class="primary">
         <a href="${reverse('courses')}">Find Courses</a>
       </li>
     </ol>
-    %endif
 
   %if user.is_authenticated():
     <ol class="user">