Merge branch 'open-master' into open940b

Merge in latest from open-master into topic branch for WTD-940, merge of fixed position look-and-feel updates. Conflicts: platform/features/layout/src/FixedController.js platform/features/layout/src/elements/ElementFactory.js
2025-06-19 07:38:15 +00:00 · 2015-03-04 14:52:01 -08:00
parent 4f89911739 e6fae358d9
commit 93debb4abe
4 changed files with 114 additions and 26 deletions
--- a/platform/features/layout/src/elements/ElementFactory.js
+++ b/platform/features/layout/src/elements/ElementFactory.js
@ -25,6 +25,13 @@ define(
                    fill: "transparent",
                    stroke: "transparent",
                    color: "#cccccc"
+                },
+                "fixed.telemetry": {
+                    stroke: "transparent",
+                    color: "#cccccc",
+                    titled: true,
+                    width: 2,
+                    height: 1
                }
            },
            DIALOGS = {