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

Merge pull request #1711 from nasa/pause-button-1704

Browse Source 
Review and merge fix for hidden Imagery controls
This commit is contained in:
Victor Woeltjen
2017-09-14 12:13:56 -07:00
committed by GitHub
parent 54b975f242 42ddb38629
commit 92dd99b26c
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platform/commonUI/general/res/sass/features/_imagery.scss
View File

@ -44,14 +44,16 @@
.l-image-main-controlbar { .l-image-main-controlbar {
font-size: 0.8em; font-size: 0.8em;
line-height: inherit; line-height: inherit;
.left, .right { .l-datetime-w, .l-controls-w {
direction: rtl; direction: rtl;
overflow: hidden; overflow: hidden;
} }
.left { .l-datetime-w {
@include ellipsize();
margin-right: $interiorMarginSm;
text-align: left; text-align: left;
} }
.right { .l-controls-w {
z-index: 2; z-index: 2;
} }
.l-date, .l-date,
@ -138,6 +140,7 @@
/*************************************** LOCAL CONTROLS */ /*************************************** LOCAL CONTROLS */
.l-local-controls { .l-local-controls {
max-width: 200px; max-width: 200px;
min-width: 100px;
width: 35%; width: 35%;
input[type="range"] { input[type="range"] {
display: block; display: block;

4
platform/commonUI/general/res/sass/user-environ/_frame.scss
View File

@ -142,7 +142,7 @@
body.desktop .frame { body.desktop .frame {
// Hide local controls initially and show it them on hover when they're in an element that's in a frame context // Hide local controls initially and show it them on hover when they're in an element that's in a frame context
// Frame template is used because we need to target the lowest nested frame // Frame template is used because we need to target the lowest nested frame
.right { .object-browse-bar .btn-bar {
opacity: 0; opacity: 0;
pointer-events: none; pointer-events: none;
} }
@ -150,7 +150,7 @@ body.desktop .frame {
// Target the first descendant so that we only show the elements in the outermost container. // Target the first descendant so that we only show the elements in the outermost container.
// Handles the case where we have layouts in layouts. // Handles the case where we have layouts in layouts.
&:hover > .object-browse-bar { &:hover > .object-browse-bar {
.right { .btn-bar {
opacity: 1; opacity: 1;
pointer-events: inherit; pointer-events: inherit;
} }

4
platform/features/imagery/res/templates/imagery.html
View File

@ -33,12 +33,12 @@
</div> </div>
<div class="l-image-main-controlbar flex-elem l-flex-row"> <div class="l-image-main-controlbar flex-elem l-flex-row">
<div class="left flex-elem grows"> <div class="l-datetime-w flex-elem grows">
<a class="s-button show-thumbs sm hidden icon-thumbs-strip" <a class="s-button show-thumbs sm hidden icon-thumbs-strip"
ng-click="showThumbsBubble = (showThumbsBubble) ? false:true"></a> ng-click="showThumbsBubble = (showThumbsBubble) ? false:true"></a>
<span class="l-time">{{imagery.getTime()}}</span> <span class="l-time">{{imagery.getTime()}}</span>
</div> </div>
<div class="right flex-elem"> <div class="l-controls-w flex-elem">
<a class="s-button pause-play" <a class="s-button pause-play"
ng-click="imagery.paused(!imagery.paused())" ng-click="imagery.paused(!imagery.paused())"
ng-class="{ paused: imagery.paused() }"></a> ng-class="{ paused: imagery.paused() }"></a>