mirror of
https://github.com/nasa/openmct.git
synced 2025-06-06 09:21:43 +00:00
Fix Inspector-based font size and style controls and menus (#3497)
- Moved CSS rule that was pushing the font style control to the right side of the Inspector to `l-shell__toolbar` rule definition; - Fixed `menus-to-left` CSS rule and applied to font size and style menu controls; - Added a new `menus-no-icon` style for menus that don't have icons, applied to font size and style menu controls;
This commit is contained in:
parent
8d9079984a
commit
f5cbb37e5a
@ -482,7 +482,7 @@ select {
|
|||||||
transition: $transIn;
|
transition: $transIn;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
|
|
||||||
&:hover {
|
@include hover {
|
||||||
background: $colorMenuHovBg;
|
background: $colorMenuHovBg;
|
||||||
color: $colorMenuHovFg;
|
color: $colorMenuHovFg;
|
||||||
&:before {
|
&:before {
|
||||||
@ -500,6 +500,10 @@ select {
|
|||||||
&:not([class*='icon']):before {
|
&:not([class*='icon']):before {
|
||||||
content: ''; // Enable :before so that menu items without an icon still indent properly
|
content: ''; // Enable :before so that menu items without an icon still indent properly
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.menus-no-icon & {
|
||||||
|
&:before { display: none; }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -731,7 +735,6 @@ select {
|
|||||||
.c-toolbar {
|
.c-toolbar {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
|
||||||
|
|
||||||
> * {
|
> * {
|
||||||
// First level items
|
// First level items
|
||||||
|
@ -552,7 +552,8 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&[class*='--menus-left'] {
|
&[class*='--menus-left'],
|
||||||
|
&[class*='menus-to-left'] {
|
||||||
.c-menu {
|
.c-menu {
|
||||||
left: auto; right: 0;
|
left: auto; right: 0;
|
||||||
}
|
}
|
||||||
|
@ -3,11 +3,13 @@
|
|||||||
<toolbar-select-menu
|
<toolbar-select-menu
|
||||||
:options="fontSizeMenuOptions"
|
:options="fontSizeMenuOptions"
|
||||||
@change="setFontSize"
|
@change="setFontSize"
|
||||||
|
class="menus-to-left menus-no-icon"
|
||||||
/>
|
/>
|
||||||
<div class="c-toolbar__separator"></div>
|
<div class="c-toolbar__separator"></div>
|
||||||
<toolbar-select-menu
|
<toolbar-select-menu
|
||||||
:options="fontMenuOptions"
|
:options="fontMenuOptions"
|
||||||
@change="setFont"
|
@change="setFont"
|
||||||
|
class="menus-to-left menus-no-icon"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
@ -279,10 +279,12 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
&__toolbar {
|
&__toolbar {
|
||||||
|
// Toolbar in the main shell, used by Display Layouts
|
||||||
$p: $interiorMargin;
|
$p: $interiorMargin;
|
||||||
background: $editUIBaseColor;
|
background: $editUIBaseColor;
|
||||||
border-radius: $basicCr;
|
border-radius: $basicCr;
|
||||||
height: $p + 24px; // Need to standardize the height
|
height: $p + 24px; // Need to standardize the height
|
||||||
|
justify-content: space-between;
|
||||||
padding: $p;
|
padding: $p;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user