From 89fbd4611b07fb6c99bc19e93d5b276c1af3d13c Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Thu, 26 Apr 2012 16:58:04 -0400 Subject: [PATCH] Fixed margin padding issue for top of sliders --- static/css/application.css | 5 ++--- templates/sass/courseware/_amplifier.scss | 17 +++++++---------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/static/css/application.css b/static/css/application.css index 7e38d15259..ac9a666dff 100644 --- a/static/css/application.css +++ b/static/css/application.css @@ -3871,7 +3871,8 @@ section.tool-wrapper div#controlls-container { vertical-align: top; width: 48.641%; } section.tool-wrapper div#controlls-container div.graph-controls { - padding: 22.652px 0 22.652px; + padding: 0 0 22.652px; + margin-bottom: 22.652px; border-bottom: 1px solid #05232b; -webkit-box-shadow: 0 1px 0 #083e4b; -moz-box-shadow: 0 1px 0 #083e4b; @@ -4035,8 +4036,6 @@ section.tool-wrapper div#controlls-container label[for="vcCheckbox"], section.to color: #e1a600; } 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; font-weight: bold; diff --git a/templates/sass/courseware/_amplifier.scss b/templates/sass/courseware/_amplifier.scss index 2da59c2ac8..eb1fae7fea 100644 --- a/templates/sass/courseware/_amplifier.scss +++ b/templates/sass/courseware/_amplifier.scss @@ -17,11 +17,11 @@ section.tool-wrapper { vertical-align: top; width: flex-grid(4.5, 9) + flex-gutter(9); -.ui-widget-content { - background: none; - border: none; - @include border-radius(0); -} + .ui-widget-content { + background: none; + border: none; + @include border-radius(0); + } canvas { width: 100%; @@ -84,7 +84,8 @@ section.tool-wrapper { width: flex-grid(4.5, 9); div.graph-controls { - padding: lh() 0 lh(); + 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; @@ -186,10 +187,6 @@ section.tool-wrapper { div.schematic-sliders { - div.slider-label#vs { - margin-top: lh(2.0); - } - div.slider-label { margin-bottom: lh(0.5); font-weight: bold;