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

Merge pull request #2385 from nasa/misc-fixes-2

Browse Source 
Misc Fixes 2
This commit is contained in:
Charles Hacskaylo 2019-04-24 16:00:28 -07:00 committed by GitHub
commit f01d4071a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/displayLayout/components/SubobjectView.vue
View File

@ -22,6 +22,7 @@
<template> <template>
<layout-frame :item="item" <layout-frame :item="item"
:grid-size="gridSize" :grid-size="gridSize"
:title="domainObject && domainObject.name"
@move="(gridDelta) => $emit('move', gridDelta)" @move="(gridDelta) => $emit('move', gridDelta)"
@endMove="() => $emit('endMove')"> @endMove="() => $emit('endMove')">
<object-frame v-if="domainObject" <object-frame v-if="domainObject"

3
src/plugins/flexibleLayout/components/flexibleLayout.vue
View File

@ -113,7 +113,8 @@
&__container-holder { &__container-holder {
display: flex; display: flex;
flex: 1 1 100%; // Must needs to be 100% to work flex: 1 1 100%; // Must be 100% to work
overflow: auto;
// Columns by default // Columns by default
flex-direction: row; flex-direction: row;

29
src/ui/components/ObjectFrame.vue
View File

@ -26,8 +26,8 @@
'has-complex-content': complexContent 'has-complex-content': complexContent
}"> }">
<div class="c-so-view__header"> <div class="c-so-view__header">
<div class="c-so-view__header__name" <div class="c-so-view__header__icon" :class="cssClass"></div>
:class="cssClass"> <div class="c-so-view__header__name">
{{ domainObject && domainObject.name }} {{ domainObject && domainObject.name }}
</div> </div>
<context-menu-drop-down <context-menu-drop-down
@ -63,12 +63,16 @@
align-items: center; align-items: center;
margin-bottom: $interiorMargin; margin-bottom: $interiorMargin;
&__icon {
flex: 0 0 auto;
margin-right: $interiorMarginSm;
opacity: 0.5;
}
&__name { &__name {
@include headerFont(1em); @include headerFont(1em);
display: flex; @include ellipsize();
&:before { flex: 0 1 auto;
margin-right: $interiorMarginSm;
}
} }
} }
@ -88,19 +92,6 @@
} }
} }
&__name {
@include ellipsize();
@include headerFont(1.2em);
flex: 0 1 auto;
&:before {
// Object type icon
flex: 0 0 auto;
margin-right: $interiorMarginSm;
opacity: 0.5;
}
}
&__local-controls { &__local-controls {
position: absolute; position: absolute;
top: $interiorMargin; right: $interiorMargin; top: $interiorMargin; right: $interiorMargin;

6
src/ui/layout/BrowseBar.vue
View File

@ -289,10 +289,14 @@ const PLACEHOLDER_OBJECT = {};
&__nav-to-parent-button { &__nav-to-parent-button {
// This is an icon-button // This is an icon-button
$p: $interiorMarginLg; $p: $interiorMargin;
margin-right: $interiorMargin; margin-right: $interiorMargin;
padding-left: $p; padding-left: $p;
padding-right: $p; padding-right: $p;
.is-editing & {
display: none;
}
} }
&__object-name--w { &__object-name--w {

1
src/ui/layout/Layout.vue
View File

@ -64,7 +64,6 @@
&__status { &__status {
background: $colorStatusBarBg; background: $colorStatusBarBg;
color: $colorStatusBarFg; color: $colorStatusBarFg;
height: 24px;
padding: $interiorMarginSm; padding: $interiorMarginSm;
} }

4
src/ui/layout/pane.vue
View File

@ -194,8 +194,8 @@
/********************************* STYLES FOR DESKTOP COLLAPSED PANES, ALL ORIENTATIONS */ /********************************* STYLES FOR DESKTOP COLLAPSED PANES, ALL ORIENTATIONS */
$d: nth($splitterBtnD, 1); $d: nth($splitterBtnD, 1);
flex-basis: $d; flex-basis: $d;
min-width: $d !important; min-width: $d;
min-height: $d !important; min-height: $d;
> .l-pane__handle { > .l-pane__handle {
display: none; display: none;