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

Merge branch 'mobile' into mobile-integration

Browse Source
This commit is contained in:
Pete Richards
2015-09-22 10:55:43 -07:00
parent ad552511c1 0c1f77cfab
commit 480da3476e
90 changed files with 4250 additions and 1635 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/features/imagery/res/templates/imagery.html
View File

@@ -33,7 +33,7 @@
>
</div>
<div class="l-image-main-controlbar bar">
<div class="l-image-main-controlbar l-flex bar">
<div class="left">
<a
class="t-btn l-btn s-btn s-icon-btn s-very-subtle show-thumbs sm"

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

@@ -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">