From 6b4ab20d02681d5c2c106e83477588c7abc871df Mon Sep 17 00:00:00 2001
From: marco <marcotuts@gmail.com>
Date: Sun, 5 May 2013 14:09:59 -0700
Subject: [PATCH] styled modes header, added inactive and active mode
 visibility as well as is-set mode styling. no js behavior in yet. adds
 overscoll fix for webkit

---
 cms/static/sass/views/_unit.scss | 86 ++++++++++++++++++++------------
 cms/templates/component.html     | 17 ++++---
 2 files changed, 64 insertions(+), 39 deletions(-)

diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss
index 9e4a102d69..8ee048df24 100644
--- a/cms/static/sass/views/_unit.scss
+++ b/cms/static/sass/views/_unit.scss
@@ -434,10 +434,6 @@ body.course.unit {
       background: $lightBluishGrey2;
     }
 
-    .component-edit-menu {
-      background-color: pink;
-    }
-
     .component-editor {
       @include edit-box;
       @include box-shadow(none);
@@ -449,40 +445,50 @@ body.course.unit {
 
       .component-edit-menu {
         @include box-sizing(border-box);
-        //padding: 15px;
+        padding: 15px;
         top: 0;
         right: 0;
-        border-bottom: 1px solid $lightBluishGrey2;
-        box-shadow: 0 2px 1px rgba(182, 182, 182, 0.75) inset;
-        background-color: $white;
+        border-bottom: 1px solid $gray-l2;
+        background-color: $lightBluishGrey2;
+        box-shadow: 0 1px 2px rgba(182, 182, 182, 0.75) inset;
 
         //Component Name
-        h4 {
-          //TO-DO 
-          //determine proper h-level
+        .component-name {
+          width: 50%;
+          @include font-size(14);
+
+          em {
+            font-weight: 700;
+          }
         }
 
         //Nav-Edit Modes
         .nav-edit-modes {
           list-style: none;
+          right: 0;
+          top: 0;
+          position: absolute;
+          padding: 10px;
 
-          li {
-            //TO-DO
-            //inherit button styling
-            float: right;
-            //no idea what it currently inherits...
+          .mode {
+            display: inline-block;
 
-            &:hover {
-              //TO-DO
-              //opacity change
+            .inactive-mode {
+              display: none;
             }
 
-            &.is-active {
-              //TO-DO
-              //inherit button styling
+            .active-mode {
+              @include white-button;
+
+              &.is-set {
+                background-color: $lightBluishGrey2;
+                cursor: default;
+                linear-gradient: none;
+                @include box-shadow(0 0 1px 1px rgba(0, 0, 0, .6) inset);
+
+              }
             }
           }
-
         }
       }
 
@@ -493,25 +499,46 @@ body.course.unit {
 
       // Settings Wrapper
       .settings-wrapper{
-        //doverflow-y: scroll;
+        overflow: auto;
+        max-height: 400px;
+        //TO-DO browser testing for scrollbar, especially styles below. 
+
+        &::-webkit-scrollbar {
+          -webkit-appearance: none;
+          width: 11px;
+          height: 11px;
+        }
+
+        &::-webkit-scrollbar-thumb {
+          border-radius: 8px;
+          border: 2px solid $lightBluishGrey2;
+          background-color: rgba(0, 0, 0, .5);
+        }
 
         .settings-row {
           // general row sizing stuff
-          background-color: $lightBluishGrey2;
+          background-color: $white;
           padding: 10px;
           border-bottom: 1px solid $gray-l2;
-          opacity: .8;
+          opacity: .6;
 
           &:hover {
             opacity: 1;
           }
 
+          &.is-set {
+            opacity: .9;
+            background-color: $white;
+            font-weight: 200;
+          }
+
           .setting-label {
             font-weight: normal;  
             display: inline-block;
             padding-left: 15px;
             position: relative;
             left: 0;
+            height: 50%;
             width: 100px;
           }
 
@@ -534,11 +561,6 @@ body.course.unit {
             &:active {
               background-color: #FFFCF1;
             }
-
-            option {
-              line-height: 16px;
-
-            }
           }
 
           .setting-clear {
@@ -570,7 +592,7 @@ body.course.unit {
             @include font-size(12);
             font-color: $gray-l6;
             padding-left: 20px;
-            max-width: 50%;
+            max-width: 40%;
           }
 
         }
diff --git a/cms/templates/component.html b/cms/templates/component.html
index 6bb3b3eff9..e4e733aacf 100644
--- a/cms/templates/component.html
+++ b/cms/templates/component.html
@@ -1,21 +1,24 @@
 <div class="wrapper wrapper-component-editor">
 	<div class="component-editor">
-  		<div id="component-edit-menu">
-  			<h3 class="component-name">Viewing: Name of Component</h3>
+  		<div class="component-edit-menu">
+  			<span class="component-name"><em>Editing:</em> Name of Component</span>
   			<!--should this be a menubar/menu/tabbar instead of list? -->
   	  		<ul class="nav-edit-modes">
-  	  			<li id="editor-mode" class="mode is-active" aria-controls="editor-tab" aria-selected="true" role="tab" tabindex="0">
-  	  				<a href="#" class="button cancel-button">Editor</a>
+  	  			<li id="editor-mode" class="mode" aria-controls="editor-tab" aria-selected="true" role="tab" tabindex="0">
+  	  				<a href="#" class="active-mode is-set">Editor</a>
 	  			</li>
 	  			<li id="settings-mode" class="mode" aria-controls="settings-tab" aria-selected="false" role="tab" tabindex="-1">
-	  				<a href="#" class="button cancel-button">Settings </a>
+	  				<a href="#" class="inactive-mode">Compiler </a>
+	  			</li>
+	  			<li id="settings-mode" class="mode" aria-controls="settings-tab" aria-selected="false" role="tab" tabindex="-1">
+	  				<a href="#" class="active-mode">Settings </a>
 	  			</li>
 	  		</ul>
 		</div> <!-- Editor Header -->
 
 		<div class="component-edit-modes">
 			<div class="module-editor editor-wrapper" id="editor-tab">
-				${editor}
+				<!--${editor} -->
 				<!-- no longer are settings imported from metadata-edit.hmtl, ideally? -->
 			</div> <!-- Editor Wrapper-->
 			<ul class="settings-wrapper" id="settings-tab">
@@ -37,7 +40,7 @@
 		  			<button class="setting-clear inactive" type="button" name="setting-clear" value="Clear" data-tooltip="Clear">
 		  				<i class="ss-icon ss-symbolicons-block undo">&#x21A9;</i>
 		  			</button>
-		  			<span class="setting-help">helpstring helpstringhelpstringhelpstringhelpstringhel pstringhelpstringh elpstringhelpstrin sghelp stringhelp stringhelpstringhe lpstring helpstringhelpstringhelpstring</span>
+		  			<span class="setting-help">This is a more reasonable helpstring sentence that would alos wrap around. A second sentence in some cases may be necessary.</span>
 		  		
 		  		<!--% showing dropdown example -->
 		  		<li class="settings-row">