Skip to content

E
edx-platform
Commit 28a9e513 by Kyle Fiedler
Options

Merge branch 'kf-amplifier'

parents 7f6481b9 128ba351
Showing with 185 additions and 45 deletions
templates/sass/courseware/_amplifier.scss
// JM MOSFET AMPLIFIER // JM MOSFET AMPLIFIER
div#graph-container { section.tool-wrapper {
background: #073642;
border-top: 1px solid darken(#002b36, 10%);
border-bottom: 1px solid darken(#002b36, 10%);
@include box-shadow(inset 0 0 0 4px darken(#094959, 2%));
margin: lh() (-(lh())) 0;
color: #839496;
@extend .clearfix; @extend .clearfix;
border-top: 1px solid #ddd; display: table;
padding-top: lh(1.0);
canvas#graph { div#graph-container {
width: flex-grid(4.5, 9); background: none;
float: left; @include box-sizing(border-box);
margin-right: flex-gutter(9); display: table-cell;
} padding: lh();
vertical-align: top;
div.graph-controls { width: flex-grid(4.5, 9) + flex-gutter(9);
width: flex-grid(4.5, 9);
float: left;
select#musicTypeSelect { .ui-widget-content {
display: block; background: none;
margin-bottom: lh(); border: none;
@include border-radius(0);
} }
div#graph-output { canvas {
display: block; width: 100%;
margin-bottom: lh();
} }
div#graph-listen { ul.ui-tabs-nav {
display: block; background: darken(#073642, 2%);
margin-bottom: lh(); margin: (-(lh())) (-(lh())) 0;
} padding: 0;
position: relative;
width: 110%;
@include border-radius(0);
border-bottom: 1px solid darken(#073642, 8%);
p { li {
margin-bottom: lh(.5); margin-bottom: 0;
background: none;
color: #fff;
border: none;
@include border-radius(0);
&.ui-tabs-selected {
border-right: 1px solid darken(#073642, 8%);
border-left: 1px solid darken(#073642, 8%);
background-color: #073642;
&:first-child {
border-left: none;
} }
div#label { a {
display: inline-block; color: #eee8d5;
}
} }
input#playButton { a {
display: block; border: none;
font: bold 12px $body-font-family;
text-transform: uppercase;
letter-spacing: 1px;
color: #839496;
&:hover {
color: #eee8d5;
}
}
}
} }
} }
}
div#schematic-container { div#controlls-container {
@extend .clearfix; @extend .clearfix;
background: darken(#073642, 2%);
canvas { border-right: 1px solid darken(#002b36, 6%);
@include box-shadow(1px 0 0 lighten(#002b36, 6%), inset 0 0 0 4px darken(#094959, 6%));
@include box-sizing(border-box);
display: table-cell;
padding: lh();
vertical-align: top;
width: flex-grid(4.5, 9); width: flex-grid(4.5, 9);
div.graph-controls {
padding: 0 0 lh();
margin-bottom: lh();
border-bottom: 1px solid darken(#073642, 5%);
@include box-shadow(0 1px 0 lighten(#073642, 2%));
@extend .clearfix;
div.music-wrapper {
margin-right: flex-gutter(4.5);
width: flex-grid(1.5, 4.5);
float: left; float: left;
margin-right: flex-gutter(9);
} }
div.schematic-sliders { div.inputs-wrapper {
width: flex-grid(4.5, 9); padding-top: lh(.5);
width: flex-grid(3, 4.5);
float: left; float: left;
}
div.slider-label#vs { select#musicTypeSelect {
margin-top: lh(2.0); display: block;
margin-bottom: lh(.5);
font: 16px $body-font-family;
width: 100%;
} }
div.slider-label { div#graph-output, div#graph-listen {
margin-bottom: lh(0.5); display: block;
margin-bottom: lh(.5);
text-align: right;
p {
@include inline-block();
margin: 0;
} }
div.slider { ul {
margin-bottom: lh(1); @include inline-block();
margin-bottom: 0;
li {
@include inline-block();
margin-bottom: 0;
input {
margin-right: 5px;
} }
} }
} }
//End JM MOSFET AMPLIFIER }
input#playButton {
display: block;
@include button(simple, #dc322f);
font: bold 14px $body-font-family;
color: #47221a;
text-shadow: 0 1px 0 lighten(#dc322f, 5%);
@include box-shadow(inset 0 1px 0 lighten(#dc322f, 10%));
&:active {
@include box-shadow(none);
}
// Labels &[value="Stop"] {
div.graph-controls, div#graph-listen { @include button(simple, darken(#268bd2, 30%));
font: bold 14px $body-font-family;
&:active {
@include box-shadow(none);
}
}
}
}
label { label {
@include border-radius(2px); @include border-radius(2px);
font-weight: bold; font-weight: bold;
padding: 3px; padding: 3px;
color: #fff;
-webkit-font-smoothing: antialiased;
} }
//MOSFET AMPLIFIER //MOSFET AMPLIFIER
label[for="vinCheckbox"], label[for="vinRadioButton"]{ label[for="vinCheckbox"], label[for="vinRadioButton"]{
color: desaturate(#00bfff, 50%); color: desaturate(#00bfff, 50%);
} }
label[for="voutCheckbox"], label[for="voutRadioButton"]{ label[for="voutCheckbox"], label[for="voutRadioButton"]{
color: darken(#ffcf48, 20%); color: darken(#ffcf48, 20%);
} }
label[for="vrCheckbox"], label[for="vrRadioButton"]{ label[for="vrCheckbox"], label[for="vrRadioButton"]{
color: desaturate(#1df914, 40%); color: desaturate(#1df914, 40%);
} }
//RC Filters //RC Filters
label[for="vcCheckbox"], label[for="vcRadioButton"]{ label[for="vcCheckbox"], label[for="vcRadioButton"]{
color: darken(#ffcf48, 20%); color: darken(#ffcf48, 20%);
} }
//RLC Series //RLC Series
label[for="vlCheckbox"], label[for="vlRadioButton"]{ label[for="vlCheckbox"], label[for="vlRadioButton"]{
color: desaturate(#d33682, 40%); color: desaturate(#d33682, 40%);
} }
div.schematic-sliders {
div.slider-label {
margin-bottom: lh(0.5);
font-weight: bold;
text-shadow: 0 -1px 0 darken(#073642, 10%);
-webkit-font-smoothing: antialiased;
}
div.slider {
margin-bottom: lh(1);
&.ui-slider-horizontal {
height: 0.4em;
background: darken(#002b36, 2%);
border: 1px solid darken(#002b36, 8%);
@include box-shadow(none);
}
.ui-slider-handle {
background-color: #dc322f;
margin-top: -.3em;
&:hover, &:active {
background-color: lighten(#dc322f, 5%);
}
}
}
}
}
} }
templates/sass/courseware/_courseware.scss
...@@ -258,6 +258,24 @@ div.course-wrapper { ...@@ -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 { &.closed {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment