From 32f154d7fb69e3d93dbdc2477cdff2b4a3159b9f Mon Sep 17 00:00:00 2001
From: Kyle Fiedler <kfiedler@thoughtbot.com>
Date: Wed, 25 Apr 2012 14:19:42 -0400
Subject: [PATCH] Added new styles for amplifier

---
 static/css/application.css                 | 192 ++++++++++++++-----
 templates/sass/courseware/_amplifier.scss  | 207 ++++++++++++---------
 templates/sass/courseware/_courseware.scss |  20 +-
 3 files changed, 292 insertions(+), 127 deletions(-)

diff --git a/static/css/application.css b/static/css/application.css
index 3502587ae5..e5427b3b8e 100644
--- a/static/css/application.css
+++ b/static/css/application.css
@@ -117,7 +117,7 @@ input, select {
   font-weight: 800;
   font-style: italic; }
 
-.clearfix:after, .topbar:after, nav.sequence-nav:after, div.book-wrapper section.book nav:after, div.wiki-wrapper section.wiki-body header:after, html body section.main-content:after, html body section.outside-app:after, div.header-wrapper header:after, div.header-wrapper header hgroup:after, div.header-wrapper header nav ul:after, footer:after, li.calc-main div#calculator_wrapper form:after, li.calc-main div#calculator_wrapper form div.input-wrapper:after, div.leanModal_box#enroll ol:after, div.course-wrapper section.course-content .problem-set:after, div.course-wrapper section.course-content section.problems-wrapper:after, div.course-wrapper section.course-content div#seq_content:after, div.course-wrapper section.course-content ol.vert-mod > li:after, section.course-content div.video-subtitles div.video-wrapper section.video-controls:after, section.course-content div.video-subtitles div.video-wrapper section.video-controls div#slider:after, section.course-content nav.sequence-bottom ul:after, div#graph-container:after, div#schematic-container:after, div.book-wrapper section.book nav ul:after, div.info-wrapper section.updates > ol > li:after, div.info-wrapper section.handouts ol li:after, div.profile-wrapper section.course-info header:after, div.profile-wrapper section.course-info > ol > li:after, div#wiki_panel div#wiki_create_form:after, div.wiki-wrapper section.wiki-body:after, ul.badge-list li.badge:after {
+.clearfix:after, .topbar:after, nav.sequence-nav:after, div.book-wrapper section.book nav:after, div.wiki-wrapper section.wiki-body header:after, html body section.main-content:after, html body section.outside-app:after, div.header-wrapper header:after, div.header-wrapper header hgroup:after, div.header-wrapper header nav ul:after, footer:after, li.calc-main div#calculator_wrapper form:after, li.calc-main div#calculator_wrapper form div.input-wrapper:after, div.leanModal_box#enroll ol:after, div.course-wrapper section.course-content .problem-set:after, div.course-wrapper section.course-content section.problems-wrapper:after, div.course-wrapper section.course-content div#seq_content:after, div.course-wrapper section.course-content ol.vert-mod > li:after, section.course-content div.video-subtitles div.video-wrapper section.video-controls:after, section.course-content div.video-subtitles div.video-wrapper section.video-controls div#slider:after, section.course-content nav.sequence-bottom ul:after, section.tool-wrapper:after, section.tool-wrapper div#controlls-container:after, section.tool-wrapper div#controlls-container div.graph-controls:after, div.book-wrapper section.book nav ul:after, div.info-wrapper section.updates > ol > li:after, div.info-wrapper section.handouts ol li:after, div.profile-wrapper section.course-info header:after, div.profile-wrapper section.course-info > ol > li:after, div#wiki_panel div#wiki_create_form:after, div.wiki-wrapper section.wiki-body:after, ul.badge-list li.badge:after {
   content: ".";
   display: block;
   height: 0;
@@ -2848,6 +2848,26 @@ div.course-wrapper section.course-content div.ui-slider a.ui-slider-handle {
 div.course-wrapper section.course-content div.ui-slider a.ui-slider-handle:hover, div.course-wrapper section.course-content div.ui-slider a.ui-slider-handle:focus {
   background-color: #bf4040;
   outline: none; }
+div.course-wrapper section.course-content div.ui-tabs {
+  border: 0;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  -ms-border-radius: 0;
+  -o-border-radius: 0;
+  border-radius: 0;
+  margin: 0;
+  padding: 0; }
+div.course-wrapper section.course-content div.ui-tabs .ui-tabs-nav {
+  background: none;
+  border: 0;
+  margin-bottom: 11.326px; }
+div.course-wrapper section.course-content div.ui-tabs .ui-tabs-panel {
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  -ms-border-radius: 0;
+  -o-border-radius: 0;
+  border-radius: 0;
+  padding: 0; }
 div.course-wrapper.closed section.course-index {
   width: 3.077%; }
 div.course-wrapper.closed section.course-index header#open_close_accordion {
@@ -3770,64 +3790,150 @@ section.course-content nav.sequence-bottom ul li.next a {
 section.course-content nav.sequence-bottom ul li.next a:hover {
   background-color: none; }
 
-div#graph-container {
-  border-top: 1px solid #ddd;
-  padding-top: 22.652px; }
-div#graph-container canvas#graph {
+section.tool-wrapper {
+  background: #073642;
+  border-top: 1px solid #00171c;
+  border-bottom: 1px solid #00171c;
+  -webkit-box-shadow: inset 0 0 0 4px #084150;
+  -moz-box-shadow: inset 0 0 0 4px #084150;
+  box-shadow: inset 0 0 0 4px #084150;
+  margin: 22.652px -22.652px;
+  padding: 22.652px;
+  color: #839496; }
+section.tool-wrapper div#graph-container {
+  width: 48.641%;
+  margin-right: 2.717%;
+  float: left; }
+section.tool-wrapper div#graph-container canvas {
+  width: 100%; }
+section.tool-wrapper div#controlls-container {
   width: 48.641%;
   float: left;
-  margin-right: 2.717%; }
-div#graph-container div.graph-controls {
-  width: 48.641%;
-  float: left; }
-div#graph-container div.graph-controls select#musicTypeSelect {
-  display: block;
+  padding-bottom: 22.652px; }
+section.tool-wrapper div#controlls-container div.graph-controls {
+  padding: 45.304px 0 33.978px;
+  border-bottom: 1px solid #05232b;
   margin-bottom: 22.652px; }
-div#graph-container div.graph-controls div#graph-output {
-  display: block;
-  margin-bottom: 22.652px; }
-div#graph-container div.graph-controls div#graph-listen {
-  display: block;
-  margin-bottom: 22.652px; }
-div#graph-container div.graph-controls p {
-  margin-bottom: 11.326px; }
-div#graph-container div.graph-controls div#label {
-  display: inline-block; }
-div#graph-container div.graph-controls input#playButton {
-  display: block; }
-
-div#schematic-container canvas {
-  width: 48.641%;
+section.tool-wrapper div#controlls-container div.graph-controls div.music-wrapper, section.tool-wrapper div#controlls-container div.graph-controls div.inputs-wrapper {
   float: left;
-  margin-right: 2.717%; }
-div#schematic-container div.schematic-sliders {
-  width: 48.641%;
-  float: left; }
-div#schematic-container div.schematic-sliders div.slider-label#vs {
-  margin-top: 45.304px; }
-div#schematic-container div.schematic-sliders div.slider-label {
-  margin-bottom: 11.326px; }
-div#schematic-container div.schematic-sliders div.slider {
+  width: 47.207%; }
+section.tool-wrapper div#controlls-container div.graph-controls div.music-wrapper {
+  margin-right: 5.587%; }
+section.tool-wrapper div#controlls-container div.graph-controls div.inputs-wrapper {
+  padding-top: 11.326px; }
+section.tool-wrapper div#controlls-container div.graph-controls select#musicTypeSelect {
+  display: block;
   margin-bottom: 22.652px; }
-
-div.graph-controls label, div#graph-listen label {
+section.tool-wrapper div#controlls-container div.graph-controls div#graph-output, section.tool-wrapper div#controlls-container div.graph-controls div#graph-listen {
+  display: block;
+  margin-bottom: 11.326px; }
+section.tool-wrapper div#controlls-container div.graph-controls div#graph-output p, section.tool-wrapper div#controlls-container div.graph-controls div#graph-listen p {
+  display: -moz-inline-box;
+  -moz-box-orient: vertical;
+  display: inline-block;
+  vertical-align: baseline;
+  zoom: 1;
+  *display: inline;
+  *vertical-align: auto;
+  margin: 0; }
+section.tool-wrapper div#controlls-container div.graph-controls div#graph-output ul, section.tool-wrapper div#controlls-container div.graph-controls div#graph-listen ul {
+  display: -moz-inline-box;
+  -moz-box-orient: vertical;
+  display: inline-block;
+  vertical-align: baseline;
+  zoom: 1;
+  *display: inline;
+  *vertical-align: auto;
+  margin-bottom: 0; }
+section.tool-wrapper div#controlls-container div.graph-controls div#graph-output ul li, section.tool-wrapper div#controlls-container div.graph-controls div#graph-listen ul li {
+  display: -moz-inline-box;
+  -moz-box-orient: vertical;
+  display: inline-block;
+  vertical-align: baseline;
+  zoom: 1;
+  *display: inline;
+  *vertical-align: auto;
+  margin-bottom: 0; }
+section.tool-wrapper div#controlls-container div.graph-controls input#playButton {
+  display: block;
+  border: 1px solid #13649d;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  -ms-border-radius: 3px;
+  -o-border-radius: 3px;
+  border-radius: 3px;
+  -webkit-box-shadow: inset 0 1px 0 0 #69acdb;
+  -moz-box-shadow: inset 0 1px 0 0 #69acdb;
+  box-shadow: inset 0 1px 0 0 #69acdb;
+  color: white;
+  display: inline;
+  font-size: 11px;
+  font-weight: bold;
+  background-color: #268bd2;
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #268bd2), color-stop(100%, #156dab));
+  background-image: -webkit-linear-gradient(top, #268bd2, #156dab);
+  background-image: -moz-linear-gradient(top, #268bd2, #156dab);
+  background-image: -ms-linear-gradient(top, #268bd2, #156dab);
+  background-image: -o-linear-gradient(top, #268bd2, #156dab);
+  background-image: linear-gradient(top, #268bd2, #156dab);
+  padding: 6px 18px 7px;
+  text-shadow: 0 1px 0 #0c5a90;
+  -webkit-background-clip: padding-box;
+  font: bold 14px "Open Sans", "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif; }
+section.tool-wrapper div#controlls-container div.graph-controls input#playButton:hover {
+  -webkit-box-shadow: inset 0 1px 0 0 #3f96d2;
+  -moz-box-shadow: inset 0 1px 0 0 #3f96d2;
+  box-shadow: inset 0 1px 0 0 #3f96d2;
+  cursor: pointer;
+  background-color: #277cb8;
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #277cb8), color-stop(100%, #14649d));
+  background-image: -webkit-linear-gradient(top, #277cb8, #14649d);
+  background-image: -moz-linear-gradient(top, #277cb8, #14649d);
+  background-image: -ms-linear-gradient(top, #277cb8, #14649d);
+  background-image: -o-linear-gradient(top, #277cb8, #14649d);
+  background-image: linear-gradient(top, #277cb8, #14649d); }
+section.tool-wrapper div#controlls-container div.graph-controls input#playButton:active {
+  border: 1px solid #13649d;
+  -webkit-box-shadow: inset 0 0 8px 4px #135b8e, inset 0 0 8px 4px #135b8e, 0 1px 1px 0 #eeeeee;
+  -moz-box-shadow: inset 0 0 8px 4px #135b8e, inset 0 0 8px 4px #135b8e, 0 1px 1px 0 #eeeeee;
+  box-shadow: inset 0 0 8px 4px #135b8e, inset 0 0 8px 4px #135b8e, 0 1px 1px 0 #eeeeee; }
+section.tool-wrapper div#controlls-container label {
   -webkit-border-radius: 2px;
   -moz-border-radius: 2px;
   -ms-border-radius: 2px;
   -o-border-radius: 2px;
   border-radius: 2px;
   font-weight: bold;
-  padding: 3px; }
-div.graph-controls label[for="vinCheckbox"], div.graph-controls label[for="vinRadioButton"], div#graph-listen label[for="vinCheckbox"], div#graph-listen label[for="vinRadioButton"] {
+  padding: 3px;
+  color: #fff; }
+section.tool-wrapper div#controlls-container label[for="vinCheckbox"], section.tool-wrapper div#controlls-container label[for="vinRadioButton"] {
   color: #409fbf; }
-div.graph-controls label[for="voutCheckbox"], div.graph-controls label[for="voutRadioButton"], div#graph-listen label[for="voutCheckbox"], div#graph-listen label[for="voutRadioButton"] {
+section.tool-wrapper div#controlls-container label[for="voutCheckbox"], section.tool-wrapper div#controlls-container label[for="voutRadioButton"] {
   color: #e1a600; }
-div.graph-controls label[for="vrCheckbox"], div.graph-controls label[for="vrRadioButton"], div#graph-listen label[for="vrCheckbox"], div#graph-listen label[for="vrRadioButton"] {
+section.tool-wrapper div#controlls-container label[for="vrCheckbox"], section.tool-wrapper div#controlls-container label[for="vrRadioButton"] {
   color: #49c944; }
-div.graph-controls label[for="vcCheckbox"], div.graph-controls label[for="vcRadioButton"], div#graph-listen label[for="vcCheckbox"], div#graph-listen label[for="vcRadioButton"] {
+section.tool-wrapper div#controlls-container label[for="vcCheckbox"], section.tool-wrapper div#controlls-container label[for="vcRadioButton"] {
   color: #e1a600; }
-div.graph-controls label[for="vlCheckbox"], div.graph-controls label[for="vlRadioButton"], div#graph-listen label[for="vlCheckbox"], div#graph-listen label[for="vlRadioButton"] {
+section.tool-wrapper div#controlls-container label[for="vlCheckbox"], section.tool-wrapper div#controlls-container label[for="vlRadioButton"] {
   color: #a26784; }
+section.tool-wrapper div#controlls-container div.schematic-sliders div.slider-label#vs {
+  margin-top: 45.304px; }
+section.tool-wrapper div#controlls-container div.schematic-sliders div.slider-label {
+  margin-bottom: 11.326px; }
+section.tool-wrapper div#controlls-container div.schematic-sliders div.slider {
+  margin-bottom: 22.652px; }
+section.tool-wrapper div#controlls-container div.schematic-sliders div.slider.ui-slider-horizontal {
+  height: 0.4em;
+  background: #002b36;
+  border: 1px solid #00171c;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none; }
+section.tool-wrapper div#controlls-container div.schematic-sliders div.slider .ui-slider-handle {
+  background-color: #dc322f;
+  margin-top: -0.3em; }
+section.tool-wrapper div#controlls-container div.schematic-sliders div.slider .ui-slider-handle:hover, section.tool-wrapper div#controlls-container div.schematic-sliders div.slider .ui-slider-handle:active {
+  background-color: #e04845; }
 
 div.book-wrapper section.book-sidebar {
   -webkit-box-sizing: border-box;
diff --git a/templates/sass/courseware/_amplifier.scss b/templates/sass/courseware/_amplifier.scss
index 6bae79fd21..7a94216fc9 100644
--- a/templates/sass/courseware/_amplifier.scss
+++ b/templates/sass/courseware/_amplifier.scss
@@ -1,101 +1,142 @@
 // JM MOSFET AMPLIFIER
-div#graph-container {
-  @extend .clearfix;
-  border-top: 1px solid #ddd;
-  padding-top: lh(1.0);
-   
-  canvas#graph {
-    width: flex-grid(4.5, 9);
-    float: left;
-    margin-right: flex-gutter(9); 
-  }
-
-  div.graph-controls {
-    width: flex-grid(4.5, 9);
-    float: left;
-
-    select#musicTypeSelect {
-      display: block;
-      margin-bottom: lh();
-    }
-
-    div#graph-output {
-      display: block;
-      margin-bottom: lh();
-    }
-
-    div#graph-listen {
-      display: block;
-      margin-bottom: lh();
-    }
-
-    p {
-      margin-bottom: lh(.5);
-    }
-
-    div#label {
-      display: inline-block;
-    }
-
-    input#playButton {
-      display: block;
-    }
-  }
-}
-
-div#schematic-container {
+section.tool-wrapper {
+  background: #073642;
+  border-top: 1px solid darken(#002b36, 5%);
+  border-bottom: 1px solid darken(#002b36, 5%);
+  @include box-shadow(inset 0 0 0 4px darken(#094959, 2%));
+  margin: lh() (-(lh()));
+  padding: lh();
+  color: #839496;
   @extend .clearfix;
 
-  canvas {
-    width: flex-grid(4.5, 9);
-    float: left;
-    margin-right: flex-gutter(9); 
-  }
-
-  div.schematic-sliders {
+  div#graph-container {
     width: flex-grid(4.5, 9);
+    margin-right: flex-gutter(9);
     float: left;
 
-    div.slider-label#vs {
-      margin-top: lh(2.0);
-    }
-
-    div.slider-label {
-      margin-bottom: lh(0.5);
-    }
-
-    div.slider {
-      margin-bottom: lh(1);
+    canvas {
+      width: 100%;
     }
   }
-}
-//End JM MOSFET AMPLIFIER
 
-// Labels
-div.graph-controls, div#graph-listen {
+  div#controlls-container {
+    @extend .clearfix;
+    width: flex-grid(4.5, 9);
+    float: left;
+    padding-bottom: lh();
 
-  label {
-    @include border-radius(2px);
-    font-weight: bold;
-    padding: 3px;
-  }
-  //MOSFET AMPLIFIER
-  label[for="vinCheckbox"], label[for="vinRadioButton"]{
+    div.graph-controls {
+      padding: lh(2) 0 lh(1.5);
+      border-bottom: 1px solid darken(#073642, 5%);
+      margin-bottom: lh();
+      @extend .clearfix;
+
+      div.music-wrapper, div.inputs-wrapper {
+        float: left;
+        width: flex-grid(2.25, 4.5);
+      }
+
+      div.music-wrapper {
+        margin-right: flex-gutter(4.5);
+      }
+
+      div.inputs-wrapper {
+        padding-top: lh(.5);
+      }
+
+      select#musicTypeSelect {
+        display: block;
+        margin-bottom: lh();
+      }
+
+      div#graph-output, div#graph-listen {
+        display: block;
+        margin-bottom: lh(.5);
+
+        p {
+          @include inline-block();
+          margin: 0;
+        }
+
+        ul {
+          @include inline-block();
+          margin-bottom: 0;
+
+          li {
+            @include inline-block();
+            margin-bottom: 0;
+          }
+        }
+      }
+
+      input#playButton {
+        display: block;
+        @include button(simple, #268bd2);
+        font: bold 14px $body-font-family;
+      }
+    }
+
+    label {
+      @include border-radius(2px);
+      font-weight: bold;
+      padding: 3px;
+      color: #fff;
+    }
+
+    //MOSFET AMPLIFIER
+    label[for="vinCheckbox"], label[for="vinRadioButton"]{
       color: desaturate(#00bfff, 50%);
-  }
-  label[for="voutCheckbox"], label[for="voutRadioButton"]{
+    }
+
+    label[for="voutCheckbox"], label[for="voutRadioButton"]{
       color: darken(#ffcf48, 20%);
-  }
-  label[for="vrCheckbox"], label[for="vrRadioButton"]{
+    }
+
+    label[for="vrCheckbox"], label[for="vrRadioButton"]{
       color: desaturate(#1df914, 40%);
-  }
-  //RC Filters
-  label[for="vcCheckbox"], label[for="vcRadioButton"]{
+    }
+
+    //RC Filters
+    label[for="vcCheckbox"], label[for="vcRadioButton"]{
       color: darken(#ffcf48, 20%);
-  }
-  //RLC Series
-  label[for="vlCheckbox"], label[for="vlRadioButton"]{
+    }
+
+    //RLC Series
+    label[for="vlCheckbox"], label[for="vlRadioButton"]{
       color: desaturate(#d33682, 40%);
+    }
+
+    div.schematic-sliders {
+
+      div.slider-label#vs {
+        margin-top: lh(2.0);
+      }
+
+      div.slider-label {
+        margin-bottom: lh(0.5);
+      }
+
+      div.slider {
+        margin-bottom: lh(1);
+
+        &.ui-slider-horizontal {
+          height: 0.4em;
+          background: #002b36;
+          border: 1px solid darken(#002b36, 5%);
+          @include box-shadow(none);
+        }
+
+        .ui-slider-handle {
+          background-color: #dc322f;
+          margin-top: -.3em;
+
+          &:hover, &:active {
+            background-color: lighten(#dc322f, 5%);
+          }
+        }
+      }
+    }
   }
 }
 
+
diff --git a/templates/sass/courseware/_courseware.scss b/templates/sass/courseware/_courseware.scss
index 8084077247..48cbcd64bb 100644
--- a/templates/sass/courseware/_courseware.scss
+++ b/templates/sass/courseware/_courseware.scss
@@ -1,4 +1,4 @@
-html { 
+html {
   height: 100%;
   max-height: 100%;
 }
@@ -258,6 +258,24 @@ div.course-wrapper {
         }
       }
     }
+
+    div.ui-tabs {
+      border: 0;
+      @include border-radius(0);
+      margin: 0;
+      padding: 0;
+
+      .ui-tabs-nav {
+        background: none;
+        border: 0;
+        margin-bottom: lh(.5);
+      }
+
+      .ui-tabs-panel {
+        @include border-radius(0);
+        padding: 0;
+      }
+    }
   }
 
   &.closed {