Fixes normalize.min.css

- Add as slightly renamed .scss file to avoid issues arising from
.gitignore excluding .css files;

src/plugins/plot/res/templates/mct-plot.html

@@ -110,25 +110,25 @@
     </div>
 
     <div class="plot-wrapper-axis-and-display-area flex-elem grows">
-        <div class="gl-plot-axis-area gl-plot-y has-local-controls"
+        <div class="gl-plot-axis-area gl-plot-y"
              ng-style="{
                  width: (tickWidth + 30) + 'px'
              }">
 
-            <div class="gl-plot-label gl-plot-y-label"
-                ng-class="{'icon-gear': (yKeyOptions.length > 1 && series.length === 1)}"
-                ng-bind="yAxisLabel">
+            <div class="gl-plot-label gl-plot-y-label" ng-if="!yKeyOptions">
+                {{ yAxis.get('label') }}
             </div>
 
-            <select  class="gl-plot-y-label__select local-controls--hidden"
-                     ng-if="yKeyOptions.length > 1 && series.length === 1"
-                     ng-model="yAxisLabel" ng-change="plot.toggleYAxisLabel(yAxisLabel, yKeyOptions, series[0])">
-                <option ng-repeat="option in yKeyOptions"
-                        value="{{option.name}}"
-                        ng-selected="option.name === yAxisLabel">
-                    {{option.name}}
-                </option>
-            </select>
+            <div class="gl-plot-label gl-plot-y-label" ng-if="yKeyOptions.length > 1 && series.length === 1">
+                <select  class="gl-plot-y-label__select"
+                         ng-model="yAxisLabel" ng-change="plot.toggleYAxisLabel(yAxisLabel, yKeyOptions, series[0])">
+                    <option ng-repeat="option in yKeyOptions"
+                            value="{{option.name}}"
+                            ng-selected="option.name === yAxisLabel">
+                        {{option.name}}
+                    </option>
+                </select>
+            </div>
             
 
             <mct-ticks axis="yAxis">

src/plugins/plot/src/plot/MCTPlotController.js

@@ -526,7 +526,6 @@ define([
 
         if (yAxisObject) {
             series.emit('change:yKey', yAxisObject.key);
-            this.$scope.yAxisLabel = label;
         }
     };
 

src/plugins/plot/src/telemetry/PlotController.js

@@ -277,18 +277,22 @@ define([
      * Export view as JPG.
      */
     PlotController.prototype.exportJPG = function () {
-        var plotElement = this.$element.children()[1];
-
-        this.exportImageService.exportJPG(plotElement, 'plot.jpg', 'export-plot');
+        this.hideExportButtons = true;
+        this.exportImageService.exportJPG(this.$element[0], 'plot.jpg', 'export-plot')
+            .finally(function () {
+                this.hideExportButtons = false;
+            }.bind(this));
     };
 
     /**
      * Export view as PNG.
      */
     PlotController.prototype.exportPNG = function () {
-        var plotElement = this.$element.children()[1];
-
-        this.exportImageService.exportPNG(plotElement, 'plot.png', 'export-plot');
+        this.hideExportButtons = true;
+        this.exportImageService.exportPNG(this.$element[0], 'plot.png', 'export-plot')
+            .finally(function () {
+                this.hideExportButtons = false;
+            }.bind(this));
     };
 
     PlotController.prototype.toggleCursorGuide = function ($event) {

src/styles/_legacy-plots.scss

@@ -126,12 +126,6 @@ mct-plot {
             bottom: nth($plotDisplayArea, 3);
             left: 0;
             width: $plotYBarW;
-
-            &:hover {
-                .gl-plot-y-label__select {
-                    display: block;
-                }
-            }
         }
     }
 
@@ -168,21 +162,22 @@ mct-plot {
         }
 
         &.gl-plot-y-label {
-            display: block;
-            left: 0; top: 0; right: auto; bottom: 0;
-            padding-left: 5px;
-            text-orientation: mixed;
-            overflow: hidden;
-            writing-mode: vertical-lr;
-        }
-    }
+            $x: -50%;
+            $r: -90deg;
+            transform-origin: 50% 0;
+            transform: translateX($x) rotate($r);
+            display: inline-block;
+            margin-left: $interiorMargin; // Kick off the left edge
+            left: 0;
+            top: 50%;
+            white-space: nowrap;
 
-    .gl-plot-y-label__select {
-        position: absolute;
-        top: 50%;
-        transform: translateY(-50%);
-        left: 20px;
-        z-index: 10;
+            select {
+                background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' width='10' height='10'%3e%3cpath fill='%23#{svgColorFromHex($colorSelectArw)}' d='M0 5l5 5V0L0 5z'/%3e%3c/svg%3e");
+                background-position: left .4em top 50%, 0 0;
+                padding: 1px $interiorMargin 1px 20px;
+            }
+        }
     }
 
     .gl-plot-x-options,

src/styles/core.scss

@@ -20,7 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-@import "vendor/normalize.min.css";
+@import "vendor/normalize-min";
 @import "sass-base";
 
 /******************** RENDERS CSS */

src/styles/vendor/normalize-min.scss

@@ -0,0 +1 @@
+/*! normalize.css v1.1.2 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none;height:0}[hidden]{display:none}html{font-size:100%;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}html,button,input,select,textarea{font-family:sans-serif}body{margin:0}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{font-size:2em;margin:.67em 0}h2{font-size:1.5em;margin:.83em 0}h3{font-size:1.17em;margin:1em 0}h4{font-size:1em;margin:1.33em 0}h5{font-size:.83em;margin:1.67em 0}h6{font-size:.67em;margin:2.33em 0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}blockquote{margin:1em 40px}dfn{font-style:italic}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}mark{background:#ff0;color:#000}p,pre{margin:1em 0}code,kbd,pre,samp{font-family:monospace,serif;_font-family:'courier new',monospace;font-size:1em}pre{white-space:pre;white-space:pre-wrap;word-wrap:break-word}q{quotes:none}q:before,q:after{content:'';content:none}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}dl,menu,ol,ul{margin:1em 0}dd{margin:0 0 0 40px}menu,ol,ul{padding:0 0 0 40px}nav ul,nav ol{list-style:none;list-style-image:none}img{border:0;-ms-interpolation-mode:bicubic}svg:not(:root){overflow:hidden}figure{margin:0}form{margin:0}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0;white-space:normal;*margin-left:-7px}button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer;*overflow:visible}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0;*height:13px;*width:13px}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}