ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-04-08 20:04:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes for Testathon 08-03-20 issues (#3269)

Browse Source 
* Fixes #3268

 - Moved `pointer-events: none` to apply to proper element in table and
 qualified selector to only apply when the table is within a layout
 frame;

* Tabs View mods, fixes #3265

 - Restored missing `c-object-label` markup to display type icon;
 - Removed unused code;
 - Refined alignment in `c-object-label` CSS;

* Fix mistakenly left port change

Co-authored-by: Andrew Henry <akhenry@gmail.com>
Co-authored-by: Jamie V <jamie.j.vigliotta@nasa.gov>
This commit is contained in:
Charles Hacskaylo 2020-10-02 15:43:33 -07:00 committed by GitHub
parent 257a8e2e2d
commit db33f0538a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/tabs/components/tabs.scss
View File

@ -13,14 +13,7 @@
}
&__tab {
&:before {
margin-right: $interiorMarginSm;
opacity: 0.7;
}
&__label {
flex: 1 1 auto;
}
justify-content: space-between; // Places remove button to far side of tab
&__close-btn {
flex: 0 0 auto;

13
src/plugins/tabs/components/tabs.vue
View File

@ -28,7 +28,18 @@
}"
@click="showTab(tab, index)"
>
<span class="c-button__label c-tabs-view__tab__label">{{ tab.domainObject.name }}</span>
<div class="c-tabs-view__tab__label c-object-label"
:class="{'is-missing': tab.domainObject.status === 'missing'}"
>
<div class="c-object-label__type-icon"
:class="tab.type.definition.cssClass"
>
<span class="is-missing__indicator"
title="This item is missing"
></span>
</div>
<span class="c-button__label c-object-label__name">{{ tab.domainObject.name }}</span>
</div>
<button v-if="isEditing"
class="icon-x c-click-icon c-tabs-view__tab__close-btn"
@click="showRemoveDialog(index)"

8
src/plugins/telemetryTable/components/table.scss
View File

@ -96,10 +96,6 @@
height: 0; // Fixes Chrome 73 overflow bug
overflow-x: auto;
overflow-y: scroll;
.is-editing & {
pointer-events: none;
}
}
/******************************* TABLES */
@ -114,6 +110,10 @@
position: absolute;
height: 18px; // Needed when a row has empty values in its cells
.is-editing .l-layout__frame & {
pointer-events: none;
}
&.is-selected {
background-color: $colorSelectedBg !important;
color: $colorSelectedFg !important;

2
src/ui/components/object-label.scss
View File

@ -2,7 +2,7 @@
// <a> tag and draggable element that holds type icon and name.
// Used mostly in trees and lists
display: flex;
align-items: center;
align-items: baseline; // Provides better vertical alignment than center
flex: 0 1 auto;
overflow: hidden;
white-space: nowrap;