UI enhancement fixes 2 (#3225)

- Fixed incorrect CSS naming: `c-frame-edit__move` changed to
 `c-frame__move-bar`;
 - Fixed `display: contents` that was erroneously applied to
 `u-angular-object-view-wrapper` and preventing styling from being
 applied to plots, renamed class to `.l-angular-ov-wrapper`;
 - Removed commented CSS;
This commit is contained in:
Charles Hacskaylo 2020-07-22 20:20:17 -07:00 committed by GitHub
parent afeb89a51a
commit d9baa94970
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 19 deletions

View File

@ -31,9 +31,8 @@
:style="style"
>
<slot></slot>
<div
class="c-frame-edit__move"
class="c-frame__move-bar"
@mousedown="isEditing ? startMove([1,1], [0,0], $event) : null"
></div>
</div>

View File

@ -44,7 +44,7 @@
</svg>
<div
class="c-frame-edit__move"
class="c-frame__move-bar"
@mousedown="startDrag($event)"
></div>
<div

View File

@ -13,7 +13,7 @@
}
}
.c-frame-edit__move {
.c-frame__move-bar {
display: none;
}
@ -33,7 +33,7 @@
border: $editFrameSelectedBorder;
box-shadow: $editFrameSelectedShdw;
.c-frame-edit__move {
.c-frame__move-bar {
cursor: move;
}
}
@ -41,7 +41,7 @@
/******************* DEFAULT STYLES FOR -EDIT__MOVE */
// All object types
.c-frame-edit__move {
.c-frame__move-bar {
@include abs();
display: block;
}
@ -56,7 +56,7 @@
transition-delay: $moveBarOutDelay;
}
+ .c-frame-edit__move {
+ .c-frame__move-bar {
display: none;
}
@ -72,7 +72,7 @@
transition-delay: $moveBarOutDelay;
}
+ .c-frame-edit__move {
+ .c-frame__move-bar {
transition: $transOut;
transition-delay: $moveBarOutDelay;
@include userSelectNone();
@ -115,7 +115,7 @@
transition-delay: 0s;
}
+ .c-frame-edit__move {
+ .c-frame__move-bar {
transition: $transIn;
transition-delay: 0s;
height: $editFrameMovebarH;
@ -125,7 +125,7 @@
}
> .l-layout__frame[s-selected] {
> .c-so-view.has-complex-content {
+ .c-frame-edit__move:before {
+ .c-frame__move-bar:before {
display: block;
}
}
@ -135,7 +135,7 @@
/******************* > 1 ITEMS SELECTED */
&.is-multi-selected {
.l-layout__frame[s-selected] {
> .c-so-view.has-complex-content + .c-frame-edit__move {
> .c-so-view.has-complex-content + .c-frame__move-bar {
display: block;
}
}

View File

@ -142,7 +142,7 @@ export default {
}
this.viewContainer = document.createElement('div');
this.viewContainer.classList.add('u-angular-object-view-wrapper');
this.viewContainer.classList.add('l-angular-ov-wrapper');
this.$el.append(this.viewContainer);
let provider = this.getViewProvider();
if (!provider) {

View File

@ -36,10 +36,6 @@
display: none;
}
//> .c-so-view__local-controls {
// top: $interiorMarginSm; right: $interiorMarginSm;
//}
&.is-missing {
@include isMissing($absPos: true);
@ -86,6 +82,8 @@
}
}
.u-angular-object-view-wrapper {
display: contents;
.l-angular-ov-wrapper {
// This element is the recipient for object styling; cannot be display: contents
height: 100%;
overflow: hidden;
}

View File

@ -95,7 +95,7 @@ export default {
this.viewKey = view.key;
this.viewContainer = document.createElement('div');
this.viewContainer.classList.add('u-angular-object-view-wrapper');
this.viewContainer.classList.add('l-angular-ov-wrapper');
this.$refs.objectView.append(this.viewContainer);
this.view = this.currentView.view(this.domainObject, this.objectPath);