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

[Front-end] Menu tweaks

Browse Source 
Fixes #1729
Mini super-menu and related description text
This commit is contained in:
Charles Hacskaylo 2017-09-25 12:08:04 -07:00
parent 78f49784a0
commit bc7d92ee0d
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
platform/commonUI/general/res/sass/controls/_menus.scss
View File

@ -72,17 +72,12 @@
position: relative; position: relative;
} }
.s-menu {
border-radius: $basicCr;
@include containerSubtle($colorMenuBg, $colorMenuFg);
@include boxShdw($shdwMenu);
@include txtShdw($shdwMenuText);
padding: $interiorMarginSm 0;
}
.menu { .menu {
// TODO: reduce size of icons border-radius: $basicCr;
@extend .s-menu; @include containerSubtle($colorMenuBg, $colorMenuFg);
@include boxShdw($shdwMenu);
@include txtShdw($shdwMenuText);
padding: $interiorMarginSm 0;
display: block; display: block;
position: absolute; position: absolute;
z-index: 10; z-index: 10;
@ -92,7 +87,6 @@
box-sizing: border-box; box-sizing: border-box;
border-top: 1px solid pullForward($colorMenuBg, 10%); border-top: 1px solid pullForward($colorMenuBg, 10%);
color: $colorMenuFg; color: $colorMenuFg;
//color: pullForward($colorMenuBg, 60%);
line-height: $menuLineH; line-height: $menuLineH;
padding: $interiorMarginSm $interiorMargin * 2 $interiorMarginSm ($interiorMargin * 2) + $treeTypeIconW; padding: $interiorMarginSm $interiorMargin * 2 $interiorMarginSm ($interiorMargin * 2) + $treeTypeIconW;
position: relative; position: relative;
@ -203,7 +197,6 @@
} }
} }
&.menu-item-description { &.menu-item-description {
@include test(blue);
overflow-y: hidden; overflow-y: hidden;
padding: $interiorMargin * 5; padding: $interiorMargin * 5;
width: $prw; width: $prw;
@ -232,7 +225,7 @@
&.mini { &.mini {
width: 400px; width: 400px;
.col { .col {
height: 350px; height: 320px;
max-height: 50vh; max-height: 50vh;
&.menu-items { &.menu-items {
font-size: 0.8em; font-size: 0.8em;

2
platform/features/conductor/core/src/ui/TimeConductorController.js
View File

@ -201,7 +201,7 @@ define(
var options = [{ var options = [{
key: 'fixed', key: 'fixed',
name: 'Fixed Timespan Mode', name: 'Fixed Timespan Mode',
description: 'Query and explore data that falls between two fixed datetimes', description: 'Query and explore data that falls between two fixed datetimes.',
cssClass: 'icon-calendar' cssClass: 'icon-calendar'
}]; }];
var clocks = {}; var clocks = {};

3
src/plugins/utcTimeSystem/LocalClock.js
View File

@ -37,8 +37,7 @@ define(['EventEmitter'], function (EventEmitter) {
this.key = 'local'; this.key = 'local';
this.cssClass = 'icon-clock'; this.cssClass = 'icon-clock';
this.name = 'Local Clock'; this.name = 'Local Clock';
this.description = "Updates every second, providing UTC timestamps from " + this.description = "Provides UTC timestamps every second from the local system clock.";
"user's local computer.";
this.period = period; this.period = period;
this.timeoutHandle = undefined; this.timeoutHandle = undefined;