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

[Frontend] Fixing issues with theme coloring

Browse Source 
Fixes #933
This commit is contained in:
Charles Hacskaylo 2016-08-01 18:55:49 -07:00
parent 573f1f9f99
commit ca5206d4a0
6 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -268,16 +268,6 @@
text-shadow: rgba(black, $sVal) 0 3px 7px; text-shadow: rgba(black, $sVal) 0 3px 7px;
} }
@function pullForward($c, $p: 20%) {
// For dark interfaces, lighter things come forward
@return lighten($c, $p);
}
@function pushBack($c, $p: 20%) {
// For dark interfaces, darker things move back
@return darken($c, $p);
}
@function percentToDecimal($p) { @function percentToDecimal($p) {
@return $p / 100%; @return $p / 100%;
} }

2
platform/commonUI/themes/espresso/res/sass/_constants.scss
View File

@ -61,7 +61,7 @@ $colorCreateBtn: $colorKey;
$colorGridLines: rgba(#fff, 0.05); $colorGridLines: rgba(#fff, 0.05);
$colorInvokeMenu: #fff; $colorInvokeMenu: #fff;
$colorObjHdrTxt: $colorBodyFg; $colorObjHdrTxt: $colorBodyFg;
$colorObjHdrIc: pullForward($colorObjHdrTxt, 20%); $colorObjHdrIc: darken($colorObjHdrTxt, 20%);
$colorTick: pullForward($colorBodyBg, 20%); $colorTick: pullForward($colorBodyBg, 20%);
// Menu colors // Menu colors

4
platform/commonUI/themes/snow/res/sass/_constants.scss
View File

@ -61,8 +61,8 @@ $colorCreateBtn: $colorKey;
$colorGridLines: rgba(#000, 0.05); $colorGridLines: rgba(#000, 0.05);
$colorInvokeMenu: #fff; $colorInvokeMenu: #fff;
$colorObjHdrTxt: $colorBodyFg; $colorObjHdrTxt: $colorBodyFg;
$colorObjHdrIc: pushBack($colorObjHdrTxt, 30%); $colorObjHdrIc: lighten($colorObjHdrTxt, 20%);
$colorTick: pullForward($colorBodyBg, 30%); $colorTick: lighten($colorBodyFg, 10%);
// Menu colors // Menu colors
$colorMenuBg: pushBack($colorBodyBg, 10%); $colorMenuBg: pushBack($colorBodyBg, 10%);

5
platform/features/conductor-v2/res/sass/_time-conductor-base.scss
View File

@ -66,7 +66,7 @@
top: 50%; top: 50%;
z-index: 2; z-index: 2;
&:before { &:before {
background-color: $c; background: $colorObjHdrIc;
content: ''; content: '';
display: block; display: block;
position: absolute; position: absolute;
@ -77,7 +77,6 @@
z-index: 2; z-index: 2;
@include animation-duration(12s); @include animation-duration(12s);
&:before { &:before {
//background: red;
height: ceil($handH * 0.7); height: ceil($handH * 0.7);
} }
} }
@ -178,7 +177,7 @@
} }
.l-time-conductor-inputs-and-ticks { .l-time-conductor-inputs-and-ticks {
$c: $colorTick; $c: $colorTimeCondTicks; //$colorTick;
height: $r1H; height: $r1H;
mct-conductor-axis { mct-conductor-axis {
display: block; display: block;

1
platform/features/conductor-v2/res/sass/time-conductor-espresso.scss
View File

@ -31,6 +31,7 @@
@import "constants"; @import "constants";
// Thematic constants // Thematic constants
$colorTimeCondTicks: pullForward($colorBodyBg, 30%);
$colorTimeCondKeyBg: #4e70dc; $colorTimeCondKeyBg: #4e70dc;
$colorTimeCondKeyFg: #fff; $colorTimeCondKeyFg: #fff;
$colorTimeCondDataVisBg: pullForward($colorBodyBg, 10%); $colorTimeCondDataVisBg: pullForward($colorBodyBg, 10%);

1
platform/features/conductor-v2/res/sass/time-conductor-snow.scss
View File

@ -31,6 +31,7 @@
@import "constants"; @import "constants";
// Thematic constants // Thematic constants
$colorTimeCondTicks: pullForward($colorBodyBg, 30%);
$colorTimeCondKeyBg: #6178dc; $colorTimeCondKeyBg: #6178dc;
$colorTimeCondKeyFg: #fff; $colorTimeCondKeyFg: #fff;
$colorTimeCondDataVisBg: pullForward($colorBodyBg, 10%); $colorTimeCondDataVisBg: pullForward($colorBodyBg, 10%);