Merging in open-master; resolved conflict in /platform/.../edit-object.html

platform/commonUI/general/res/sass/_effects.scss

@@ -14,6 +14,10 @@ a.disabled {
     @include boxOutline();
 }
 
+.test-stripes {
+	@include bgDiagonalStripes();
+}
+
 .test {
 	@include test();
 }

platform/commonUI/general/res/sass/_fonts.scss

@@ -1,3 +1,17 @@
+@font-face {
+	/*
+	* Use https://www.web-font-generator.com/ to gen fonts
+	*/
+	font-family: 'symbolsfont';
+	src: url('../fonts/symbols/wtdsymbols.eot');
+	src: url('../fonts/symbols/wtdsymbols.eot?#iefix') format('embedded-opentype'),
+	url('../fonts/symbols/wtdsymbols.woff') format('woff'),
+	url('../fonts/symbols/wtdsymbols.ttf') format('truetype'),
+	url('../fonts/symbols/wtdsymbols.svg#armataregular') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+
 .ui-symbol {
 	font-family: 'symbolsfont';
 }

platform/commonUI/general/res/sass/_global.scss

@@ -1,18 +1,3 @@
-@font-face {
-	/*
-	* Use https://www.web-font-generator.com/ to gen fonts
-	*/
-	font-family: 'symbolsfont';
-	src: url('../fonts/symbols/wtdsymbols.eot');
-	src: url('../fonts/symbols/wtdsymbols.eot?#iefix') format('embedded-opentype'),
-	url('../fonts/symbols/wtdsymbols.woff') format('woff'),
-	url('../fonts/symbols/wtdsymbols.woff2') format('woff2'),
-	url('../fonts/symbols/wtdsymbols.ttf') format('truetype'),
-	url('../fonts/symbols/wtdsymbols.svg#armataregular') format('svg');
-	font-weight: normal;
-	font-style: normal;
-}
-
 a {
 	color: #ccc;
 	cursor: pointer;
@@ -80,6 +65,10 @@ span {
 	white-space: pre;
 }
 
+.align-right {
+	text-align: right;
+}
+
 .centered {
 	text-align: center;
 }

platform/commonUI/general/res/sass/_mixins.scss

@@ -1,6 +1,19 @@
-@mixin trans-prop-nice-resize-h() {
+@mixin absPosDefault($offset: 0px, $overflowHidden: hidden) {
+    overflow: $overflowHidden;
+    position: absolute;
+    top: $offset; right: $offset; bottom: $offset; left: $offset;
+    width: auto; height: auto;
+}
+
+@mixin trans-prop-nice-fade($t: 0.5s) {
+    @include transition-property(visibility, opacity, background-color);
+    @include transition-duration($t);
+    @include transition-timing-function(ease-in-out);
+}
+
+@mixin trans-prop-nice-resize-h($t: 0.5s) {
 	@include transition-property(height, bottom, top);
-	@include transition-duration(0.4s);
+	@include transition-duration($t);
 	@include transition-timing-function(ease-in-out);
 }
 
@@ -24,6 +37,26 @@
 	border-right: $size/$ratio solid transparent;
 }
 
+@mixin bgDiagonalStripes($c: yellow, $a: 0.1, $d: 40px) {
+	@include background-image(linear-gradient(-45deg,
+		rgba($c, $a) 25%, transparent 25%,
+		transparent 50%, rgba($c, $a) 50%,
+		rgba($c, $a) 75%, transparent 75%,
+		transparent 0
+	));
+	background-repeat: repeat;
+	background-size: $d $d;
+}
+
+@mixin bgTicks($c: $colorBodyFg) {
+	$c: $c;
+	@include background-image(linear-gradient(90deg,
+		$c 1px, transparent 1px,
+		transparent 100%
+	));
+	background-repeat: repeat-x;
+}
+
 @mixin containerSubtle($bg: $colorBodyBg, $fg: $colorBodyFg, $hover: false) {
 	@include background-image(linear-gradient(lighten($bg, 10%), lighten($bg, 5%)));
 	@include border-radius($controlCr);
@@ -147,6 +180,22 @@
 	transform: translateY(-50%);
 }
 
+@mixin ellipsize() {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+@mixin scrollH($showBar: auto) {
+    overflow-x: $showBar;
+    overflow-y: hidden;
+}
+
+@mixin scrollV($showBar: auto) {
+    overflow-x: hidden;
+    overflow-y: $showBar;
+}
+
 @mixin wait-spinner($b: 5px, $c: $colorAlt1) {
 	display: block;
 	position: absolute;
@@ -163,4 +212,23 @@
 
 @mixin test($c: #ffcc00, $a: 0.2) {
 	background-color: rgba($c, $a);
+}
+
+
+
+@mixin testObj($w: 2000px, $h: 1000px, $c: black, $a: 0.1) {
+    &:after {
+        @include box-sizing(border-box);
+        @include bgDiagonalStripes($c, $a);
+        color: rgba(white, 0.3);
+        font-style: italic;
+        content: "Test Object";
+        display: block;
+        padding: 20px;
+        position: relative;
+        width: $w;
+        height: $h;
+        transform: scaleX(1) scaleY(1) scaleZ(1);
+        transform-origin: 50% 50% 0;
+    }
 }

platform/commonUI/general/res/sass/plots/_plots-main.scss

@@ -62,14 +62,16 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa
 		border: 1px solid $colorInteriorBorder;
 	}
 
-	.gl-plot-label {
+	.gl-plot-label,
+	.l-plot-label {
 		//		@include test(yellow);
 		color: lighten($colorBodyFg, 20%);
 		position: absolute;
 		text-align: center;
 //		text-transform: uppercase;
 
-		&.gl-plot-x-label {
+		&.gl-plot-x-label,
+		&.l-plot-x-label {
 			top: auto;
 			right: 0;
 			bottom: 0;
@@ -77,7 +79,8 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa
 			height: auto;
 		}
 
-		&.gl-plot-y-label {
+		&.gl-plot-y-label,
+		&.l-plot-y-label  {
 			$x: -50%;
 			$r: -90deg;
 			@include transform-origin(50%, 0);