[Frontend] WIP styling of View Large elements

Fixes #1437
Markup and CSS for `view large` button in frame context;
Sass formatting cleanups; removed unused styles from
_layout.scss; mods to MCTTriggerModal.js to remove
button label functionality;
TODO: styling of object-header sizing; add 'Done' button
to overlay;
This commit is contained in:
Charles Hacskaylo
2017-02-14 17:30:24 -08:00
parent a11496078b
commit 999f0fc3e1
8 changed files with 89 additions and 95 deletions

View File

@ -31,6 +31,7 @@
</mct-representation> </mct-representation>
</div> </div>
<div class="btn-bar right l-flex-row flex-elem flex-justify-end flex-fixed"> <div class="btn-bar right l-flex-row flex-elem flex-justify-end flex-fixed">
<span class="l-object-action-buttons">
<mct-representation key="'switcher'" <mct-representation key="'switcher'"
mct-object="domainObject" mct-object="domainObject"
ng-model="representation"> ng-model="representation">
@ -39,8 +40,9 @@
<mct-representation key="'action-group'" <mct-representation key="'action-group'"
mct-object="domainObject" mct-object="domainObject"
parameters="{ category: 'view-control' }" parameters="{ category: 'view-control' }"
class="mobile-hide"> class="mobile-hide l-object-action-buttons">
</mct-representation> </mct-representation>
</span>
</div> </div>
</div> </div>
<div class="holder l-flex-col flex-elem grows l-object-wrapper l-controls-visible l-time-controller-visible"> <div class="holder l-flex-col flex-elem grows l-object-wrapper l-controls-visible l-time-controller-visible">

View File

@ -29,10 +29,7 @@
mct-object='domainObject' mct-object='domainObject'
class="flex-elem context-available-w"></mct-representation> class="flex-elem context-available-w"></mct-representation>
</span> </span>
<span class="expand"> <a class="s-button icon-new-window t-btn-view-large"
<a class="s-button" title="View large"
mct-trigger-modal> mct-trigger-modal>
View Large
</a> </a>
</span>

View File

@ -631,7 +631,8 @@ textarea {
} }
} }
.view-switcher { .view-switcher,
.t-btn-view-large {
@include trans-prop-nice-fade($controlFadeMs); @include trans-prop-nice-fade($controlFadeMs);
} }

View File

@ -132,6 +132,8 @@
.select { .select {
box-shadow: $shdwBtnsOverlay; box-shadow: $shdwBtnsOverlay;
} }
.t-btn-view-large { display: none; }
} }
.t-dialog-sm .overlay > .holder { .t-dialog-sm .overlay > .holder {

View File

@ -34,10 +34,8 @@
font-size: 0.75em; font-size: 0.75em;
height: $ohH; height: $ohH;
line-height: $ohH; line-height: $ohH;
.left {
padding-right: $interiorMarginLg;
}
} }
> .object-holder.abs { > .object-holder.abs {
top: $ohH + $interiorMargin; top: $ohH + $interiorMargin;
} }
@ -69,20 +67,25 @@
} }
} }
.view-switcher { .view-switcher {
margin-left: $interiorMargin; // Kick other top bar elements away when I'm present.
// Hide the name when the view switcher is in a frame context // Hide the name when the view switcher is in a frame context
.title-label { .title-label {
display: none; display: none;
} }
} }
} }
body.desktop .frame.frame-template { body.desktop .frame.frame-template {
// Hide the view switcher by default when it's 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
.view-switcher { .view-switcher,
.t-btn-view-large {
opacity: 0; opacity: 0;
pointer-events: none;
} }
&:hover .view-switcher { &:hover .view-switcher,
// Show the view switcher on frame hover &:hover .t-btn-view-large {
opacity: 1; opacity: 1;
pointer-events: inherit;
} }
} }

View File

@ -136,14 +136,6 @@
.mini-tab-icon.toggle-pane { .mini-tab-icon.toggle-pane {
z-index: 5; z-index: 5;
} }
&.items {
.object-browse-bar {
.left.abs,
.right.abs {
top: auto;
}
}
}
} }
body.desktop .pane .mini-tab-icon.toggle-pane { body.desktop .pane .mini-tab-icon.toggle-pane {
@ -250,10 +242,9 @@ body.desktop .pane .mini-tab-icon.toggle-pane {
vertical-align: top; vertical-align: top;
} }
.object-browse-bar, .object-browse-bar {
.top-bar { .l-object-action-buttons {
.view-switcher { margin-left: $interiorMarginLg; // Kick the view switcher and other elements away
margin-right: $interiorMarginLg * 2;
} }
} }

View File

@ -53,14 +53,12 @@ define([
closeButton.addEventListener('click', toggleOverlay); closeButton.addEventListener('click', toggleOverlay);
document.body.appendChild(span); document.body.appendChild(span);
layoutContainer.removeChild(frame); layoutContainer.removeChild(frame);
overlayContainer.appendChild(frame) overlayContainer.appendChild(frame);
$element.text('Return to Layout');
} }
function closeOverlay() { function closeOverlay() {
overlayContainer.removeChild(frame); overlayContainer.removeChild(frame);
layoutContainer.appendChild(frame); layoutContainer.appendChild(frame);
$element.text('View Large');
document.body.removeChild(span); document.body.removeChild(span);
closeButton.removeEventListener('click', toggleOverlay); closeButton.removeEventListener('click', toggleOverlay);
closeButton = undefined; closeButton = undefined;