Merge branch 'master' into open117

platform/features/layout/bundle.json

@@ -1,6 +1,6 @@
 {
     "name": "Layout components.",
-    "description": "Plug in adding Layout capabiltiies.",
+    "description": "Plug in adding Layout capabilities.",
     "extensions": {
         "views": [
             {
@@ -85,7 +85,7 @@
                                 },
                                 {
                                     "property": "fill",
-                                    "glyph": "\u00E0",
+                                    "glyph": "\ue606",
                                     "control": "color"
                                 },
                                 {
@@ -259,16 +259,6 @@
                         "pattern": "^(\\d*[1-9]\\d*)?$",
                         "property": "layoutGrid",
                         "conversion": "number[]"
-                    },
-                    {
-                        "name": "Default View",
-                        "control": "select",
-                        "options": [
-                            { "name": "Plot", "value": "plot" },
-                            { "name": "Scrolling", "value": "scrolling" }
-                        ],
-                        "comment": "TODO: Infer values from type",
-                        "key": "defaultView"
                     }
                 ]
             }

platform/features/layout/res/templates/frame.html

@@ -20,13 +20,12 @@
  at runtime from the About dialog for additional information.
 -->
 <div class="frame frame-template abs">
-    <div class="bar abs object-header object-top-bar">
-        <div class="title left abs">
-            <mct-representation key="'node'"
-                                mct-object="domainObject">
+    <div class="bar abs l-flex object-header object-top-bar">
+        <div class="left">
+            <mct-representation key="'object-header'" mct-object="domainObject">
             </mct-representation>
         </div>
-        <div class="btn-bar right abs">
+        <div class="btn-bar right">
             <mct-representation key="'switcher'"
                                 ng-model="representation"
                                 mct-object="domainObject">

platform/features/layout/src/FixedController.js

@@ -273,6 +273,7 @@ define(
             // Position a panel after a drop event
             function handleDrop(e, id, position) {
                 // Don't handle this event if it has already been handled
+                // color is set to "" to let the CSS theme determine the default color
                 if (e.defaultPrevented) {
                     return;
                 }
@@ -284,7 +285,7 @@ define(
                     y: Math.floor(position.y / self.gridSize[1]),
                     id: id,
                     stroke: "transparent",
-                    color: "#cccccc",
+                    color: "",
                     titled: true,
                     width: DEFAULT_DIMENSIONS[0],
                     height: DEFAULT_DIMENSIONS[1]

platform/features/layout/src/elements/ElementFactory.js

@@ -44,8 +44,7 @@ define(
                 },
                 "fixed.text": {
                     fill: "transparent",
-                    stroke: "transparent",
-                    color: "#cccccc"
+                    stroke: "transparent"
                 }
             },
             DIALOGS = {