ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-20 17:33:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed some merge issues

Browse Source
This commit is contained in:
Henry 2016-07-11 13:46:46 -07:00
parent 11caa8396a
commit 585da38a16
2 changed files with 0 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
platform/features/conductor-v2/res/templates/mode-selector/mode-selector.html
View File

@ -19,23 +19,6 @@
this source code distribution or the Licensing information page available
at runtime from the About dialog for additional information.
-->
<!--<style>
.super-menu.mode-selector-menu {
width: 400px;
}
.super-menu.mode-selector-menu {
height: 200px;
bottom: 0px;
}
.super-menu.mode-selector-menu .menu-item-description .desc-area.icon {
height: 20%;
font-size: 3em;
line-height: normal;
}
.super-menu .mode-selector-menu .menu-item-description .desc-area.description {
height: 60%;
}
</style>-->
<span ng-controller="ClickAwayController as modeController">
<div class="s-menu-btn"
ng-click="modeController.toggle()">

28
platform/features/conductor-v2/res/templates/time-conductor.html
View File

@ -1,31 +1,3 @@
<style>
.time-system .menu{
bottom: 10px;
}
.l-data-availability {
width: 100%;
height: 20px;
background-color: #3b3b3b
}
.l-time-range-inputs-elem {
width: 100%;
}
.l-time-range-inputs-elem.l-flex-row {
justify-content: space-between;
}
.l-axis-holder {
height: 30px;
width: 100%;
}
.l-axis-holder svg, .l-axis-holder svg path,
.l-axis-holder svg line {
stroke: #A0A0A0;
}
</style>
<!-- Parent holder for time conductor. follow-mode | fixed-mode -->
<div ng-controller="TimeConductorController as tcController"
class="l-time-conductor l-flex-col {{modeModel.selected}}-mode">