From 38422b2c505ffbf0f4317aaca02d3d682ae1dbf2 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Thu, 26 Apr 2012 14:01:11 -0400 Subject: [PATCH] Shortened first column for controls --- static/css/application.css | 11 ++++++----- templates/sass/courseware/_amplifier.scss | 9 ++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/static/css/application.css b/static/css/application.css index e76b936ab1..5e71ba62c2 100644 --- a/static/css/application.css +++ b/static/css/application.css @@ -3822,13 +3822,14 @@ section.tool-wrapper div#controlls-container div.graph-controls { -webkit-box-shadow: 0 1px 0 #083e4b; -moz-box-shadow: 0 1px 0 #083e4b; box-shadow: 0 1px 0 #083e4b; } -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; - width: 47.207%; } section.tool-wrapper div#controlls-container div.graph-controls div.music-wrapper { - margin-right: 5.587%; } + margin-right: 5.587%; + width: 29.609%; + float: left; } section.tool-wrapper div#controlls-container div.graph-controls div.inputs-wrapper { - padding-top: 11.326px; } + padding-top: 11.326px; + width: 64.804%; + float: left; } section.tool-wrapper div#controlls-container div.graph-controls select#musicTypeSelect { display: block; margin-bottom: 11.326px; diff --git a/templates/sass/courseware/_amplifier.scss b/templates/sass/courseware/_amplifier.scss index 0bc9161374..a0c19bfb95 100644 --- a/templates/sass/courseware/_amplifier.scss +++ b/templates/sass/courseware/_amplifier.scss @@ -35,17 +35,16 @@ section.tool-wrapper { @include box-shadow(0 1px 0 lighten(#073642, 2%)); @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); + width: flex-grid(1.5, 4.5); + float: left; } div.inputs-wrapper { padding-top: lh(.5); + width: flex-grid(3, 4.5); + float: left; } select#musicTypeSelect {