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/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 @@
  • Location +
    This Object
    @@ -44,7 +45,7 @@
  • - Original Location +
    Object's Original
    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. --> -
    +
    -
    +
    • - +
      • diff --git a/platform/commonUI/general/res/sass/_inspector.scss b/platform/commonUI/general/res/sass/_inspector.scss index 7ee9cadf27..dcfad71c00 100644 --- a/platform/commonUI/general/res/sass/_inspector.scss +++ b/platform/commonUI/general/res/sass/_inspector.scss @@ -61,9 +61,24 @@ .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: $interiorMarginSm; + padding-bottom: $interiorMarginLg; .form-section { margin-bottom: 0; &:not(.first) { @@ -72,7 +87,14 @@ .form-row { @include align-items(center); border: none; - padding: 0; + padding: $interiorMarginSm 0; + .label { + min-width: 80px; + } + 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 4c5cbc5c3a..bea8a7d3dd 100644 --- a/platform/commonUI/general/res/sass/forms/_elems.scss +++ b/platform/commonUI/general/res/sass/forms/_elems.scss @@ -20,13 +20,7 @@ * 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; + text-transform: uppercase; } .form { @@ -37,12 +31,20 @@ margin-bottom: $interiorMarginLg * 2; } + .section-header { + border-radius: $basicCr; + background: $colorFormSectionHeader; + $c: lighten($colorBodyFg, 20%); + color: $c; + font-size: 0.8em; + padding: $formTBPad $formLRPad; + } + .form-row { $m: $interiorMargin; box-sizing: border-box; @include clearfix; border-top: 1px solid $colorFormLines; - margin-top: $m; padding: $formTBPad 0; position: relative; &.first { @@ -52,9 +54,7 @@ >.label, >.controls { box-sizing: border-box; - @include clearfix; font-size: 0.8rem; - line-height: $formInputH; min-height: $formInputH; } @@ -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/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 @@ + class="flex-elem l-flex-col holder grows current-elements">
    diff --git a/platform/features/plot/res/templates/plot-options-browse.html b/platform/features/plot/res/templates/plot-options-browse.html index 8def5cdc9c..eb9ab986d2 100644 --- a/platform/features/plot/res/templates/plot-options-browse.html +++ b/platform/features/plot/res/templates/plot-options-browse.html @@ -19,58 +19,52 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> -
    - Display + Plot Options + class="flex-elem l-flex-row no-validate no-margin"> + class="flex-elem l-flex-row no-validate no-margin"> -
    - Plot Series -
    -
      -
        -
      • - - - - +
        +
        + Plot Series +
        +
          +
            +
          • + + + + + + + - - + + - - - -
            • + +
        -
      +
    \ No newline at end of file diff --git a/platform/features/plot/src/PlotOptionsForm.js b/platform/features/plot/src/PlotOptionsForm.js index 4e7739e7d9..993760ff06 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,6 +64,16 @@ 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', @@ -73,23 +83,15 @@ define( '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 +112,8 @@ define( { 'name': 'Markers', 'control': 'checkbox', - 'key': 'markers' + 'key': 'markers', + 'layout': 'control-first' } ] }, @@ -120,19 +123,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 39884b18b1..8f8c741667 100644 --- a/platform/features/table/res/templates/table-options-edit.html +++ b/platform/features/table/res/templates/table-options-edit.html @@ -19,12 +19,12 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> -
    - Display +
    + Table Options + class="flex-elem l-flex-row no-validate no-margin">
    \ No newline at end of file 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' }">
    {{row.name}}