From 32815d8427c5446ff3ceb986f87dc85ee9fed8df Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Thu, 19 Nov 2015 18:50:10 -0800 Subject: [PATCH] [Frontend] Markup and CSS fixes open #251 Fixed markup and CSS to remove erroneously applied "select" class; Modified .select to not use overflow: hidden; Better positioning for *-options elements; --- .../general/res/sass/forms/_selects.scss | 1 - .../general/res/sass/plots/_plots-main.scss | 41 +++--- .../espresso/res/css/theme-espresso.css | 117 ++++++++++-------- .../themes/snow/res/css/theme-snow.css | 117 ++++++++++-------- .../features/plot/res/templates/plot.html | 5 +- 5 files changed, 142 insertions(+), 139 deletions(-) diff --git a/platform/commonUI/general/res/sass/forms/_selects.scss b/platform/commonUI/general/res/sass/forms/_selects.scss index 027678369c..019d41ab18 100644 --- a/platform/commonUI/general/res/sass/forms/_selects.scss +++ b/platform/commonUI/general/res/sass/forms/_selects.scss @@ -25,7 +25,6 @@ margin: 0 0 2px 0; // Needed to avoid dropshadow from being clipped by parent containers } padding: 0 $interiorMargin; - overflow: hidden; position: relative; line-height: $formInputH; select { diff --git a/platform/commonUI/general/res/sass/plots/_plots-main.scss b/platform/commonUI/general/res/sass/plots/_plots-main.scss index c1ce9fa920..96a11b45d5 100644 --- a/platform/commonUI/general/res/sass/plots/_plots-main.scss +++ b/platform/commonUI/general/res/sass/plots/_plots-main.scss @@ -20,11 +20,9 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ $yBarW: 60px; -$yLabelW: auto; +$yLabelW: 10px; $xBarH: 32px; $legendH: 20px; -//$colorHash: rgba(white, 0.3); // MOVED INTO CONSTANTS -//$styleHash: dashed; // MOVED INTO CONSTANTS $swatchD: 8px; $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBarW); // Top, right, bottom, left @@ -36,7 +34,6 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa height: 100%; .gl-plot-axis-area { - // @include test(green); position: absolute; &.gl-plot-x { top: auto; @@ -59,7 +56,7 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa .gl-plot-coords { @include box-sizing(border-box); @include border-radius($controlCr); - background: black; //rgba($colorKey, 0.5); + background: black; color: lighten($colorBodyFg, 30%); padding: 2px 5px; position: absolute; @@ -88,11 +85,9 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa .gl-plot-label, .l-plot-label { - // @include test(yellow); color: $colorPlotLabelFg; position: absolute; text-align: center; -// text-transform: uppercase; &.gl-plot-x-label, &.l-plot-x-label { @@ -117,20 +112,26 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa } } - .gl-plot-y-options { + .gl-plot-x-options, + .gl-plot-y-options { $h: 32px; -// @include test(); position: absolute; - top: 50%; - right: auto; - bottom: auto; - left: $yLabelW + $interiorMargin; - margin-top: $h / -2; height: auto; min-height: $h; - width: $h; + z-index: 2; } + .gl-plot-x-options { + top: $interiorMargin; + } + + .gl-plot-y-options { + @include transform(translateY(-50%)); + min-width: 150px; // Need this due to enclosure of .select + top: 50%; + left: $yLabelW + $interiorMargin * 2; + } + .gl-plot-hash { position: absolute; border: 0 $colorPlotHash $stylePlotHash; @@ -214,21 +215,13 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa display: inline-block; height: $swatchD; width: $swatchD; - //margin-right: $interiorMarginSm; - } - &[class*='s-limit'] { - .title-label { - //color: #fff; - } } } } .gl-plot-legend { .plot-legend-item { - //@include test(); @include border-radius($smallCr); - //color: #fff; line-height: 1.5em; padding: 0px $itemPadLR; .plot-color-swatch { @@ -250,7 +243,6 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa .gl-plot-tick, .tick-label { - // @include test(red); font-size: 0.7rem; position: absolute; overflow: hidden; @@ -277,7 +269,6 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa } .gl-plot-tick { - // @include test(red); &.gl-plot-x-tick-label { top: $interiorMargin; } diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css index 41f35389eb..7854df16bd 100644 --- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css +++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css @@ -20,7 +20,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 5, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -41,38 +41,38 @@ time, mark, audio, video { font-size: 100%; vertical-align: baseline; } -/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } @@ -3961,7 +3961,6 @@ textarea { text-shadow: rgba(0, 0, 0, 0.1) 0 1px 2px; margin: 0 0 2px 0; padding: 0 5px; - overflow: hidden; position: relative; line-height: 22px; } /* line 297, ../../../../general/res/sass/_mixins.scss */ @@ -3974,7 +3973,7 @@ textarea { /* line 304, ../../../../general/res/sass/_mixins.scss */ .select:not(.disabled):hover > .icon, .select:not(.disabled):hover > .t-item-icon { color: #33ccff; } } - /* line 31, ../../../../general/res/sass/forms/_selects.scss */ + /* line 30, ../../../../general/res/sass/forms/_selects.scss */ .select select { -moz-appearance: none; -webkit-appearance: none; @@ -3987,10 +3986,10 @@ textarea { border: none !important; padding: 4px 25px 2px 0px; width: 120%; } - /* line 40, ../../../../general/res/sass/forms/_selects.scss */ + /* line 39, ../../../../general/res/sass/forms/_selects.scss */ .select select option { margin: 5px 0; } - /* line 44, ../../../../general/res/sass/forms/_selects.scss */ + /* line 43, ../../../../general/res/sass/forms/_selects.scss */ .select:after { text-shadow: none; content: '\76'; @@ -6431,7 +6430,7 @@ table { * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 31, ../../../../general/res/sass/plots/_plots-main.scss */ +/* line 29, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot { color: #999; font-size: 0.7rem; @@ -6439,10 +6438,10 @@ table { width: 100%; height: 100%; /****************************** Limits and Out-of-Bounds data */ } - /* line 38, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 36, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-axis-area { position: absolute; } - /* line 41, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 38, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-axis-area.gl-plot-x { top: auto; right: 0; @@ -6451,14 +6450,14 @@ table { height: 32px; width: auto; overflow: hidden; } - /* line 50, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 47, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-axis-area.gl-plot-y { top: 25px; right: auto; bottom: 37px; left: 0; width: 60px; } - /* line 59, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 56, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-coords { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -6475,10 +6474,10 @@ table { bottom: auto; left: 70px; z-index: 10; } - /* line 71, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 68, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-coords:empty { display: none; } - /* line 76, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 73, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-display-area { background-color: rgba(0, 0, 0, 0.1); position: absolute; @@ -6488,13 +6487,13 @@ table { left: 60px; cursor: crosshair; border: 1px solid rgba(153, 153, 153, 0.1); } - /* line 89, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 86, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-label, .gl-plot .l-plot-label { color: #666666; position: absolute; text-align: center; } - /* line 97, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 92, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-label.gl-plot-x-label, .gl-plot .gl-plot-label.l-plot-x-label, .gl-plot .l-plot-label.gl-plot-x-label, .gl-plot .l-plot-label.l-plot-x-label { @@ -6503,7 +6502,7 @@ table { bottom: 0; left: 0; height: auto; } - /* line 106, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 101, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-label.gl-plot-y-label, .gl-plot .gl-plot-label.l-plot-y-label, .gl-plot .l-plot-label.gl-plot-y-label, .gl-plot .l-plot-label.l-plot-y-label { @@ -6520,30 +6519,38 @@ table { left: 0; top: 50%; white-space: nowrap; } - /* line 120, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 115, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-x-options, .gl-plot .gl-plot-y-options { position: absolute; - top: 50%; - right: auto; - bottom: auto; - left: auto5px; - margin-top: -16px; height: auto; min-height: 32px; - width: 32px; } - /* line 134, ../../../../general/res/sass/plots/_plots-main.scss */ + z-index: 2; } + /* line 124, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-x-options { + top: 5px; } + /* line 128, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-y-options { + -moz-transform: translateY(-50%); + -ms-transform: translateY(-50%); + -webkit-transform: translateY(-50%); + transform: translateY(-50%); + min-width: 150px; + top: 50%; + left: 20px; } + /* line 135, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-hash { position: absolute; border: 0 rgba(255, 255, 255, 0.2) dashed; } - /* line 137, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 138, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-hash.hash-v { border-right-width: 1px; height: 100%; } - /* line 141, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 142, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-hash.hash-h { border-bottom-width: 1px; width: 100%; } - /* line 147, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 148, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-legend { position: absolute; top: 0; @@ -6553,24 +6560,24 @@ table { height: 20px; overflow-x: hidden; overflow-y: auto; } - /* line 160, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 161, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .l-limit-bar, .gl-plot .l-oob-data { position: absolute; left: 0; right: 0; width: auto; } - /* line 168, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 169, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .l-limit-bar { height: auto; z-index: 0; } - /* line 176, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 177, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .l-limit-bar.s-limit-yellow { background: rgba(255, 170, 0, 0.2); } - /* line 177, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 178, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .l-limit-bar.s-limit-red { background: rgba(255, 0, 0, 0.2); } - /* line 180, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 181, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .l-oob-data { overflow: hidden; position: absolute; @@ -6583,7 +6590,7 @@ table { pointer-events: none; height: 10px; z-index: 1; } - /* line 188, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 189, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .l-oob-data.l-oob-data-up { top: 0; bottom: auto; @@ -6592,7 +6599,7 @@ table { background-image: -moz-linear-gradient(90deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); background-image: -webkit-linear-gradient(90deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); background-image: linear-gradient(0deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); } - /* line 193, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 194, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .l-oob-data.l-oob-data-dwn { bottom: 0; top: auto; @@ -6602,7 +6609,7 @@ table { background-image: -webkit-linear-gradient(270deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); background-image: linear-gradient(180deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); } -/* line 203, ../../../../general/res/sass/plots/_plots-main.scss */ +/* line 204, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot-legend .plot-legend-item, .gl-plot-legend .legend-item, .legend .plot-legend-item, @@ -6610,13 +6617,13 @@ table { display: inline-block; margin-right: 10px; margin-bottom: 3px; } - /* line 208, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 209, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot-legend .plot-legend-item span, .gl-plot-legend .legend-item span, .legend .plot-legend-item span, .legend .legend-item span { vertical-align: middle; } - /* line 211, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 212, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot-legend .plot-legend-item .plot-color-swatch, .gl-plot-legend .plot-legend-item .color-swatch, .gl-plot-legend .legend-item .plot-color-swatch, @@ -6632,29 +6639,29 @@ table { height: 8px; width: 8px; } -/* line 228, ../../../../general/res/sass/plots/_plots-main.scss */ +/* line 223, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot-legend .plot-legend-item { -moz-border-radius: 2px; -webkit-border-radius: 2px; border-radius: 2px; line-height: 1.5em; padding: 0px 5px; } - /* line 234, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 227, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot-legend .plot-legend-item .plot-color-swatch { border: 1px solid #333; height: 9px; width: 9px; } -/* line 242, ../../../../general/res/sass/plots/_plots-main.scss */ +/* line 235, ../../../../general/res/sass/plots/_plots-main.scss */ .tick { position: absolute; border: 0 rgba(255, 255, 255, 0.2) solid; } - /* line 245, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 238, ../../../../general/res/sass/plots/_plots-main.scss */ .tick.tick-x { border-right-width: 1px; height: 100%; } -/* line 251, ../../../../general/res/sass/plots/_plots-main.scss */ +/* line 244, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot-tick, .tick-label { font-size: 0.7rem; @@ -6662,7 +6669,7 @@ table { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } - /* line 259, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 251, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot-tick.gl-plot-x-tick-label, .gl-plot-tick.tick-label-x, .tick-label.gl-plot-x-tick-label, .tick-label.tick-label-x { @@ -6673,7 +6680,7 @@ table { width: 20%; margin-left: -10%; text-align: center; } - /* line 269, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 261, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot-tick.gl-plot-y-tick-label, .gl-plot-tick.tick-label-y, .tick-label.gl-plot-y-tick-label, .tick-label.tick-label-y { @@ -6683,18 +6690,18 @@ table { margin-bottom: -0.5em; text-align: right; } -/* line 281, ../../../../general/res/sass/plots/_plots-main.scss */ +/* line 272, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot-tick.gl-plot-x-tick-label { top: 5px; } -/* line 284, ../../../../general/res/sass/plots/_plots-main.scss */ +/* line 275, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot-tick.gl-plot-y-tick-label { right: 5px; left: 5px; } -/* line 291, ../../../../general/res/sass/plots/_plots-main.scss */ +/* line 282, ../../../../general/res/sass/plots/_plots-main.scss */ .tick-label.tick-label-x { top: 0; } -/* line 294, ../../../../general/res/sass/plots/_plots-main.scss */ +/* line 285, ../../../../general/res/sass/plots/_plots-main.scss */ .tick-label.tick-label-y { right: 0; left: 0; } diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css index 474997dd53..4c5c7171b9 100644 --- a/platform/commonUI/themes/snow/res/css/theme-snow.css +++ b/platform/commonUI/themes/snow/res/css/theme-snow.css @@ -20,7 +20,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 5, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -41,38 +41,38 @@ time, mark, audio, video { font-size: 100%; vertical-align: baseline; } -/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } @@ -3890,13 +3890,12 @@ textarea { transition: background, 0.25s; text-shadow: none; padding: 0 5px; - overflow: hidden; position: relative; line-height: 22px; } /* line 297, ../../../../general/res/sass/_mixins.scss */ .select .icon, .select .t-item-icon { color: #eee; } - /* line 31, ../../../../general/res/sass/forms/_selects.scss */ + /* line 30, ../../../../general/res/sass/forms/_selects.scss */ .select select { -moz-appearance: none; -webkit-appearance: none; @@ -3909,10 +3908,10 @@ textarea { border: none !important; padding: 4px 25px 2px 0px; width: 120%; } - /* line 40, ../../../../general/res/sass/forms/_selects.scss */ + /* line 39, ../../../../general/res/sass/forms/_selects.scss */ .select select option { margin: 5px 0; } - /* line 44, ../../../../general/res/sass/forms/_selects.scss */ + /* line 43, ../../../../general/res/sass/forms/_selects.scss */ .select:after { text-shadow: none; content: '\76'; @@ -6333,7 +6332,7 @@ table { * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 31, ../../../../general/res/sass/plots/_plots-main.scss */ +/* line 29, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot { color: #666; font-size: 0.7rem; @@ -6341,10 +6340,10 @@ table { width: 100%; height: 100%; /****************************** Limits and Out-of-Bounds data */ } - /* line 38, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 36, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-axis-area { position: absolute; } - /* line 41, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 38, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-axis-area.gl-plot-x { top: auto; right: 0; @@ -6353,14 +6352,14 @@ table { height: 32px; width: auto; overflow: hidden; } - /* line 50, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 47, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-axis-area.gl-plot-y { top: 25px; right: auto; bottom: 37px; left: 0; width: 60px; } - /* line 59, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 56, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-coords { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; @@ -6377,10 +6376,10 @@ table { bottom: auto; left: 70px; z-index: 10; } - /* line 71, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 68, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-coords:empty { display: none; } - /* line 76, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 73, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-display-area { background-color: rgba(0, 0, 0, 0.05); position: absolute; @@ -6390,13 +6389,13 @@ table { left: 60px; cursor: crosshair; border: 1px solid rgba(102, 102, 102, 0.2); } - /* line 89, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 86, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-label, .gl-plot .l-plot-label { color: #999999; position: absolute; text-align: center; } - /* line 97, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 92, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-label.gl-plot-x-label, .gl-plot .gl-plot-label.l-plot-x-label, .gl-plot .l-plot-label.gl-plot-x-label, .gl-plot .l-plot-label.l-plot-x-label { @@ -6405,7 +6404,7 @@ table { bottom: 0; left: 0; height: auto; } - /* line 106, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 101, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-label.gl-plot-y-label, .gl-plot .gl-plot-label.l-plot-y-label, .gl-plot .l-plot-label.gl-plot-y-label, .gl-plot .l-plot-label.l-plot-y-label { @@ -6422,30 +6421,38 @@ table { left: 0; top: 50%; white-space: nowrap; } - /* line 120, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 115, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-x-options, .gl-plot .gl-plot-y-options { position: absolute; - top: 50%; - right: auto; - bottom: auto; - left: auto5px; - margin-top: -16px; height: auto; min-height: 32px; - width: 32px; } - /* line 134, ../../../../general/res/sass/plots/_plots-main.scss */ + z-index: 2; } + /* line 124, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-x-options { + top: 5px; } + /* line 128, ../../../../general/res/sass/plots/_plots-main.scss */ + .gl-plot .gl-plot-y-options { + -moz-transform: translateY(-50%); + -ms-transform: translateY(-50%); + -webkit-transform: translateY(-50%); + transform: translateY(-50%); + min-width: 150px; + top: 50%; + left: 20px; } + /* line 135, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-hash { position: absolute; border: 0 rgba(0, 0, 0, 0.2) dashed; } - /* line 137, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 138, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-hash.hash-v { border-right-width: 1px; height: 100%; } - /* line 141, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 142, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-hash.hash-h { border-bottom-width: 1px; width: 100%; } - /* line 147, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 148, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .gl-plot-legend { position: absolute; top: 0; @@ -6455,24 +6462,24 @@ table { height: 20px; overflow-x: hidden; overflow-y: auto; } - /* line 160, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 161, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .l-limit-bar, .gl-plot .l-oob-data { position: absolute; left: 0; right: 0; width: auto; } - /* line 168, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 169, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .l-limit-bar { height: auto; z-index: 0; } - /* line 176, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 177, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .l-limit-bar.s-limit-yellow { background: rgba(255, 170, 0, 0.2); } - /* line 177, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 178, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .l-limit-bar.s-limit-red { background: rgba(255, 0, 0, 0.2); } - /* line 180, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 181, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .l-oob-data { overflow: hidden; position: absolute; @@ -6485,7 +6492,7 @@ table { pointer-events: none; height: 10px; z-index: 1; } - /* line 188, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 189, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .l-oob-data.l-oob-data-up { top: 0; bottom: auto; @@ -6494,7 +6501,7 @@ table { background-image: -moz-linear-gradient(90deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); background-image: -webkit-linear-gradient(90deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); background-image: linear-gradient(0deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); } - /* line 193, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 194, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot .l-oob-data.l-oob-data-dwn { bottom: 0; top: auto; @@ -6504,7 +6511,7 @@ table { background-image: -webkit-linear-gradient(270deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); background-image: linear-gradient(180deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); } -/* line 203, ../../../../general/res/sass/plots/_plots-main.scss */ +/* line 204, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot-legend .plot-legend-item, .gl-plot-legend .legend-item, .legend .plot-legend-item, @@ -6512,13 +6519,13 @@ table { display: inline-block; margin-right: 10px; margin-bottom: 3px; } - /* line 208, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 209, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot-legend .plot-legend-item span, .gl-plot-legend .legend-item span, .legend .plot-legend-item span, .legend .legend-item span { vertical-align: middle; } - /* line 211, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 212, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot-legend .plot-legend-item .plot-color-swatch, .gl-plot-legend .plot-legend-item .color-swatch, .gl-plot-legend .legend-item .plot-color-swatch, @@ -6534,29 +6541,29 @@ table { height: 8px; width: 8px; } -/* line 228, ../../../../general/res/sass/plots/_plots-main.scss */ +/* line 223, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot-legend .plot-legend-item { -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; line-height: 1.5em; padding: 0px 5px; } - /* line 234, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 227, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot-legend .plot-legend-item .plot-color-swatch { border: 1px solid #fcfcfc; height: 9px; width: 9px; } -/* line 242, ../../../../general/res/sass/plots/_plots-main.scss */ +/* line 235, ../../../../general/res/sass/plots/_plots-main.scss */ .tick { position: absolute; border: 0 rgba(0, 0, 0, 0.2) solid; } - /* line 245, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 238, ../../../../general/res/sass/plots/_plots-main.scss */ .tick.tick-x { border-right-width: 1px; height: 100%; } -/* line 251, ../../../../general/res/sass/plots/_plots-main.scss */ +/* line 244, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot-tick, .tick-label { font-size: 0.7rem; @@ -6564,7 +6571,7 @@ table { overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } - /* line 259, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 251, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot-tick.gl-plot-x-tick-label, .gl-plot-tick.tick-label-x, .tick-label.gl-plot-x-tick-label, .tick-label.tick-label-x { @@ -6575,7 +6582,7 @@ table { width: 20%; margin-left: -10%; text-align: center; } - /* line 269, ../../../../general/res/sass/plots/_plots-main.scss */ + /* line 261, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot-tick.gl-plot-y-tick-label, .gl-plot-tick.tick-label-y, .tick-label.gl-plot-y-tick-label, .tick-label.tick-label-y { @@ -6585,18 +6592,18 @@ table { margin-bottom: -0.5em; text-align: right; } -/* line 281, ../../../../general/res/sass/plots/_plots-main.scss */ +/* line 272, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot-tick.gl-plot-x-tick-label { top: 5px; } -/* line 284, ../../../../general/res/sass/plots/_plots-main.scss */ +/* line 275, ../../../../general/res/sass/plots/_plots-main.scss */ .gl-plot-tick.gl-plot-y-tick-label { right: 5px; left: 5px; } -/* line 291, ../../../../general/res/sass/plots/_plots-main.scss */ +/* line 282, ../../../../general/res/sass/plots/_plots-main.scss */ .tick-label.tick-label-x { top: 0; } -/* line 294, ../../../../general/res/sass/plots/_plots-main.scss */ +/* line 285, ../../../../general/res/sass/plots/_plots-main.scss */ .tick-label.tick-label-y { right: 0; left: 0; } diff --git a/platform/features/plot/res/templates/plot.html b/platform/features/plot/res/templates/plot.html index 0a17de15cf..4ad14c7f5b 100644 --- a/platform/features/plot/res/templates/plot.html +++ b/platform/features/plot/res/templates/plot.html @@ -62,7 +62,7 @@ ng-show="representation.showControls" ng-if="axes[1].options.length > 0">
- @@ -160,12 +160,11 @@ {{axes[0].active.name}}
-
-