diff --git a/platform/commonUI/general/res/sass/controls/_menus.scss b/platform/commonUI/general/res/sass/controls/_menus.scss index 67520aa7bf..679ce9a1f6 100644 --- a/platform/commonUI/general/res/sass/controls/_menus.scss +++ b/platform/commonUI/general/res/sass/controls/_menus.scss @@ -72,17 +72,12 @@ position: relative; } -.s-menu { - border-radius: $basicCr; - @include containerSubtle($colorMenuBg, $colorMenuFg); - @include boxShdw($shdwMenu); - @include txtShdw($shdwMenuText); - padding: $interiorMarginSm 0; -} - .menu { - // TODO: reduce size of icons - @extend .s-menu; + border-radius: $basicCr; + @include containerSubtle($colorMenuBg, $colorMenuFg); + @include boxShdw($shdwMenu); + @include txtShdw($shdwMenuText); + padding: $interiorMarginSm 0; display: block; position: absolute; z-index: 10; @@ -92,7 +87,6 @@ box-sizing: border-box; border-top: 1px solid pullForward($colorMenuBg, 10%); color: $colorMenuFg; - //color: pullForward($colorMenuBg, 60%); line-height: $menuLineH; padding: $interiorMarginSm $interiorMargin * 2 $interiorMarginSm ($interiorMargin * 2) + $treeTypeIconW; position: relative; @@ -203,7 +197,6 @@ } } &.menu-item-description { - @include test(blue); overflow-y: hidden; padding: $interiorMargin * 5; width: $prw; @@ -232,7 +225,7 @@ &.mini { width: 400px; .col { - height: 350px; + height: 320px; max-height: 50vh; &.menu-items { font-size: 0.8em; diff --git a/platform/features/conductor/core/src/ui/TimeConductorController.js b/platform/features/conductor/core/src/ui/TimeConductorController.js index 76ea01efb6..7c53f23992 100644 --- a/platform/features/conductor/core/src/ui/TimeConductorController.js +++ b/platform/features/conductor/core/src/ui/TimeConductorController.js @@ -201,7 +201,7 @@ define( var options = [{ key: 'fixed', 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' }]; var clocks = {}; diff --git a/src/plugins/utcTimeSystem/LocalClock.js b/src/plugins/utcTimeSystem/LocalClock.js index 5fc3cc2752..76b6815178 100644 --- a/src/plugins/utcTimeSystem/LocalClock.js +++ b/src/plugins/utcTimeSystem/LocalClock.js @@ -37,8 +37,7 @@ define(['EventEmitter'], function (EventEmitter) { this.key = 'local'; this.cssClass = 'icon-clock'; this.name = 'Local Clock'; - this.description = "Updates every second, providing UTC timestamps from " + - "user's local computer."; + this.description = "Provides UTC timestamps every second from the local system clock."; this.period = period; this.timeoutHandle = undefined;