diff --git a/platform/commonUI/general/bundle.json b/platform/commonUI/general/bundle.json
index f05f0e2be4..2923d96c47 100644
--- a/platform/commonUI/general/bundle.json
+++ b/platform/commonUI/general/bundle.json
@@ -43,6 +43,10 @@
{
"key": "indicator",
"templateUrl": "templates/indicator.html"
+ },
+ {
+ "key": "time-controller",
+ "templateUrl": "templates/controls/time-controller.html"
}
],
"controllers": [
diff --git a/platform/commonUI/general/res/css/plots.css b/platform/commonUI/general/res/css/plots.css
deleted file mode 100644
index 924bef15c4..0000000000
--- a/platform/commonUI/general/res/css/plots.css
+++ /dev/null
@@ -1,350 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/* line 31, ../sass/plots/_plots-main.scss */
-.gl-plot {
- color: #999;
- font-size: 0.7rem;
- position: relative;
- width: 100%;
- height: 100%;
- /****************************** Limits and Out-of-Bounds data */ }
- /* line 38, ../sass/plots/_plots-main.scss */
- .gl-plot .gl-plot-axis-area {
- position: absolute; }
- /* line 41, ../sass/plots/_plots-main.scss */
- .gl-plot .gl-plot-axis-area.gl-plot-x {
- top: auto;
- right: 0;
- bottom: 5px;
- left: 60px;
- height: 32px;
- width: auto;
- overflow: hidden; }
- /* line 50, ../sass/plots/_plots-main.scss */
- .gl-plot .gl-plot-axis-area.gl-plot-y {
- top: 29px;
- right: auto;
- bottom: 37px;
- left: 0;
- width: 60px; }
- /* line 59, ../sass/plots/_plots-main.scss */
- .gl-plot .gl-plot-coords {
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
- box-sizing: border-box;
- -moz-border-radius: 3px;
- -webkit-border-radius: 3px;
- border-radius: 3px;
- background: black;
- color: #e6e6e6;
- padding: 2px 5px;
- position: absolute;
- top: 39px;
- right: auto;
- bottom: auto;
- left: 70px;
- z-index: 10; }
- /* line 71, ../sass/plots/_plots-main.scss */
- .gl-plot .gl-plot-coords:empty {
- display: none; }
- /* line 76, ../sass/plots/_plots-main.scss */
- .gl-plot .gl-plot-display-area {
- position: absolute;
- top: 29px;
- right: 0;
- bottom: 37px;
- left: 60px;
- cursor: crosshair;
- border: 1px solid #4d4d4d; }
- /* line 86, ../sass/plots/_plots-main.scss */
- .gl-plot .gl-plot-label,
- .gl-plot .l-plot-label {
- color: #cccccc;
- position: absolute;
- text-align: center; }
- /* line 94, ../sass/plots/_plots-main.scss */
- .gl-plot .gl-plot-label.gl-plot-x-label, .gl-plot .gl-plot-label.l-plot-x-label,
- .gl-plot .l-plot-label.gl-plot-x-label,
- .gl-plot .l-plot-label.l-plot-x-label {
- top: auto;
- right: 0;
- bottom: 0;
- left: 0;
- height: auto; }
- /* line 103, ../sass/plots/_plots-main.scss */
- .gl-plot .gl-plot-label.gl-plot-y-label, .gl-plot .gl-plot-label.l-plot-y-label,
- .gl-plot .l-plot-label.gl-plot-y-label,
- .gl-plot .l-plot-label.l-plot-y-label {
- -moz-transform-origin: 50% 0;
- -ms-transform-origin: 50% 0;
- -webkit-transform-origin: 50% 0;
- transform-origin: 50% 0;
- -moz-transform: translateX(-50%) rotate(-90deg);
- -ms-transform: translateX(-50%) rotate(-90deg);
- -webkit-transform: translateX(-50%) rotate(-90deg);
- transform: translateX(-50%) rotate(-90deg);
- display: inline-block;
- margin-left: 5px;
- left: 0;
- top: 50%;
- white-space: nowrap; }
- /* line 117, ../sass/plots/_plots-main.scss */
- .gl-plot .gl-plot-y-options {
- position: absolute;
- top: 50%;
- right: auto;
- bottom: auto;
- left: auto5px;
- margin-top: -16px;
- height: auto;
- min-height: 32px;
- width: 32px; }
- /* line 131, ../sass/plots/_plots-main.scss */
- .gl-plot .gl-plot-hash {
- position: absolute;
- border: 0 rgba(255, 255, 255, 0.3) dashed; }
- /* line 134, ../sass/plots/_plots-main.scss */
- .gl-plot .gl-plot-hash.hash-v {
- border-right-width: 1px;
- height: 100%; }
- /* line 138, ../sass/plots/_plots-main.scss */
- .gl-plot .gl-plot-hash.hash-h {
- border-bottom-width: 1px;
- width: 100%; }
- /* line 144, ../sass/plots/_plots-main.scss */
- .gl-plot .gl-plot-legend {
- position: absolute;
- top: 0;
- right: 0;
- bottom: auto;
- left: 0;
- height: 24px;
- overflow-x: hidden;
- overflow-y: auto; }
- /* line 157, ../sass/plots/_plots-main.scss */
- .gl-plot .l-limit-bar,
- .gl-plot .l-oob-data {
- position: absolute;
- left: 0;
- right: 0;
- width: auto; }
- /* line 165, ../sass/plots/_plots-main.scss */
- .gl-plot .l-limit-bar {
- height: auto;
- z-index: 0; }
- /* line 173, ../sass/plots/_plots-main.scss */
- .gl-plot .l-limit-bar.s-limit-yellow {
- background: rgba(157, 117, 0, 0.2); }
- /* line 174, ../sass/plots/_plots-main.scss */
- .gl-plot .l-limit-bar.s-limit-red {
- background: rgba(170, 0, 0, 0.2); }
- /* line 177, ../sass/plots/_plots-main.scss */
- .gl-plot .l-oob-data {
- overflow: hidden;
- position: absolute;
- top: 0px;
- right: 0px;
- bottom: 0px;
- left: 0px;
- width: auto;
- height: auto;
- pointer-events: none;
- height: 10px;
- z-index: 1; }
- /* line 185, ../sass/plots/_plots-main.scss */
- .gl-plot .l-oob-data.l-oob-data-up {
- top: 0;
- bottom: auto;
- background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjEuMCIgeDI9IjAuNSIgeTI9IjAuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzc3NDhkNiIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM3NzQ4ZDYiIHN0b3Atb3BhY2l0eT0iMC41Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g');
- background-size: 100%;
- background-image: -moz-linear-gradient(90deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%);
- background-image: -webkit-linear-gradient(90deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%);
- background-image: linear-gradient(0deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); }
- /* line 190, ../sass/plots/_plots-main.scss */
- .gl-plot .l-oob-data.l-oob-data-dwn {
- bottom: 0;
- top: auto;
- background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzc3NDhkNiIgc3RvcC1vcGFjaXR5PSIwLjAiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM3NzQ4ZDYiIHN0b3Atb3BhY2l0eT0iMC41Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0idXJsKCNncmFkKSIgLz48L3N2Zz4g');
- background-size: 100%;
- background-image: -moz-linear-gradient(270deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%);
- background-image: -webkit-linear-gradient(270deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%);
- background-image: linear-gradient(180deg, rgba(119, 72, 214, 0), rgba(119, 72, 214, 0.5) 100%); }
-
-/* line 200, ../sass/plots/_plots-main.scss */
-.gl-plot-legend .plot-legend-item,
-.gl-plot-legend .legend-item,
-.legend .plot-legend-item,
-.legend .legend-item {
- display: inline-block;
- margin-right: 10px; }
- /* line 204, ../sass/plots/_plots-main.scss */
- .gl-plot-legend .plot-legend-item span,
- .gl-plot-legend .legend-item span,
- .legend .plot-legend-item span,
- .legend .legend-item span {
- vertical-align: middle; }
- /* line 207, ../sass/plots/_plots-main.scss */
- .gl-plot-legend .plot-legend-item .plot-color-swatch,
- .gl-plot-legend .plot-legend-item .color-swatch,
- .gl-plot-legend .legend-item .plot-color-swatch,
- .gl-plot-legend .legend-item .color-swatch,
- .legend .plot-legend-item .plot-color-swatch,
- .legend .plot-legend-item .color-swatch,
- .legend .legend-item .plot-color-swatch,
- .legend .legend-item .color-swatch {
- -moz-border-radius: 2px;
- -webkit-border-radius: 2px;
- border-radius: 2px;
- display: inline-block;
- height: 8px;
- width: 8px; }
-
-/* line 220, ../sass/plots/_plots-main.scss */
-.gl-plot-legend .plot-legend-item {
- -moz-border-radius: 2px;
- -webkit-border-radius: 2px;
- border-radius: 2px;
- color: #fff;
- line-height: 1.5em;
- padding: 0px 5px; }
- /* line 226, ../sass/plots/_plots-main.scss */
- .gl-plot-legend .plot-legend-item .plot-color-swatch {
- border: 1px solid #333;
- height: 9px;
- width: 9px; }
-
-/* line 234, ../sass/plots/_plots-main.scss */
-.tick {
- position: absolute;
- border: 0 rgba(255, 255, 255, 0.3) solid; }
- /* line 237, ../sass/plots/_plots-main.scss */
- .tick.tick-x {
- border-right-width: 1px;
- height: 100%; }
-
-/* line 243, ../sass/plots/_plots-main.scss */
-.gl-plot-tick,
-.tick-label {
- font-size: 0.7rem;
- position: absolute;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis; }
- /* line 251, ../sass/plots/_plots-main.scss */
- .gl-plot-tick.gl-plot-x-tick-label, .gl-plot-tick.tick-label-x,
- .tick-label.gl-plot-x-tick-label,
- .tick-label.tick-label-x {
- right: auto;
- bottom: auto;
- left: auto;
- height: auto;
- width: 20%;
- margin-left: -10%;
- text-align: center; }
- /* line 261, ../sass/plots/_plots-main.scss */
- .gl-plot-tick.gl-plot-y-tick-label, .gl-plot-tick.tick-label-y,
- .tick-label.gl-plot-y-tick-label,
- .tick-label.tick-label-y {
- top: auto;
- height: 1em;
- width: auto;
- margin-bottom: -0.5em;
- text-align: right; }
-
-/* line 273, ../sass/plots/_plots-main.scss */
-.gl-plot-tick.gl-plot-x-tick-label {
- top: 5px; }
-/* line 276, ../sass/plots/_plots-main.scss */
-.gl-plot-tick.gl-plot-y-tick-label {
- right: 5px;
- left: 5px; }
-
-/* line 283, ../sass/plots/_plots-main.scss */
-.tick-label.tick-label-x {
- top: 0; }
-/* line 286, ../sass/plots/_plots-main.scss */
-.tick-label.tick-label-y {
- right: 0;
- left: 0; }
diff --git a/platform/commonUI/general/res/css/theme-espresso.css b/platform/commonUI/general/res/css/theme-espresso.css
index 0a8a992ab4..2958023973 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; }
@@ -1861,10 +1861,21 @@ a.l-btn span {
padding-left: 0; }
/* line 202, ../sass/controls/_controls.scss */
+.l-local-controls {
+ position: absolute;
+ top: 5px;
+ right: 5px;
+ z-index: 5; }
+
+/* line 211, ../sass/controls/_controls.scss */
+.s-local-controls {
+ font-size: 0.7rem; }
+
+/* line 215, ../sass/controls/_controls.scss */
.btn-set {
display: inline-block;
position: relative; }
- /* line 206, ../sass/controls/_controls.scss */
+ /* line 219, ../sass/controls/_controls.scss */
.btn-set .btn,
.btn-set .t-btn {
-moz-border-radius: 0;
@@ -1872,7 +1883,7 @@ a.l-btn span {
border-radius: 0;
border-left: 1px solid #666666;
margin-left: 0; }
- /* line 211, ../sass/controls/_controls.scss */
+ /* line 224, ../sass/controls/_controls.scss */
.btn-set .btn:first-child,
.btn-set .t-btn:first-child {
border-left: none;
@@ -1882,7 +1893,7 @@ a.l-btn span {
-moz-border-radius-bottomleft: 3px;
-webkit-border-bottom-left-radius: 3px;
border-bottom-left-radius: 3px; }
- /* line 215, ../sass/controls/_controls.scss */
+ /* line 228, ../sass/controls/_controls.scss */
.btn-set .btn:last-child,
.btn-set .t-btn:last-child {
-moz-border-radius-topright: 3px;
@@ -1892,7 +1903,7 @@ a.l-btn span {
-webkit-border-bottom-right-radius: 3px;
border-bottom-right-radius: 3px; }
-/* line 221, ../sass/controls/_controls.scss */
+/* line 234, ../sass/controls/_controls.scss */
.object-browse-bar .btn,
.object-browse-bar .t-btn,
.top-bar .buttons-main .btn,
@@ -1903,7 +1914,7 @@ a.l-btn span {
font-size: 11.25px;
height: 25px;
line-height: 25px; }
- /* line 232, ../sass/controls/_controls.scss */
+ /* line 245, ../sass/controls/_controls.scss */
.object-browse-bar .btn .icon:not(.invoke-menu),
.object-browse-bar .t-btn .icon:not(.invoke-menu),
.top-bar .buttons-main .btn .icon:not(.invoke-menu),
@@ -1913,7 +1924,7 @@ a.l-btn span {
font-size: 150%;
vertical-align: middle; }
-/* line 240, ../sass/controls/_controls.scss */
+/* line 253, ../sass/controls/_controls.scss */
label.checkbox.custom {
cursor: pointer;
display: inline-block;
@@ -1922,13 +1933,13 @@ label.checkbox.custom {
padding-left: 19px;
position: relative;
vertical-align: top; }
- /* line 251, ../sass/controls/_controls.scss */
+ /* line 264, ../sass/controls/_controls.scss */
label.checkbox.custom em {
color: #999;
display: inline-block;
height: 14px;
min-width: 14px; }
- /* line 256, ../sass/controls/_controls.scss */
+ /* line 269, ../sass/controls/_controls.scss */
label.checkbox.custom em:before {
-moz-border-radius: 2.25px;
-webkit-border-radius: 2.25px;
@@ -1947,51 +1958,51 @@ label.checkbox.custom {
top: 0;
position: absolute;
text-align: center; }
- /* line 274, ../sass/controls/_controls.scss */
+ /* line 287, ../sass/controls/_controls.scss */
label.checkbox.custom.no-text {
overflow: hidden;
margin-right: 0;
padding-left: 0;
height: 14px;
width: 14px; }
- /* line 280, ../sass/controls/_controls.scss */
+ /* line 293, ../sass/controls/_controls.scss */
label.checkbox.custom.no-text em {
overflow: hidden; }
- /* line 284, ../sass/controls/_controls.scss */
+ /* line 297, ../sass/controls/_controls.scss */
label.checkbox.custom input {
display: none; }
- /* line 286, ../sass/controls/_controls.scss */
+ /* line 299, ../sass/controls/_controls.scss */
label.checkbox.custom input:checked ~ em:before {
background: #0099cc;
color: #ccf2ff;
content: "2"; }
-/* line 294, ../sass/controls/_controls.scss */
+/* line 307, ../sass/controls/_controls.scss */
.input-labeled {
margin-left: 5px; }
- /* line 296, ../sass/controls/_controls.scss */
+ /* line 309, ../sass/controls/_controls.scss */
.input-labeled label {
display: inline-block;
margin-right: 3px; }
- /* line 300, ../sass/controls/_controls.scss */
+ /* line 313, ../sass/controls/_controls.scss */
.input-labeled.inline {
display: inline-block; }
- /* line 303, ../sass/controls/_controls.scss */
+ /* line 316, ../sass/controls/_controls.scss */
.input-labeled:first-child {
margin-left: 0; }
-/* line 308, ../sass/controls/_controls.scss */
+/* line 321, ../sass/controls/_controls.scss */
.btn-menu label.checkbox.custom {
margin-left: 5px; }
-/* line 313, ../sass/controls/_controls.scss */
+/* line 326, ../sass/controls/_controls.scss */
.item .checkbox.checked label {
-moz-box-shadow: none;
-webkit-box-shadow: none;
box-shadow: none;
border-bottom: none; }
-/* line 319, ../sass/controls/_controls.scss */
+/* line 332, ../sass/controls/_controls.scss */
.btn-menu {
background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA==');
background-size: 100%;
@@ -2022,42 +2033,42 @@ label.checkbox.custom {
background-image: -moz-linear-gradient(#666666, #4d4d4d);
background-image: -webkit-linear-gradient(#666666, #4d4d4d);
background-image: linear-gradient(#666666, #4d4d4d); }
- /* line 326, ../sass/controls/_controls.scss */
+ /* line 339, ../sass/controls/_controls.scss */
.btn-menu.dropdown {
padding-left: 10px;
padding-right: 10px; }
- /* line 332, ../sass/controls/_controls.scss */
+ /* line 345, ../sass/controls/_controls.scss */
.btn-menu:not(.disabled):hover {
color: #cccccc; }
- /* line 336, ../sass/controls/_controls.scss */
+ /* line 349, ../sass/controls/_controls.scss */
.btn-menu.btn-invoke-menu {
color: #0099cc;
padding: 0 5px; }
- /* line 340, ../sass/controls/_controls.scss */
+ /* line 353, ../sass/controls/_controls.scss */
.btn-menu.btn-invoke-menu:hover {
color: deepskyblue; }
- /* line 350, ../sass/controls/_controls.scss */
+ /* line 363, ../sass/controls/_controls.scss */
.btn-menu .type-icon {
margin-right: 5px; }
- /* line 353, ../sass/controls/_controls.scss */
+ /* line 366, ../sass/controls/_controls.scss */
.btn-menu .menu {
position: absolute;
left: 0;
text-align: left; }
- /* line 358, ../sass/controls/_controls.scss */
+ /* line 371, ../sass/controls/_controls.scss */
.btn-menu .menu .ui-symbol.icon {
width: 12px; }
-/* line 364, ../sass/controls/_controls.scss */
+/* line 377, ../sass/controls/_controls.scss */
.top-bar .btn-menu {
height: 25px;
line-height: 25px;
padding-right: 10px; }
- /* line 372, ../sass/controls/_controls.scss */
+ /* line 385, ../sass/controls/_controls.scss */
.top-bar .btn-menu.browse-btn {
margin-right: 5px;
padding-left: 25px; }
- /* line 375, ../sass/controls/_controls.scss */
+ /* line 388, ../sass/controls/_controls.scss */
.top-bar .btn-menu.browse-btn .badge {
-moz-border-radius: 4.5px;
-webkit-border-radius: 4.5px;
@@ -2074,30 +2085,30 @@ label.checkbox.custom {
height: auto; }
/******************************************************** OBJECT-HEADER */
-/* line 392, ../sass/controls/_controls.scss */
+/* line 405, ../sass/controls/_controls.scss */
.object-header {
display: inline-block;
font-size: 1em; }
- /* line 395, ../sass/controls/_controls.scss */
+ /* line 408, ../sass/controls/_controls.scss */
.object-header .title {
color: white; }
- /* line 398, ../sass/controls/_controls.scss */
+ /* line 411, ../sass/controls/_controls.scss */
.object-header .type-icon {
font-size: 1.5em;
margin-right: 5px;
vertical-align: middle; }
-/* line 407, ../sass/controls/_controls.scss */
+/* line 420, ../sass/controls/_controls.scss */
.top-bar .object-header,
.object-browse-bar .object-header {
font-size: 1.1em; }
- /* line 409, ../sass/controls/_controls.scss */
+ /* line 422, ../sass/controls/_controls.scss */
.top-bar .object-header span,
.object-browse-bar .object-header span {
display: inline-block; }
/******************************************************** VIEW-CONTROLS */
-/* line 417, ../sass/controls/_controls.scss */
+/* line 430, ../sass/controls/_controls.scss */
.view-controls .view-type {
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
@@ -2109,16 +2120,16 @@ label.checkbox.custom {
line-height: 20px;
padding-left: 5px;
padding-right: 5px; }
- /* line 428, ../sass/controls/_controls.scss */
+ /* line 441, ../sass/controls/_controls.scss */
.view-controls .view-type.cur {
background: #666666; }
-/* line 433, ../sass/controls/_controls.scss */
+/* line 446, ../sass/controls/_controls.scss */
.edit-mode .top-bar .control-set.edit-view-controls {
margin-right: 50px; }
/******************************************************** SLIDERS */
-/* line 444, ../sass/controls/_controls.scss */
+/* line 457, ../sass/controls/_controls.scss */
.slider .slot {
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
@@ -2139,7 +2150,7 @@ label.checkbox.custom {
right: 0;
bottom: auto;
left: 0; }
-/* line 455, ../sass/controls/_controls.scss */
+/* line 468, ../sass/controls/_controls.scss */
.slider .knob {
background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzRkNGQ0ZCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzQwNDA0MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA==');
background-size: 100%;
@@ -2190,12 +2201,12 @@ label.checkbox.custom {
/* line 166, ../sass/_mixins.scss */
.slider .knob:not(.disabled):hover:before {
border-color: rgba(0, 153, 204, 0.9); }
- /* line 466, ../sass/controls/_controls.scss */
+ /* line 479, ../sass/controls/_controls.scss */
.slider .knob:before {
top: 1px;
bottom: 3px;
left: 5px; }
-/* line 473, ../sass/controls/_controls.scss */
+/* line 486, ../sass/controls/_controls.scss */
.slider .range {
background: rgba(0, 153, 204, 0.6);
cursor: ew-resize;
@@ -2206,12 +2217,12 @@ label.checkbox.custom {
left: auto;
height: auto;
width: auto; }
- /* line 483, ../sass/controls/_controls.scss */
+ /* line 496, ../sass/controls/_controls.scss */
.slider .range:hover {
background: rgba(0, 153, 204, 0.7); }
/******************************************************** BROWSER ELEMENTS */
-/* line 491, ../sass/controls/_controls.scss */
+/* line 504, ../sass/controls/_controls.scss */
::-webkit-scrollbar {
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
@@ -2228,7 +2239,7 @@ label.checkbox.custom {
height: 10px;
width: 10px; }
-/* line 497, ../sass/controls/_controls.scss */
+/* line 510, ../sass/controls/_controls.scss */
::-webkit-scrollbar-thumb {
background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzY2NjY2NiIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzU5NTk1OSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA==');
background-size: 100%;
@@ -2246,7 +2257,7 @@ label.checkbox.custom {
-webkit-box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
box-shadow: rgba(0, 0, 0, 0.3) 0 1px 3px;
border-top: 1px solid gray; }
- /* line 504, ../sass/controls/_controls.scss */
+ /* line 517, ../sass/controls/_controls.scss */
::-webkit-scrollbar-thumb:hover {
background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzgwODA4MCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzczNzM3MyIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA==');
background-size: 100%;
@@ -2255,7 +2266,7 @@ label.checkbox.custom {
background-image: -webkit-linear-gradient(#808080, #737373 20px);
background-image: linear-gradient(#808080, #737373 20px); }
-/* line 509, ../sass/controls/_controls.scss */
+/* line 522, ../sass/controls/_controls.scss */
::-webkit-scrollbar-corner {
background: rgba(0, 0, 0, 0.4); }
@@ -2535,81 +2546,84 @@ label.checkbox.custom {
/*************************************** MAIN LAYOUT */
/* line 11, ../sass/features/_imagery.scss */
.l-image-main-wrapper {
- bottom: 178px;
min-height: 100px;
min-width: 150px; }
- /* line 16, ../sass/features/_imagery.scss */
+ /* line 18, ../sass/features/_imagery.scss */
.l-image-main-wrapper .l-image-main {
background-color: rgba(255, 255, 255, 0.1);
bottom: 25px; }
- /* line 20, ../sass/features/_imagery.scss */
+ /* line 22, ../sass/features/_imagery.scss */
.l-image-main-wrapper .l-image-main-controlbar {
top: auto;
height: 20px; }
-/* line 26, ../sass/features/_imagery.scss */
+/* line 28, ../sass/features/_imagery.scss */
.l-image-thumbs-wrapper {
top: auto;
height: 168px; }
-/* line 32, ../sass/features/_imagery.scss */
+/* line 34, ../sass/features/_imagery.scss */
.l-date,
.l-time,
.l-timezone {
display: inline-block; }
/*************************************** MAIN IMAGE */
-/* line 40, ../sass/features/_imagery.scss */
+/* line 42, ../sass/features/_imagery.scss */
.l-image-main,
.l-image-thumb-item .l-thumb {
background-size: contain;
background-position: center;
background-repeat: no-repeat; }
-/* line 47, ../sass/features/_imagery.scss */
+/* line 49, ../sass/features/_imagery.scss */
+.l-image-main {
+ cursor: crosshair; }
+
+/* line 53, ../sass/features/_imagery.scss */
.l-image-main-controlbar {
font-size: 0.8em;
line-height: 20px; }
- /* line 51, ../sass/features/_imagery.scss */
+ /* line 57, ../sass/features/_imagery.scss */
.l-image-main-controlbar .left, .l-image-main-controlbar .right {
direction: rtl;
overflow: hidden; }
- /* line 55, ../sass/features/_imagery.scss */
+ /* line 61, ../sass/features/_imagery.scss */
.l-image-main-controlbar .left {
text-align: left;
width: 75% !important; }
- /* line 60, ../sass/features/_imagery.scss */
+ /* line 66, ../sass/features/_imagery.scss */
.l-image-main-controlbar .right {
min-width: 40px;
width: 25% !important;
z-index: 2; }
- /* line 66, ../sass/features/_imagery.scss */
+ /* line 72, ../sass/features/_imagery.scss */
.l-image-main-controlbar .l-date,
.l-image-main-controlbar .l-time {
color: #fff; }
- /* line 70, ../sass/features/_imagery.scss */
+ /* line 76, ../sass/features/_imagery.scss */
.l-image-main-controlbar .l-mag {
direction: ltr;
display: inline-block; }
- /* line 74, ../sass/features/_imagery.scss */
+ /* line 80, ../sass/features/_imagery.scss */
.l-image-main-controlbar .l-mag:before {
- content: "\000058"; }
- /* line 78, ../sass/features/_imagery.scss */
+ content: "\000049"; }
+ /* line 84, ../sass/features/_imagery.scss */
.l-image-main-controlbar .s-mag {
color: #666666; }
- /* line 81, ../sass/features/_imagery.scss */
+ /* line 87, ../sass/features/_imagery.scss */
.l-image-main-controlbar .l-btn.show-thumbs {
display: none; }
-/* line 86, ../sass/features/_imagery.scss */
+/* line 92, ../sass/features/_imagery.scss */
.s-image-main {
border: 1px solid transparent; }
- /* line 88, ../sass/features/_imagery.scss */
+ /* line 94, ../sass/features/_imagery.scss */
.s-image-main.paused {
border-color: #c56f01; }
/*************************************** THUMBS */
-/* line 98, ../sass/features/_imagery.scss */
+/* line 101, ../sass/features/_imagery.scss */
.l-image-thumbs-wrapper {
direction: rtl;
overflow-x: auto;
@@ -2618,7 +2632,7 @@ label.checkbox.custom {
white-space: nowrap;
z-index: 70; }
-/* line 108, ../sass/features/_imagery.scss */
+/* line 111, ../sass/features/_imagery.scss */
.l-image-thumb-item {
-moz-transition: background-color 0.25s;
-o-transition: background-color 0.25s;
@@ -2637,30 +2651,30 @@ label.checkbox.custom {
text-align: left;
width: 122px;
white-space: normal; }
- /* line 113, ../sass/features/_imagery.scss */
+ /* line 116, ../sass/features/_imagery.scss */
.l-image-thumb-item .l-thumb,
.l-image-thumb-item .l-date,
.l-image-thumb-item .l-time {
display: inline-block; }
- /* line 118, ../sass/features/_imagery.scss */
+ /* line 121, ../sass/features/_imagery.scss */
.l-image-thumb-item .l-date,
.l-image-thumb-item .l-time {
padding: 2px 3px; }
- /* line 130, ../sass/features/_imagery.scss */
+ /* line 133, ../sass/features/_imagery.scss */
.l-image-thumb-item:hover {
background: rgba(255, 255, 255, 0.2); }
- /* line 132, ../sass/features/_imagery.scss */
+ /* line 135, ../sass/features/_imagery.scss */
.l-image-thumb-item:hover .l-date,
.l-image-thumb-item:hover .l-time {
color: #fff; }
- /* line 137, ../sass/features/_imagery.scss */
+ /* line 140, ../sass/features/_imagery.scss */
.l-image-thumb-item.selected {
background: #005177; }
- /* line 139, ../sass/features/_imagery.scss */
+ /* line 142, ../sass/features/_imagery.scss */
.l-image-thumb-item.selected .l-date,
.l-image-thumb-item.selected .l-time {
color: #fff; }
- /* line 144, ../sass/features/_imagery.scss */
+ /* line 147, ../sass/features/_imagery.scss */
.l-image-thumb-item .l-thumb {
background-color: rgba(255, 255, 255, 0.1);
height: 120px;
@@ -2668,16 +2682,13 @@ label.checkbox.custom {
margin-top: 0; }
/*************************************** WHEN IN FRAME */
-/* line 154, ../sass/features/_imagery.scss */
+/* line 157, ../sass/features/_imagery.scss */
.frame .t-imagery .l-image-main-wrapper {
bottom: 0; }
- /* line 156, ../sass/features/_imagery.scss */
+ /* line 159, ../sass/features/_imagery.scss */
.frame .t-imagery .l-image-main-wrapper .l-image-main-controlbar {
font-size: 0.7em; }
- /* line 159, ../sass/features/_imagery.scss */
- .frame .t-imagery .l-image-main-wrapper .l-btn.show-thumbs {
- display: inline-block; }
-/* line 163, ../sass/features/_imagery.scss */
+/* line 168, ../sass/features/_imagery.scss */
.frame .t-imagery .l-image-thumbs-wrapper {
display: none; }
diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss
index c966431b1f..47b9a70493 100644
--- a/platform/commonUI/general/res/sass/_constants.scss
+++ b/platform/commonUI/general/res/sass/_constants.scss
@@ -19,6 +19,10 @@
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
*****************************************************************************/
+
+// Features
+$enableImageryThumbs: false; // Set to true if historical imagery thumbnails are supported
+
// Margins, spacing, radii
$bodyMargin: 10px;
$interiorMargin: 5px;
diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss
index 721a557a32..20ac37b2cc 100644
--- a/platform/commonUI/general/res/sass/controls/_controls.scss
+++ b/platform/commonUI/general/res/sass/controls/_controls.scss
@@ -199,6 +199,19 @@
}
}
+.l-local-controls {
+ // Control shown when hovering over an object, like plots and imagery
+ // Default position is upper right
+ $p: $interiorMargin;
+ position: absolute;
+ top: $p; right: $p;
+ z-index: 5;
+}
+
+.s-local-controls {
+ font-size: 0.7rem;
+}
+
.btn-set {
// Buttons that have a very tight conceptual grouping - no internal space between them.
display: inline-block;
diff --git a/platform/commonUI/general/res/sass/controls/_time-controller.scss b/platform/commonUI/general/res/sass/controls/_time-controller.scss
new file mode 100644
index 0000000000..6991617ae7
--- /dev/null
+++ b/platform/commonUI/general/res/sass/controls/_time-controller.scss
@@ -0,0 +1,104 @@
+.l-time-controller {
+ $inputTxtW: 90px;
+ $knobW: 9px;
+ $r1H: 20px;
+ $r2H: 30px;
+ $r3H: 10px;
+
+ position: relative;
+ margin: $interiorMarginLg 0;
+ min-width: 400px;
+
+ .l-time-range-inputs-holder,
+ .l-time-range-slider {
+ font-size: 0.8em;
+ }
+
+ .l-time-range-inputs-holder,
+ .l-time-range-slider-holder,
+ .l-time-range-ticks-holder
+ {
+ margin-bottom: $interiorMargin;
+ position: relative;
+ }
+ .l-time-range-slider,
+ .l-time-range-ticks {
+ //@include test(red, 0.1);
+ @include absPosDefault(0, visible);
+ }
+
+ .l-time-range-inputs-holder {
+ height: $r1H;
+ }
+
+ .l-time-range-slider,
+ .l-time-range-ticks {
+ left: $inputTxtW; right: $inputTxtW;
+
+ }
+
+ .l-time-range-slider-holder {
+ height: $r2H;
+ .range-holder {
+ @include box-shadow(none);
+ background: none;
+ border: none;
+ height: 75%;
+ }
+ }
+
+ .l-time-range-ticks-holder {
+ height: $r3H;
+ .l-time-range-ticks {
+ border-top: 1px solid $colorInteriorBorder;
+ .tick {
+ background-color: $colorInteriorBorder;
+ border:none;
+ width: 1px;
+ margin-left: -1px;
+ &:first-child {
+ margin-left: 0;
+ }
+ .l-time-range-tick-label {
+ color: lighten($colorInteriorBorder, 20%);
+ font-size: 0.7em;
+ position: absolute;
+ margin-left: -0.5 * $tickLblW;
+ text-align: center;
+ top: $r3H;
+ width: $tickLblW;
+ z-index: 2;
+ }
+ }
+ }
+ }
+
+ .knob {
+ width: $knobW;
+ .range-value {
+ $w: 75px;
+ //@include test();
+ position: absolute;
+ top: 50%;
+ margin-top: -7px; // Label is 13px high
+ white-space: nowrap;
+ width: $w;
+ }
+ &:hover .range-value {
+ color: $colorKey;
+ }
+ &.knob-l {
+ margin-left: $knobW / -2;
+ .range-value {
+ text-align: right;
+ right: $knobW + $interiorMargin;
+ }
+ }
+ &.knob-r {
+ margin-right: $knobW / -2;
+ .range-value {
+ left: $knobW + $interiorMargin;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/platform/commonUI/general/res/sass/features/_imagery.scss b/platform/commonUI/general/res/sass/features/_imagery.scss
index d31b296868..69abc1ee27 100644
--- a/platform/commonUI/general/res/sass/features/_imagery.scss
+++ b/platform/commonUI/general/res/sass/features/_imagery.scss
@@ -10,7 +10,9 @@
/*************************************** MAIN LAYOUT */
.l-image-main-wrapper {
//@include test();
- bottom: $interiorMargin*2 + $imageThumbsWrapperH;
+ @if $enableImageryThumbs == true {
+ bottom: $interiorMargin*2 + $imageThumbsWrapperH;
+ }
min-height: 100px;
min-width: 150px;
.l-image-main {
@@ -44,6 +46,10 @@
background-repeat: no-repeat;
}
+.l-image-main {
+ cursor: crosshair;
+}
+
.l-image-main-controlbar {
//@include test();
font-size: 0.8em;
@@ -72,7 +78,7 @@
display: inline-block;
//white-space: nowrap;
&:before {
- content: "\000058";
+ content: "\000049";
}
}
.s-mag {
@@ -92,9 +98,6 @@
/*************************************** THUMBS */
-.l-image-thumb-item {
-}
-
.l-image-thumbs-wrapper {
//@include test(green);
direction: rtl;
@@ -156,8 +159,10 @@
.l-image-main-controlbar {
font-size: 0.7em;
}
- .l-btn.show-thumbs {
- display: inline-block;
+ @if $enableImageryThumbs == true {
+ .l-btn.show-thumbs {
+ display: inline-block;
+ }
}
}
.l-image-thumbs-wrapper {
diff --git a/platform/commonUI/general/res/sass/plots.scss b/platform/commonUI/general/res/sass/plots.scss
deleted file mode 100644
index bdcd774c5a..0000000000
--- a/platform/commonUI/general/res/sass/plots.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-@import "compass";
-@import "compass/css3";
-@import "compass/css3/border-radius";
-@import "compass/css3/opacity";
-@import "compass/utilities";
-
-@import "constants";
-@import "mixins";
-@import "plots/plots-main";
\ No newline at end of file
diff --git a/platform/commonUI/general/res/templates/controls/time-controller.html b/platform/commonUI/general/res/templates/controls/time-controller.html
new file mode 100644
index 0000000000..fe1b6ff14a
--- /dev/null
+++ b/platform/commonUI/general/res/templates/controls/time-controller.html
@@ -0,0 +1,69 @@
+
+
+
+
+
\ 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 1bb1de0e9c..d8ea7366b2 100644
--- a/platform/features/plot/res/templates/plot.html
+++ b/platform/features/plot/res/templates/plot.html
@@ -87,10 +87,10 @@
-