From 318df9878dca993689a05dbd5f08d4d9f75363d9 Mon Sep 17 00:00:00 2001
From: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Wed, 9 Mar 2016 17:22:41 -0800
Subject: [PATCH 1/7] [Frontend] Cleanups to Inspector config elements

open #729
In-progress!
Markup and CSS modified to cleanup control layout
and styling in Plot and Table config options;
gulpfile.js modified to include SASS source line numbers
in rendered CSS;
---
 gulpfile.js                                   |  3 +-
 .../commonUI/general/res/sass/_inspector.scss | 18 +++++-
 .../general/res/sass/forms/_elems.scss        | 24 ++++----
 .../res/templates/plot-options-browse.html    | 58 ++++++++++---------
 .../res/templates/table-options-edit.html     |  2 +-
 5 files changed, 61 insertions(+), 44 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index fa832d1aa6..0df0aa2ae6 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -60,7 +60,8 @@ var gulp = require('gulp'),
             singleRun: true
         },
         sass: {
-            includePaths: bourbon.includePaths
+            includePaths: bourbon.includePaths,
+            sourceComments: true
         },
         replace: {
             variables: {
diff --git a/platform/commonUI/general/res/sass/_inspector.scss b/platform/commonUI/general/res/sass/_inspector.scss
index 7ee9cadf27..b371dd65d1 100644
--- a/platform/commonUI/general/res/sass/_inspector.scss
+++ b/platform/commonUI/general/res/sass/_inspector.scss
@@ -61,9 +61,23 @@
     .l-inspector-part {
         box-sizing: border-box;
         padding-right: $interiorMargin;
-        .form {
+        .tree .form {
             margin-left: $treeVCW + $interiorMarginLg;
-            margin-bottom: $interiorMarginLg;
+        }
+        .section-header {
+            background: none;
+            color: $colorInspectorPropName;
+            border-radius: unset;
+            font-size: inherit;
+            padding: $interiorMarginSm 0;
+        }
+
+        mct-form:not(:last-child) .form {
+            border-bottom: 1px solid $colorInspectorSectionHeaderBg;
+        }
+
+        .form {
+            margin-bottom: $interiorMargin;
             .form-section {
                 margin-bottom: 0;
                 &:not(.first) {
diff --git a/platform/commonUI/general/res/sass/forms/_elems.scss b/platform/commonUI/general/res/sass/forms/_elems.scss
index 4c5cbc5c3a..a48a8cfda4 100644
--- a/platform/commonUI/general/res/sass/forms/_elems.scss
+++ b/platform/commonUI/general/res/sass/forms/_elems.scss
@@ -19,16 +19,6 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-.section-header {
-	border-radius: $basicCr;
-	background: $colorFormSectionHeader;
-	$c: lighten($colorBodyFg, 20%);
-	color: $c;
-	font-size: 0.8em;
-	padding: $formTBPad $formLRPad;
-	text-transform: uppercase;
-}
-
 .form {
 	color: $colorFormText;
     width: 100%;
@@ -37,6 +27,16 @@
 		margin-bottom: $interiorMarginLg * 2;
 	}
 
+    .section-header {
+        border-radius: $basicCr;
+        background: $colorFormSectionHeader;
+        $c: lighten($colorBodyFg, 20%);
+        color: $c;
+        font-size: 0.8em;
+        padding: $formTBPad $formLRPad;
+        text-transform: uppercase;
+    }
+
 	.form-row {
 		$m: $interiorMargin;
 		box-sizing: border-box;
@@ -52,9 +52,9 @@
 		>.label,
 		>.controls {
 			box-sizing: border-box;
-			@include clearfix;
+			//@include clearfix;
 			font-size: 0.8rem;
-			line-height: $formInputH;
+			//line-height: $formInputH;
             min-height: $formInputH;
 		}
 
diff --git a/platform/features/plot/res/templates/plot-options-browse.html b/platform/features/plot/res/templates/plot-options-browse.html
index 8def5cdc9c..123ed43194 100644
--- a/platform/features/plot/res/templates/plot-options-browse.html
+++ b/platform/features/plot/res/templates/plot-options-browse.html
@@ -41,36 +41,38 @@
             name="yAxisFormState"
             class="flex-elem l-flex-row no-validate no-margin reduced-min-width">
     </mct-form>
-    <div class="section-header ng-binding ng-scope">
-        Plot Series
-    </div>
-    <ul class="first flex-elem grows vscroll">
-        <ul class="tree">
-            <li ng-repeat="child in children">
-                <span ng-controller="ToggleController as toggle">
-                    <span ng-controller="TreeNodeController as treeNode">
-                        <span class="tree-item menus-to-left">
-                            <span
-                                class='ui-symbol view-control flex-elem has-children'
-                                ng-class="{ expanded: toggle.isActive() }"
-                                ng-click="toggle.toggle(); treeNode.trackExpansion()">
+    <div class="form">
+        <div class="section-header ng-binding ng-scope">
+            Plot Series
+        </div>
+        <ul class="first flex-elem grows vscroll">
+            <ul class="tree">
+                <li ng-repeat="child in children">
+                    <span ng-controller="ToggleController as toggle">
+                        <span ng-controller="TreeNodeController as treeNode">
+                            <span class="tree-item menus-to-left">
+                                <span
+                                    class='ui-symbol view-control flex-elem has-children'
+                                    ng-class="{ expanded: toggle.isActive() }"
+                                    ng-click="toggle.toggle(); treeNode.trackExpansion()">
+                                </span>
+                                <mct-representation
+                                    class="rep-object-label"
+                                    key="'label'"
+                                    mct-object="child">
+                                </mct-representation>
                             </span>
-                            <mct-representation
-                                class="rep-object-label"
-                                key="'label'"
-                                mct-object="child">
-                            </mct-representation>
                         </span>
+                        <mct-form
+                            ng-class="{hidden: !toggle.isActive()}"
+                            ng-model="configuration.plot.series[$index]"
+                            structure="plotSeriesForm"
+                            name="plotOptionsState"
+                            class="flex-elem l-flex-row l-controls-first no-validate">
+                        </mct-form>
                     </span>
-                    <mct-form
-                        ng-class="{hidden: !toggle.isActive()}"
-                        ng-model="configuration.plot.series[$index]"
-                        structure="plotSeriesForm"
-                        name="plotOptionsState"
-                        class="flex-elem l-flex-row l-controls-first no-validate">
-                    </mct-form>
-                </span>
-            </li>
+                </li>
+            </ul>
         </ul>
-    </ul>
+    </div>
 </div>
\ No newline at end of file
diff --git a/platform/features/table/res/templates/table-options-edit.html b/platform/features/table/res/templates/table-options-edit.html
index 39884b18b1..54a8480be8 100644
--- a/platform/features/table/res/templates/table-options-edit.html
+++ b/platform/features/table/res/templates/table-options-edit.html
@@ -19,7 +19,7 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div ng-controller="TableOptionsController" class="flex-elem grows l-inspector-part">
+<div ng-controller="TableOptionsController" class="l-controls-first flex-elem grows l-inspector-part">
     <em class="t-inspector-part-header" title="Display properties for this object">Display</em>
     <mct-form
             ng-model="configuration.table.columns"

From bdbb045005612233758abdb7d9068932bfd195d7 Mon Sep 17 00:00:00 2001
From: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu, 10 Mar 2016 10:31:05 -0800
Subject: [PATCH 2/7] [Frontend] Cleanups to Inspector config elements

open #729
In-progress!
Markup and CSS mods continued;
Config params added to PlotOptionsForm.js to
allow control-first layout per form row;
Changed titles of Inspector parts;
---
 .../commonUI/general/res/sass/_inspector.scss |  6 +-
 .../general/res/sass/forms/_elems.scss        | 63 +++++++++----------
 .../general/res/sass/overlay/_overlay.scss    |  2 +-
 .../res/templates/plot-options-browse.html    |  4 +-
 platform/features/plot/src/PlotOptionsForm.js | 47 ++++++++------
 .../res/templates/table-options-edit.html     |  2 +-
 platform/forms/res/templates/form.html        |  4 +-
 7 files changed, 69 insertions(+), 59 deletions(-)

diff --git a/platform/commonUI/general/res/sass/_inspector.scss b/platform/commonUI/general/res/sass/_inspector.scss
index b371dd65d1..03be9fe875 100644
--- a/platform/commonUI/general/res/sass/_inspector.scss
+++ b/platform/commonUI/general/res/sass/_inspector.scss
@@ -86,7 +86,11 @@
                 .form-row {
                     @include align-items(center);
                     border: none;
-                    padding: 0;
+                    padding: $interiorMarginSm 0;
+                    input[type='text'],
+                    input[type='search'] {
+                        width: 100%;
+                    }
                 }
             }
         }
diff --git a/platform/commonUI/general/res/sass/forms/_elems.scss b/platform/commonUI/general/res/sass/forms/_elems.scss
index a48a8cfda4..b63fdad3d8 100644
--- a/platform/commonUI/general/res/sass/forms/_elems.scss
+++ b/platform/commonUI/general/res/sass/forms/_elems.scss
@@ -42,7 +42,7 @@
 		box-sizing: border-box;
 		@include clearfix;
 		border-top: 1px solid $colorFormLines;
-		margin-top: $m;
+		//margin-top: $m;
 		padding: $formTBPad 0;
 		position: relative;
 		&.first {
@@ -83,19 +83,6 @@
 					margin-right: 5px;
 				}
 			}
-
-			.l-med input[type="text"] {
-				width: 200px;
-			}
-
-			.l-small input[type="text"] {
-				width: 50px;
-			}
-
-			.l-numeric input[type="text"] {
-				text-align: right;
-			}
-
 			.select {
 				margin-right: $interiorMargin;
 			}
@@ -124,25 +111,23 @@
 	}
 }
 
-.l-controls-first {
-    .form .form-row {
-        margin-top: $interiorMarginSm;
-        >.label,
-        >.controls {
-            line-height: inherit;
-            min-height: inherit;;
-        }
-        >.label {
-            @include flex(1 1 auto);
-            min-width: 0;
-            width: auto;
-            order: 2;
-        }
-        >.controls {
-            @include flex(0 0 auto);
-            margin-right: $interiorMargin;
-            order: 1;
-        }
+.l-controls-first .form .form-row,
+.form .form-row.l-controls-first {
+    >.label,
+    >.controls {
+        line-height: inherit;
+        min-height: inherit;;
+    }
+    >.label {
+        @include flex(1 1 auto);
+        min-width: 0;
+        width: auto;
+        order: 2;
+    }
+    >.controls {
+        @include flex(0 0 auto);
+        margin-right: $interiorMargin;
+        order: 1;
     }
 }
 
@@ -191,6 +176,18 @@ input[type="search"] {
 	}
 }
 
+.l-input-med input[type="text"] {
+    width: 200px !important;
+}
+
+.l-input-sm input[type="text"] {
+    width: 50px !important;
+}
+
+.l-numeric input[type="text"] {
+    text-align: right;
+}
+
 textarea {
 	@include nice-textarea($colorInputBg, $colorInputFg);
 	position: absolute;
diff --git a/platform/commonUI/general/res/sass/overlay/_overlay.scss b/platform/commonUI/general/res/sass/overlay/_overlay.scss
index c4700795e5..d49a2ee97c 100644
--- a/platform/commonUI/general/res/sass/overlay/_overlay.scss
+++ b/platform/commonUI/general/res/sass/overlay/_overlay.scss
@@ -88,7 +88,7 @@
         left: 0;
         right: 0;
         overflow: auto;
-        .field.l-med {
+        .field.l-input-med {
             input[type='text'] {
                 width: 100%;
             }
diff --git a/platform/features/plot/res/templates/plot-options-browse.html b/platform/features/plot/res/templates/plot-options-browse.html
index 123ed43194..10067d506f 100644
--- a/platform/features/plot/res/templates/plot-options-browse.html
+++ b/platform/features/plot/res/templates/plot-options-browse.html
@@ -28,7 +28,7 @@
     }
 </style>
 <div ng-controller="PlotOptionsController" class="flex-elem grows l-inspector-part">
-    <em class="t-inspector-part-header" title="Display properties for this object">Display</em>
+    <em class="t-inspector-part-header" title="Display properties for this object">Plot Options</em>
     <mct-form
             ng-model="configuration.plot.xAxis"
             structure="xAxisForm"
@@ -68,7 +68,7 @@
                             ng-model="configuration.plot.series[$index]"
                             structure="plotSeriesForm"
                             name="plotOptionsState"
-                            class="flex-elem l-flex-row l-controls-first no-validate">
+                            class="flex-elem l-flex-row no-validate">
                         </mct-form>
                     </span>
                 </li>
diff --git a/platform/features/plot/src/PlotOptionsForm.js b/platform/features/plot/src/PlotOptionsForm.js
index 4e7739e7d9..ccc3de79cc 100644
--- a/platform/features/plot/src/PlotOptionsForm.js
+++ b/platform/features/plot/src/PlotOptionsForm.js
@@ -48,9 +48,9 @@ define(
                             'control': 'select',
                             'key': 'key',
                             'options': [
-                                {'name':'scet', 'value': 'scet'},
-                                {'name':'sclk', 'value': 'sclk'},
-                                {'name':'lst', 'value': 'lst'}
+                                {'name':'SCET', 'value': 'scet'},
+                                {'name':'SCLK', 'value': 'sclk'},
+                                {'name':'LST', 'value': 'lst'}
                             ]
                         }
                     ]
@@ -64,32 +64,35 @@ define(
                 // itself.
                 'name': 'y-axis',
                 'rows': [
+                    {
+                        'name': 'Range',
+                        'control': 'select',
+                        'key': 'key',
+                        'options': [
+                            {'name':'EU', 'value': 'eu'},
+                            {'name':'DN', 'value': 'dn'},
+                            {'name':'Status', 'value': 'status'}
+                        ]
+                    },
                     {
                         'name': 'Autoscale',
                         'control': 'checkbox',
-                        'key': 'autoscale'
+                        'key': 'autoscale',
+                        'layout': 'control-first'
                     },
                     {
                         'name': 'Min',
                         'control': 'textfield',
                         'key': 'min',
-                        'pattern': '[0-9]'
+                        'pattern': '[0-9]',
+                        'inputsize' : 'sm'
                     },
                     {
                         'name': 'Max',
                         'control': 'textfield',
                         'key': 'max',
-                        'pattern': '[0-9]'
-                    },
-                    {
-                        'name': 'Range',
-                        'control': 'select',
-                        'key': 'key',
-                        'options': [
-                            {'name':'eu', 'value': 'eu'},
-                            {'name':'dn', 'value': 'dn'},
-                            {'name':'status', 'value': 'status'}
-                        ]
+                        'pattern': '[0-9]',
+                        'inputsize' : 'sm'
                     }
                 ]
                 }]
@@ -110,7 +113,8 @@ define(
                             {
                                 'name': 'Markers',
                                 'control': 'checkbox',
-                                'key': 'markers'
+                                'key': 'markers',
+                                'layout': 'control-first'
                             }
                         ]
                     },
@@ -120,19 +124,22 @@ define(
                                 'name': 'No Line',
                                 'control': 'radio',
                                 'key': 'lineType',
-                                'value': 'noLine'
+                                'value': 'noLine',
+                                'layout': 'control-first'
                             },
                             {
                                 'name': 'Step Line',
                                 'control': 'radio',
                                 'key': 'lineType',
-                                'value': 'stepLine'
+                                'value': 'stepLine',
+                                'layout': 'control-first'
                             },
                             {
                                 'name': 'Linear Line',
                                 'control': 'radio',
                                 'key': 'lineType',
-                                'value': 'linearLine'
+                                'value': 'linearLine',
+                                'layout': 'control-first'
                             }
                         ]
                     }
diff --git a/platform/features/table/res/templates/table-options-edit.html b/platform/features/table/res/templates/table-options-edit.html
index 54a8480be8..a696c9ccb9 100644
--- a/platform/features/table/res/templates/table-options-edit.html
+++ b/platform/features/table/res/templates/table-options-edit.html
@@ -20,7 +20,7 @@
  at runtime from the About dialog for additional information.
 -->
 <div ng-controller="TableOptionsController" class="l-controls-first flex-elem grows l-inspector-part">
-    <em class="t-inspector-part-header" title="Display properties for this object">Display</em>
+    <em class="t-inspector-part-header" title="Display properties for this object">Table Options</em>
     <mct-form
             ng-model="configuration.table.columns"
             structure="columnsForm"
diff --git a/platform/forms/res/templates/form.html b/platform/forms/res/templates/form.html
index edd4f81d1c..60046824a8 100644
--- a/platform/forms/res/templates/form.html
+++ b/platform/forms/res/templates/form.html
@@ -31,7 +31,9 @@
                                req: row.required,
                                valid: mctFormInner.$dirty && mctFormInner.$valid,
                                invalid: mctFormInner.$dirty && !mctFormInner.$valid,
-                               first: $index < 1
+                               first: $index < 1,
+                               'l-controls-first': row.layout === 'control-first',
+                               'l-input-sm': row.inputsize === 'sm'
                                }">
                     <div class='label flex-elem' title="{{row.description}}">
                         {{row.name}}

From 0957fbc6f931da7c811be30e1dbc44972699b474 Mon Sep 17 00:00:00 2001
From: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu, 10 Mar 2016 10:50:00 -0800
Subject: [PATCH 3/7] [Frontend] Cleanups to Inspector config elements

open #729
In-progress
Moved reduced-min-width into _inspector.scss;
Removed <style> defs in markup files;
---
 platform/commonUI/general/res/sass/_inspector.scss   |  3 +++
 .../plot/res/templates/plot-options-browse.html      | 12 ++----------
 .../table/res/templates/table-options-edit.html      |  2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/platform/commonUI/general/res/sass/_inspector.scss b/platform/commonUI/general/res/sass/_inspector.scss
index 03be9fe875..8f10663be1 100644
--- a/platform/commonUI/general/res/sass/_inspector.scss
+++ b/platform/commonUI/general/res/sass/_inspector.scss
@@ -87,6 +87,9 @@
                     @include align-items(center);
                     border: none;
                     padding: $interiorMarginSm 0;
+                    .label {
+                        min-width: 80px;
+                    }
                     input[type='text'],
                     input[type='search'] {
                         width: 100%;
diff --git a/platform/features/plot/res/templates/plot-options-browse.html b/platform/features/plot/res/templates/plot-options-browse.html
index 10067d506f..eb9ab986d2 100644
--- a/platform/features/plot/res/templates/plot-options-browse.html
+++ b/platform/features/plot/res/templates/plot-options-browse.html
@@ -19,27 +19,19 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<style>
-    .l-inspect .l-inspector-part .no-margin .form {
-        margin-left: 0;
-    }
-    .reduced-min-width .form .form-row > .label {
-        min-width: 80px;
-    }
-</style>
 <div ng-controller="PlotOptionsController" class="flex-elem grows l-inspector-part">
     <em class="t-inspector-part-header" title="Display properties for this object">Plot Options</em>
     <mct-form
             ng-model="configuration.plot.xAxis"
             structure="xAxisForm"
             name="xAxisFormState"
-            class="flex-elem l-flex-row no-validate no-margin reduced-min-width">
+            class="flex-elem l-flex-row no-validate no-margin">
     </mct-form>
     <mct-form
             ng-model="configuration.plot.yAxis"
             structure="yAxisForm"
             name="yAxisFormState"
-            class="flex-elem l-flex-row no-validate no-margin reduced-min-width">
+            class="flex-elem l-flex-row no-validate no-margin">
     </mct-form>
     <div class="form">
         <div class="section-header ng-binding ng-scope">
diff --git a/platform/features/table/res/templates/table-options-edit.html b/platform/features/table/res/templates/table-options-edit.html
index a696c9ccb9..8f8c741667 100644
--- a/platform/features/table/res/templates/table-options-edit.html
+++ b/platform/features/table/res/templates/table-options-edit.html
@@ -25,6 +25,6 @@
             ng-model="configuration.table.columns"
             structure="columnsForm"
             name="columnsFormState"
-            class="flex-elem l-flex-row no-validate no-margin reduced-min-width">
+            class="flex-elem l-flex-row no-validate no-margin">
     </mct-form>
 </div>
\ No newline at end of file

From 7171fd01e333f16b10f920e2161bbce210910bb0 Mon Sep 17 00:00:00 2001
From: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu, 10 Mar 2016 11:07:26 -0800
Subject: [PATCH 4/7] [Frontend] Cleanups to Inspector config elements

open #729
In-progress
Moved CSS def to be more globally applicable;
Simplified layout obj props location display;
---
 .../browse/res/templates/browse/object-properties.html       | 3 ++-
 platform/commonUI/general/res/sass/forms/_elems.scss         | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/platform/commonUI/browse/res/templates/browse/object-properties.html b/platform/commonUI/browse/res/templates/browse/object-properties.html
index a15efed6c9..ecce9fe60d 100644
--- a/platform/commonUI/browse/res/templates/browse/object-properties.html
+++ b/platform/commonUI/browse/res/templates/browse/object-properties.html
@@ -32,6 +32,7 @@
         </li>
         <li ng-if="contextutalParents.length > 0">
             <em class="t-inspector-part-header" title="The location of this linked object.">Location</em>
+            <div ng-if="primaryParents.length > 0" class="section-header">This Object</div>
             <span class="inspector-location"
                   ng-repeat="parent in contextutalParents"
                   ng-class="{ last:($index + 1) === contextualParents.length }">
@@ -44,7 +45,7 @@
             </span>
         </li>
         <li ng-if="primaryParents.length > 0">
-            <em class="t-inspector-part-header" title="The location of the original object that this was linked from.">Original Location</em>
+            <div class="section-header">Object's Original</div>
             <span class="inspector-location"
                   ng-repeat="parent in primaryParents"
                   ng-class="{ last:($index + 1) === primaryParents.length }">
diff --git a/platform/commonUI/general/res/sass/forms/_elems.scss b/platform/commonUI/general/res/sass/forms/_elems.scss
index b63fdad3d8..3979b0e528 100644
--- a/platform/commonUI/general/res/sass/forms/_elems.scss
+++ b/platform/commonUI/general/res/sass/forms/_elems.scss
@@ -19,6 +19,10 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
+.section-header {
+    text-transform: uppercase;
+}
+
 .form {
 	color: $colorFormText;
     width: 100%;
@@ -34,7 +38,6 @@
         color: $c;
         font-size: 0.8em;
         padding: $formTBPad $formLRPad;
-        text-transform: uppercase;
     }
 
 	.form-row {

From 4983d35ca6df4e08b9f4e22a940e9b07bed96735 Mon Sep 17 00:00:00 2001
From: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu, 10 Mar 2016 13:18:57 -0800
Subject: [PATCH 5/7] [Frontend] Cleanups to Inspector config elements

open #729
Spacing tweaks; set PlotOptionsForm.js > Autoscale
to not use control-first layout;
Checked in snow theme;
---
 platform/commonUI/general/res/sass/_inspector.scss | 3 ++-
 platform/features/plot/src/PlotOptionsForm.js      | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform/commonUI/general/res/sass/_inspector.scss b/platform/commonUI/general/res/sass/_inspector.scss
index 8f10663be1..dcfad71c00 100644
--- a/platform/commonUI/general/res/sass/_inspector.scss
+++ b/platform/commonUI/general/res/sass/_inspector.scss
@@ -77,7 +77,8 @@
         }
 
         .form {
-            margin-bottom: $interiorMargin;
+            margin-bottom: $interiorMarginSm;
+            padding-bottom: $interiorMarginLg;
             .form-section {
                 margin-bottom: 0;
                 &:not(.first) {
diff --git a/platform/features/plot/src/PlotOptionsForm.js b/platform/features/plot/src/PlotOptionsForm.js
index ccc3de79cc..993760ff06 100644
--- a/platform/features/plot/src/PlotOptionsForm.js
+++ b/platform/features/plot/src/PlotOptionsForm.js
@@ -77,8 +77,7 @@ define(
                     {
                         'name': 'Autoscale',
                         'control': 'checkbox',
-                        'key': 'autoscale',
-                        'layout': 'control-first'
+                        'key': 'autoscale'
                     },
                     {
                         'name': 'Min',

From a4c58545615561d16963dd1693dfbebeae284dba Mon Sep 17 00:00:00 2001
From: Charles Hacskaylo <charles.f.hacskaylo@nasa.gov>
Date: Thu, 10 Mar 2016 14:33:01 -0800
Subject: [PATCH 6/7] [Frontend] Bug fixing

open #729
open #498
Fixed markup to use proper CSS classes
to allow tree items in Inspector Elements to
ellipsize properly, and to apply scroll regions
to the proper elements;
---
 platform/commonUI/edit/res/templates/elements.html       | 9 ++++++---
 .../commonUI/general/res/templates/object-inspector.html | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/platform/commonUI/edit/res/templates/elements.html b/platform/commonUI/edit/res/templates/elements.html
index ea57fbacd1..23884e0a54 100644
--- a/platform/commonUI/edit/res/templates/elements.html
+++ b/platform/commonUI/edit/res/templates/elements.html
@@ -19,16 +19,19 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div ng-controller="ElementsController">
+<div ng-controller="ElementsController" class="flex-elem l-flex-col holder grows">
     <mct-include key="'input-filter'"
                  class="flex-elem holder"
                  ng-model="filterBy">
     </mct-include>
-    <div class="current-elements abs" style="height: 100%;">
+    <div class="flex-elem grows vscroll">
         <ul class="tree">
             <li ng-repeat="containedObject in composition | filter:searchText">
                 <span class="tree-item">
-                    <mct-representation key="'label'" mct-object="containedObject">
+                    <mct-representation
+                            class="rep-object-label"
+                            key="'label'"
+                            mct-object="containedObject">
                     </mct-representation>
                 </span>
             </li>
diff --git a/platform/commonUI/general/res/templates/object-inspector.html b/platform/commonUI/general/res/templates/object-inspector.html
index 708814b3cc..2a30f3d36e 100644
--- a/platform/commonUI/general/res/templates/object-inspector.html
+++ b/platform/commonUI/general/res/templates/object-inspector.html
@@ -40,7 +40,7 @@
                     <mct-representation
                             key="'edit-elements'"
                             mct-object="domainObject"
-                            class="flex-elem holder grows vscroll current-elements">
+                            class="flex-elem l-flex-col holder grows current-elements">
                     </mct-representation>
                 </div>
             </div>

From bf3b964ad27918e918578c74e5f4a47ed001e2f0 Mon Sep 17 00:00:00 2001
From: Charles Hacskaylo <charlesh88@gmail.com>
Date: Mon, 14 Mar 2016 15:45:10 -0700
Subject: [PATCH 7/7] Removed commented code

#729
#735
---
 platform/commonUI/general/res/sass/forms/_elems.scss | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/platform/commonUI/general/res/sass/forms/_elems.scss b/platform/commonUI/general/res/sass/forms/_elems.scss
index 3979b0e528..bea8a7d3dd 100644
--- a/platform/commonUI/general/res/sass/forms/_elems.scss
+++ b/platform/commonUI/general/res/sass/forms/_elems.scss
@@ -45,7 +45,6 @@
 		box-sizing: border-box;
 		@include clearfix;
 		border-top: 1px solid $colorFormLines;
-		//margin-top: $m;
 		padding: $formTBPad 0;
 		position: relative;
 		&.first {
@@ -55,9 +54,7 @@
 		>.label,
 		>.controls {
 			box-sizing: border-box;
-			//@include clearfix;
 			font-size: 0.8rem;
-			//line-height: $formInputH;
             min-height: $formInputH;
 		}