diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.eot b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.eot
index a6b919620b..c3a3688fff 100755
Binary files a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.eot and b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.eot differ
diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg
index b0d24712fc..c0fbe06e76 100755
--- a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg
+++ b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg
@@ -73,6 +73,8 @@
+
+
diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.ttf b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.ttf
index a920e86179..4ba5deaccc 100755
Binary files a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.ttf and b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.ttf differ
diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.woff b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.woff
index 1e9f1acecd..9263a50af3 100755
Binary files a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.woff and b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.woff differ
diff --git a/platform/commonUI/general/res/sass/_glyphs.scss b/platform/commonUI/general/res/sass/_glyphs.scss
index 876cf36c0a..12d7242248 100644
--- a/platform/commonUI/general/res/sass/_glyphs.scss
+++ b/platform/commonUI/general/res/sass/_glyphs.scss
@@ -74,6 +74,8 @@ $glyph-icon-thumbs-strip: '\e1033';
$glyph-icon-two-parts-both: '\e1034';
$glyph-icon-two-parts-one-only: '\e1035';
$glyph-icon-x-in-circle: '\e1036';
+$glyph-icon-brightness: '\e1038';
+$glyph-icon-contrast: '\e1039';
$glyph-icon-activity: '\e1100';
$glyph-icon-activity-mode: '\e1101';
$glyph-icon-autoflow-tabular: '\e1102';
@@ -173,6 +175,8 @@ $glyph-icon-box-with-dashed-lines: '\e1129';
.icon-two-parts-both { @include glyph($glyph-icon-two-parts-both); }
.icon-two-parts-one-only { @include glyph($glyph-icon-two-parts-one-only); }
.icon-x-in-circle { @include glyph($glyph-icon-x-in-circle); }
+.icon-brightness { @include glyph($glyph-icon-brightness); }
+.icon-contrast { @include glyph($glyph-icon-contrast); }
.icon-activity { @include glyph($glyph-icon-activity); }
.icon-activity-mode { @include glyph($glyph-icon-activity-mode); }
.icon-autoflow-tabular { @include glyph($glyph-icon-autoflow-tabular); }
diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss
index ad32ea0515..b7680c11c7 100644
--- a/platform/commonUI/general/res/sass/controls/_controls.scss
+++ b/platform/commonUI/general/res/sass/controls/_controls.scss
@@ -122,13 +122,20 @@
// Default position is upper right
$p: $interiorMargin;
position: absolute;
- top: $p;
- right: $p;
+ top: $p; right: $p; bottom: auto; left: $p;
+ text-align: right;
z-index: 5;
}
.s-local-controls {
font-size: 0.7rem;
+ &.s-wrapper-transluc {
+ // Semi-opaque wrapper to visually distinguish a control
+ // from the background
+ background: rgba($colorBodyFg, 0.2);
+ box-sizing: border-box;
+ border-radius: $controlCr;
+ }
}
/******************************************************** CUSTOM CHECKBOXES */
diff --git a/platform/commonUI/general/res/sass/features/_imagery.scss b/platform/commonUI/general/res/sass/features/_imagery.scss
index e33970b0e9..5cd123058a 100644
--- a/platform/commonUI/general/res/sass/features/_imagery.scss
+++ b/platform/commonUI/general/res/sass/features/_imagery.scss
@@ -134,6 +134,29 @@
}
}
+/*************************************** LOCAL CONTROLS */
+.l-local-controls {
+ max-width: 200px;
+ width: 35%;
+ input[type="range"] {
+ display: block;
+ width: 100%;
+ &:not(:first-child) {
+ margin-top: $interiorMarginLg;
+ }
+
+ &:before {
+ margin-right: $interiorMarginSm;
+ }
+ }
+
+ &.s-wrapper-transluc {
+ display: inline-block;
+ left: auto;
+ padding: $interiorMargin $interiorMarginLg;
+ }
+}
+
/*************************************** WHEN IN FRAME */
.frame .t-imagery {
.l-image-main-wrapper {
diff --git a/platform/features/imagery/res/templates/imagery.html b/platform/features/imagery/res/templates/imagery.html
index 9c222c6715..8df37ec1c2 100644
--- a/platform/features/imagery/res/templates/imagery.html
+++ b/platform/features/imagery/res/templates/imagery.html
@@ -2,20 +2,19 @@
-
-
-
+
{{imagery.getDate()}}