Merging in latest github master; resolved conflicts

2015-11-10 16:13:46 -08:00
parent 8fb6ab61ba 7264a711a3
commit 608df8f7b8
336 changed files with 32938 additions and 6662 deletions
--- a/platform/commonUI/edit/res/templates/topbar-edit.html
+++ b/platform/commonUI/edit/res/templates/topbar-edit.html
@@ -22,7 +22,8 @@
 <div class='top-bar edit abs'>
    <mct-representation key="'object-header'"
                        mct-object="domainObject"
-                        parameters="{ mode: 'Edit' }">
+                        parameters="{ mode: 'Edit' }"
+                        class="l-flex-row flex-elem grows object-header">
    </mct-representation>
    <div class='buttons-main btn-bar buttons abs'>
        <mct-representation key="'switcher'"