ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-22 10:11:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Frontend] Fix alignment and font-size issues in tool-bar

Browse Source 
Fixes #1496
This commit is contained in:
Charles Hacskaylo 2017-09-13 09:47:18 -07:00 committed by Pegah Sarram
parent bb47feb517
commit 68abc15ed5
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platform/commonUI/general/res/sass/_fixed-position.scss
View File

@ -52,6 +52,7 @@
font-size: 0.8rem; font-size: 0.8rem;
$p: 1px; $p: 1px;
line-height: 100%; line-height: 100%;
overflow: hidden;
&.l-static-text { &.l-static-text {
padding: $p; padding: $p;
} }

1
platform/commonUI/general/res/sass/controls/_buttons.scss
View File

@ -33,7 +33,6 @@ $pad: $interiorMargin * $baseRatio;
height: $btnStdH; height: $btnStdH;
line-height: $btnStdH; line-height: $btnStdH;
padding: 0 $pad; padding: 0 $pad;
vertical-align: top;
&.labeled:before { &.labeled:before {
// Icon when it's included // Icon when it's included

3
platform/commonUI/general/res/sass/controls/_controls.scss
View File

@ -309,9 +309,8 @@ textarea.lg { position: relative; height: 300px; }
} }
} }
&:before { &:before {
//@include contextArrow();
pointer-events: none; pointer-events: none;
color: rgba($colorSelectFg, percentToDecimal($contrastInvokeMenuPercent)); color: rgba($colorInvokeMenu, percentToDecimal($contrastInvokeMenuPercent));
display: block; display: block;
position: absolute; position: absolute;
right: $interiorMargin; top: 0; right: $interiorMargin; top: 0;

4
platform/commonUI/general/res/sass/user-environ/_layout.scss
View File

@ -240,7 +240,9 @@ body.desktop .pane .mini-tab-icon.toggle-pane {
.top-bar .buttons-main .s-button, .top-bar .buttons-main .s-button,
.top-bar .s-menu-button, .top-bar .s-menu-button,
.tool-bar .s-button, .tool-bar .s-button,
.tool-bar .s-menu-button { .tool-bar .s-menu-button,
.tool-bar .select,
.tool-bar .input-labeled {
$h: $btnToolbarH; $h: $btnToolbarH;
height: $h; height: $h;
line-height: $h; line-height: $h;

3
platform/commonUI/general/res/sass/user-environ/_tool-bar.scss
View File

@ -20,6 +20,7 @@
* at runtime from the About dialog for additional information. * at runtime from the About dialog for additional information.
*****************************************************************************/ *****************************************************************************/
.tool-bar { .tool-bar {
font-size: 0.7rem;
&.btn-bar { &.btn-bar {
white-space: nowrap; white-space: nowrap;
} }
@ -30,9 +31,7 @@
input[type="search"], input[type="search"],
input[type="number"] { input[type="number"] {
box-sizing: border-box; box-sizing: border-box;
font-size: .8em;
height: $btnToolbarH; height: $btnToolbarH;
margin-bottom: 1px;
position: relative; position: relative;
&.sm { &.sm {
width: $btnToolbarH; width: $btnToolbarH;

16
platform/features/fixed/bundle.js
View File

@ -153,10 +153,6 @@ define([
"description": "Set text size", "description": "Set text size",
"control": "select", "control": "select",
"options": [ "options": [
{
"value": "8px",
"name": "8 px"
},
{ {
"value": "9px", "value": "9px",
"name": "9 px" "name": "9 px"
@ -173,10 +169,18 @@ define([
"value": "12px", "value": "12px",
"name": "12 px" "name": "12 px"
}, },
{
"value": "13px",
"name": "13 px"
},
{ {
"value": "14px", "value": "14px",
"name": "14 px" "name": "14 px"
}, },
{
"value": "15px",
"name": "15 px"
},
{ {
"value": "16px", "value": "16px",
"name": "16 px" "name": "16 px"
@ -280,11 +284,7 @@ define([
"control": "numberfield", "control": "numberfield",
"description": "Resize object width", "description": "Resize object width",
"min": "1" "min": "1"
}
]
}, },
{
"items": [
{ {
"property": "useGrid", "property": "useGrid",
"name": "Snap to Grid", "name": "Snap to Grid",

2
platform/features/layout/src/elements/ElementFactory.js
View File

@ -43,7 +43,7 @@ define(
"fixed.text": { "fixed.text": {
fill: "transparent", fill: "transparent",
stroke: "transparent", stroke: "transparent",
size: "14px" size: "13px"
} }
}, },
DIALOGS = { DIALOGS = {