alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merging in latest github master; resolved conflicts

Browse Source
This commit is contained in:
Charles Hacskaylo
2015-11-10 16:13:46 -08:00
parent 8fb6ab61ba 7264a711a3
commit 608df8f7b8
336 changed files with 32938 additions and 6662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
platform/features/layout/res/templates/frame.html
View File

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