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

[Frontend] IN-PROGRESS Theming continues

Browse Source 
open #95
Search, plots;
Minor tweaks to add shdw to items and buttons;
This commit is contained in:
Charles Hacskaylo
2015-09-10 11:43:39 -07:00
parent 3792dab0f9
commit 3b2454c6a9
13 changed files with 298 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/commonUI/general/res/sass/_mixins.scss
View File

@@ -287,7 +287,7 @@
@include appearance(none);
@include border-radius($controlCr);
@include box-sizing(border-box);
@include box-shadow(inset rgba(black, 0.4) 0 1px 2px);
@include box-shadow(inset rgba(black, 0.4) 0 1px 3px);
background: $bg;
border: none;
color: $fg;

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

@@ -240,6 +240,7 @@ label.checkbox.custom {
//}
> .type-icon {
color: $colorObjHdrIcon;
font-size: 120%;
float: left;
margin-right: $interiorMargin;

6
platform/commonUI/general/res/sass/helpers/_splitter.scss
View File

@@ -21,10 +21,10 @@
*****************************************************************************/
.split-layout {
$b: pullForward($colorBodyBg, $contrastRatioPercent);
$splitterD: 5px;
.splitter {
background-color: $b;
@include border-radius($splitterEndCr);
@include boxShdw($splitterShdw);
overflow: hidden;
position: absolute;
@@ -53,7 +53,7 @@
cursor: row-resize;
left: 0; right: 0;
width: auto;
height: $splitterD;
height: $splitterW;
}
}
&.vertical {
@@ -72,7 +72,7 @@
@include controlGrippy($colorBodyBg, vertical);
bottom: 0;
cursor: col-resize;
width: $splitterD;
width: $splitterW;
}
}
}

1
platform/commonUI/general/res/sass/items/_item.scss
View File

@@ -131,6 +131,7 @@
color: $colorItemFg;
}
.details {
@include txtShdw($shdwItemText);
@include ellipsize();
color: $colorItemFgDetails;
font-size: 0.8em;

13
platform/commonUI/general/res/sass/plots/_plots-main.scss
View File

@@ -29,7 +29,7 @@ $swatchD: 8px;
$plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBarW); // Top, right, bottom, left
.gl-plot {
color: $colorBodyFg;
color: $colorPlotFg;
font-size: 0.7rem;
position: relative;
width: 100%;
@@ -74,6 +74,9 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa
}
.gl-plot-display-area {
@if $colorPlotBg != none {
background-color: $colorPlotBg;
}
position: absolute;
top: nth($plotDisplayArea, 1);
right: nth($plotDisplayArea, 2);
@@ -213,7 +216,11 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa
width: $swatchD;
//margin-right: $interiorMarginSm;
}
.title-label {}
&[class*='s-limit'] {
.title-label {
color: #fff;
}
}
}
}
@@ -221,7 +228,7 @@ $plotDisplayArea: ($legendH + $interiorMargin, 0, $xBarH + $interiorMargin, $yBa
.plot-legend-item {
//@include test();
@include border-radius($smallCr);
color: #fff;
//color: #fff;
line-height: 1.5em;
padding: 0px $itemPadLR;
.plot-color-swatch {

13
platform/commonUI/general/res/sass/search/_search.scss
View File

@@ -69,7 +69,7 @@
.menu-icon {
//@include test(#008800);
@include box-sizing(border-box);
color: $colorItemFg;
color: $colorInputIcon;
height: $iconD; width: $iconD;
line-height: $iconD;
position: absolute;
@@ -97,7 +97,7 @@
}
.search-icon {
color: $colorItemFg;
//color: $colorItemFg;
left: $interiorMarginSm;
transition: visibility .15s, opacity .15s, color .2s;
pointer-events: none;
@@ -117,7 +117,7 @@
// Make icon lighten when hovering over search bar
.search-input:hover + div.search-icon {
color: lighten($colorItemFg, 20%);
color: pullForward($colorInputIcon, 10%);
}
.clear-icon {
@@ -135,7 +135,7 @@
}
&:hover {
color: lighten($colorItemFg, 20%);
color: pullForward($colorInputIcon, 10%);
}
}
@@ -146,7 +146,7 @@
text-align: right;
&:hover {
color: lighten($colorItemFg, 20%);
color: pullForward($colorInputIcon, 10%);
}
}
@@ -191,7 +191,8 @@
.clear-filters-icon {
opacity: 0.4;
color: $colorInputIcon;
opacity: 1;
font-size: 0.8em;
position: absolute;
left: 1px;

2
platform/commonUI/general/res/sass/tree/_tree.scss
View File

@@ -83,7 +83,7 @@ ul.tree {
.icon {
&.l-icon-link,
&.l-icon-alert {
@include txtShdwSubtle(1);
//@include txtShdw($shdwItemTreeIcon);
position: absolute;
z-index: 2;
}