diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css index 7938262bbd..5e1f434a1b 100644 --- a/platform/commonUI/general/res/css/theme-espresso.css +++ b/platform/commonUI/general/res/css/theme-espresso.css @@ -84,7 +84,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/* line 5, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 5, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, @@ -105,38 +105,38 @@ time, mark, audio, video { font-size: 100%; vertical-align: baseline; } -/* line 22, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 22, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ html { line-height: 1; } -/* line 24, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 24, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ ol, ul { list-style: none; } -/* line 26, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 26, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ table { border-collapse: collapse; border-spacing: 0; } -/* line 28, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 28, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; } -/* line 30, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 30, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q, blockquote { quotes: none; } - /* line 103, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ + /* line 103, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ q:before, q:after, blockquote:before, blockquote:after { content: ""; content: none; } -/* line 32, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 32, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ a img { border: none; } -/* line 116, ../../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ +/* line 116, ../../../../../../../../../Library/Ruby/Gems/2.0.0/gems/compass-core-1.0.3/stylesheets/compass/reset/_utilities.scss */ article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary { display: block; } @@ -1387,8 +1387,9 @@ span { box-sizing: border-box; text-shadow: rgba(0, 0, 0, 0.3) 0 1px 1px; cursor: pointer; + line-height: 1.2em; text-decoration: none; } - /* line 63, ../sass/controls/_buttons.scss */ + /* line 64, ../sass/controls/_buttons.scss */ .btn.major, .s-btn.major, .major.icon-btn, @@ -1437,7 +1438,7 @@ span { .major.btn-menu.icon-btn .invoke-menu, .major.btn-menu.s-icon-btn .invoke-menu { color: #52d4ff; } - /* line 68, ../sass/controls/_buttons.scss */ + /* line 69, ../sass/controls/_buttons.scss */ .btn.major:hover, .s-btn.major:hover, .major.icon-btn:hover, @@ -1485,13 +1486,13 @@ span { .major.icon-btn:hover.btn-menu .invoke-menu, .major.s-icon-btn:hover.btn-menu .invoke-menu { color: #6bdaff; } - /* line 72, ../sass/controls/_buttons.scss */ + /* line 73, ../sass/controls/_buttons.scss */ .btn.major .invoke-menu, .s-btn.major .invoke-menu, .major.icon-btn .invoke-menu, .major.s-icon-btn .invoke-menu { color: #ccf2ff; } - /* line 76, ../sass/controls/_buttons.scss */ + /* line 77, ../sass/controls/_buttons.scss */ .btn.subtle, .s-btn.subtle, .subtle.icon-btn, @@ -1539,7 +1540,7 @@ span { .subtle.btn-menu.icon-btn .invoke-menu, .subtle.btn-menu.s-icon-btn .invoke-menu { color: #a8a8a8; } - /* line 79, ../sass/controls/_buttons.scss */ + /* line 80, ../sass/controls/_buttons.scss */ .btn.very-subtle, .btn.s-very-subtle, .s-btn.very-subtle, .very-subtle.icon-btn, @@ -1599,7 +1600,7 @@ span { .s-very-subtle.btn-menu.icon-btn .invoke-menu, .s-very-subtle.btn-menu.s-icon-btn .invoke-menu { color: #757575; } - /* line 82, ../sass/controls/_buttons.scss */ + /* line 83, ../sass/controls/_buttons.scss */ .btn.very-subtle.paused, .btn.s-very-subtle.paused, .s-btn.very-subtle.paused, .very-subtle.paused.icon-btn, @@ -1659,7 +1660,7 @@ span { .s-very-subtle.paused.btn-menu.icon-btn .invoke-menu, .s-very-subtle.paused.btn-menu.s-icon-btn .invoke-menu { color: #feb04d; } - /* line 84, ../sass/controls/_buttons.scss */ + /* line 85, ../sass/controls/_buttons.scss */ .btn.very-subtle.paused .icon:before, .btn.s-very-subtle.paused .icon:before, .s-btn.very-subtle.paused .icon:before, .very-subtle.paused.icon-btn .icon:before, @@ -1669,35 +1670,35 @@ span { .s-very-subtle.paused.s-icon-btn .icon:before { content: "\0000EF"; } -/* line 91, ../sass/controls/_buttons.scss */ +/* line 92, ../sass/controls/_buttons.scss */ .icon-btn, .s-icon-btn { font-size: 1em; } - /* line 95, ../sass/controls/_buttons.scss */ + /* line 96, ../sass/controls/_buttons.scss */ .icon-btn .icon, .s-icon-btn .icon { color: #0099cc; } - /* line 99, ../sass/controls/_buttons.scss */ + /* line 100, ../sass/controls/_buttons.scss */ .icon-btn.paused .icon, .s-icon-btn.paused .icon { color: #fff; } - /* line 107, ../sass/controls/_buttons.scss */ + /* line 108, ../sass/controls/_buttons.scss */ .icon-btn:not(.disabled):not(.paused):hover .icon, .s-icon-btn:not(.disabled):not(.paused):hover .icon { color: #33ccff; } - /* line 114, ../sass/controls/_buttons.scss */ + /* line 115, ../sass/controls/_buttons.scss */ .icon-btn.labeled, .s-icon-btn.labeled { padding: 0 3.75px; } - /* line 116, ../sass/controls/_buttons.scss */ + /* line 117, ../sass/controls/_buttons.scss */ .icon-btn.labeled .icon, .s-icon-btn.labeled .icon { font-size: 1.5em; } - /* line 119, ../sass/controls/_buttons.scss */ + /* line 120, ../sass/controls/_buttons.scss */ .icon-btn.labeled .title-label, .s-icon-btn.labeled .title-label { margin-left: 5px; } - /* line 125, ../sass/controls/_buttons.scss */ + /* line 126, ../sass/controls/_buttons.scss */ .icon-btn.pause-play.paused, .s-icon-btn.pause-play.paused { -moz-animation-name: pulse; @@ -1715,17 +1716,17 @@ span { -moz-animation-timing-function: ease-in-out; -webkit-animation-timing-function: ease-in-out; animation-timing-function: ease-in-out; } - /* line 128, ../sass/controls/_buttons.scss */ + /* line 129, ../sass/controls/_buttons.scss */ .icon-btn.pause-play .icon:before, .s-icon-btn.pause-play .icon:before { content: "\0000F1"; } - /* line 134, ../sass/controls/_buttons.scss */ + /* line 135, ../sass/controls/_buttons.scss */ .icon-btn.show-thumbs .icon:before, .s-icon-btn.show-thumbs .icon:before { content: "\000039"; } /*********************************** LAYOUT STYLES */ -/* line 141, ../sass/controls/_buttons.scss */ +/* line 142, ../sass/controls/_buttons.scss */ span.btn, span.btn span, span.l-btn, @@ -1736,6 +1737,16 @@ a.l-btn, a.l-btn span { display: inline-block; } +/* line 153, ../sass/controls/_buttons.scss */ +.l-btn { + padding: 0 7.5px; } + /* line 155, ../sass/controls/_buttons.scss */ + .l-btn.sm { + padding: 0 5px; } + /* line 158, ../sass/controls/_buttons.scss */ + .l-btn.vsm { + padding: 0 2.5px; } + /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -2845,6 +2856,103 @@ label.checkbox.custom { font-size: 0.9em; line-height: 1em; } +/* line 1, ../sass/controls/_time-controller.scss */ +.l-time-controller { + position: relative; + margin: 10px 0; + min-width: 400px; } + /* line 12, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-inputs-holder, + .l-time-controller .l-time-range-slider { + font-size: 0.8em; } + /* line 17, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-inputs-holder, + .l-time-controller .l-time-range-slider-holder, + .l-time-controller .l-time-range-ticks-holder { + margin-bottom: 5px; + position: relative; } + /* line 24, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-slider, + .l-time-controller .l-time-range-ticks { + overflow: visible; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + width: auto; + height: auto; } + /* line 30, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-inputs-holder { + height: 20px; } + /* line 34, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-slider, + .l-time-controller .l-time-range-ticks { + left: 90px; + right: 90px; } + /* line 40, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-slider-holder { + height: 30px; } + /* line 42, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-slider-holder .range-holder { + -moz-box-shadow: none; + -webkit-box-shadow: none; + box-shadow: none; + background: none; + border: none; + height: 75%; } + /* line 50, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-ticks-holder { + height: 10px; } + /* line 52, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks { + border-top: 1px solid #4d4d4d; } + /* line 54, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick { + background-color: #4d4d4d; + border: none; + width: 1px; + margin-left: -1px; } + /* line 59, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick:first-child { + margin-left: 0; } + /* line 62, ../sass/controls/_time-controller.scss */ + .l-time-controller .l-time-range-ticks-holder .l-time-range-ticks .tick .l-time-range-tick-label { + color: gray; + font-size: 0.7em; + position: absolute; + margin-left: -25px; + text-align: center; + top: 10px; + width: 50px; + z-index: 2; } + /* line 76, ../sass/controls/_time-controller.scss */ + .l-time-controller .knob { + width: 9px; } + /* line 78, ../sass/controls/_time-controller.scss */ + .l-time-controller .knob .range-value { + position: absolute; + top: 50%; + margin-top: -7px; + white-space: nowrap; + width: 75px; } + /* line 87, ../sass/controls/_time-controller.scss */ + .l-time-controller .knob:hover .range-value { + color: #0099cc; } + /* line 90, ../sass/controls/_time-controller.scss */ + .l-time-controller .knob.knob-l { + margin-left: -4.5px; } + /* line 92, ../sass/controls/_time-controller.scss */ + .l-time-controller .knob.knob-l .range-value { + text-align: right; + right: 14px; } + /* line 97, ../sass/controls/_time-controller.scss */ + .l-time-controller .knob.knob-r { + margin-right: -4.5px; } + /* line 99, ../sass/controls/_time-controller.scss */ + .l-time-controller .knob.knob-r .range-value { + left: 14px; } + /***************************************************************************** * Open MCT Web, Copyright (c) 2014-2015, United States Government * as represented by the Administrator of the National Aeronautics and Space diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index 666021fc7a..e5385b19ac 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -62,6 +62,11 @@ $colorInfoBubbleFg: #666; $colorInfoBubbleBg: #ddd; $colorThumbsBubbleFg: lighten($colorBodyFg, 10%); $colorThumbsBubbleBg: lighten($colorBodyBg, 10%); +$colorLimitYellow: #9d7500; +$colorLimitRed: #aa0000; +$colorTelemFresh: #fff; +$colorTelemStale: #888; +$styleTelemState: italic; // Ratios $ltGamma: 20%; diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss index 1583d19906..fac4ebb85c 100644 --- a/platform/commonUI/general/res/sass/_main.scss +++ b/platform/commonUI/general/res/sass/_main.scss @@ -47,6 +47,7 @@ @import "controls/menus"; @import "features/imagery"; @import "features/time-display"; +@import "controls/time-controller"; @import "forms/mixins"; @import "forms/elems"; @import "forms/validation"; diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index e411ccafdb..d9d36b0b37 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -59,6 +59,7 @@ $pad: $interiorMargin * $baseRatio; @include box-sizing(border-box); @include text-shadow(rgba(black, 0.3) 0 1px 1px); cursor: pointer; + line-height: 1.2em; text-decoration: none; &.major { $bg: $colorKey; @@ -147,4 +148,14 @@ a.btn span, a.l-btn, a.l-btn span { display: inline-block; +} + +.l-btn { + padding: 0 $pad; + &.sm { + padding: 0 $interiorMargin; + } + &.vsm { + padding: 0 $interiorMargin/2; + } } \ No newline at end of file diff --git a/platform/features/plot/res/templates/plot.html b/platform/features/plot/res/templates/plot.html index 390ead60c7..dd1d5356f5 100644 --- a/platform/features/plot/res/templates/plot.html +++ b/platform/features/plot/res/templates/plot.html @@ -87,10 +87,10 @@ -
+ >