alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Frontend] New symbols font and CSS adjustments

Browse Source 
WTD-980
WTD-396
Changed glyph for stacked plots;
Normalized button line-heights and size of required symbol;
Updated symbol art in symbols font;
Restored mistakenly removed "menu" gesture to grid-item;
This commit is contained in:
Charles Hacskaylo
2015-06-24 11:42:29 -07:00
parent db3e132799
commit fdfa35d1da
14 changed files with 126 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,17 +25,24 @@ $pad: $interiorMargin * $baseRatio;
/******* LAYOUT AND SIZING */
.btn,
.l-btn {
line-height: 1.25em;
line-height: 1.5em; // Was 1.25em
padding: 0 $pad;
text-decoration: none;
&.lg,
&.create-btn {
$h: $ueTopBarH; // - $interiorMargin;
height: $h;
//line-height: $h;
line-height: $h - 2;
//padding: 0 $pad * 6 0 $pad;
padding: 0 $pad * 3;
}
&.create-btn {
&:before {
content:"+";
font-family: symbolsfont;
font-size: 0.8em;
//margin-right: $interiorMarginSm;
}
.menu {
margin-left: $pad * -1;
}
@@ -59,7 +66,7 @@ $pad: $interiorMargin * $baseRatio;
@include box-sizing(border-box);
@include text-shadow(rgba(black, 0.3) 0 1px 1px);
cursor: pointer;
line-height: 1.2em;
//line-height: 1.2em;
text-decoration: none;
&.major {
$bg: $colorKey;

26
platform/commonUI/general/res/sass/controls/_menus.scss
View File

@@ -68,8 +68,8 @@
.super-menu {
$w: 450px;
$h: $w - 20;
$plw: $w * 0.5;
$prw: $w - $plw;
$plw: 50%; //$w * 0.5;
$prw: 50%; //$w - $plw;
width: $w;
height: $h;
.contents {
@@ -78,12 +78,12 @@
.pane {
@include box-sizing(border-box);
&.left {
// @include test();
//@include test();
border-right: 1px solid rgba(white, 0.2);
left: 0;
padding-right: $interiorMargin;
right: auto;
width: $plw !important;
width: $plw;
overflow-x: hidden;
overflow-y: auto;
ul {
@@ -104,10 +104,11 @@
}
}
&.right {
left: $plw;
//@include test(red);
left: auto;
right: 0;
padding: $interiorMargin * 5;
width: $prw !important;
width: $prw;
}
}
}
@@ -115,7 +116,7 @@
.desc-area {
// @include test(green);
&.icon {
// @include test(red);
//@include test(red);
$h: 150px;
position: relative;
color: lighten($bg, 30%);
@@ -123,19 +124,20 @@
left: 0;
height: $h;
line-height: $h;
margin-bottom: $interiorMargin * 5;
// top: 0; right: 0; bottom: 5em; left: 0;
// height: 5em;
text-align: center;
}
&.description {
color: lighten($bg, 30%);
font-size: 0.8em;
}
&.title {
color: lighten($bg, 60%);
font-size: 1.2em;
margin-bottom: 1rem;
margin-bottom: 0.5em;
}
&.description {
color: lighten($bg, 30%);
font-size: 0.8em;
}
}
}
.context-menu {