ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-03-05 21:51:49 +00:00
Code Issues Actions1 Packages Projects Releases Wiki Activity

[Frontend] Styling for Time Conductor v2

Browse Source 
Fixes 
In-progress: color/size tweaks, fixes for espresso
theme
This commit is contained in:
Charles Hacskaylo 2016-07-13 19:42:51 -07:00
parent e193e3dfba
commit 8b694ef337
4 changed files with 17 additions and 8 deletions
platform/commonUI
general/res/sass
_constants.scss
controls
_time-conductor.scss
themes
espresso/res/sass
_constants.scss
snow/res/sass
_constants.scss

2
platform/commonUI/general/res/sass/_constants.scss

@ -48,7 +48,7 @@ $uePaneMiniTabW: 10px;
$uePaneMiniTabCollapsedW: 11px; $uePaneMiniTabCollapsedW: 11px;
$ueEditLeftPaneW: 75%; $ueEditLeftPaneW: 75%;
$treeSearchInputBarH: 25px; $treeSearchInputBarH: 25px;
$ueTimeControlH: (25px, 4px, 20px); $ueTimeControlH: (25px, 6px, 20px);
/*************** Panes */ /*************** Panes */
$ueBrowseLeftPaneTreeMinW: 150px; $ueBrowseLeftPaneTreeMinW: 150px;
$ueBrowseLeftPaneTreeMaxW: 35%; $ueBrowseLeftPaneTreeMaxW: 35%;

13
platform/commonUI/general/res/sass/controls/_time-conductor.scss

@ -22,7 +22,7 @@
} }
.time-conductor-icon { .time-conductor-icon {
$c: $colorBtnBg; //$colorTimeCondKeyBg; $c: $colorObjHdrIc;
$d: 20px; $d: 20px;
background: $c; background: $c;
border-radius: 4px; border-radius: 4px;
@ -193,6 +193,7 @@
display: none; display: none;
} }
line { line {
// Tick marks
stroke: $c; stroke: $c;
} }
text { text {
@ -239,7 +240,8 @@
border-radius: 0; border-radius: 0;
padding-left: 0; padding-left: 0;
padding-right: 0; padding-right: 0;
&:hover { &:hover,
&:focus {
@include nice-input(); @include nice-input();
padding: $inputTextP; padding: $inputTextP;
} }
@ -256,6 +258,13 @@
} }
} }
/* .l-time-conductor-ticks .l-axis-holder {
svg {
line { color: $colorTimeCondKeyBg; };
text { fill: $colorTimeCondKeyBg; }
}
}*/
.l-data-visualization { .l-data-visualization {
background: $colorTimeCondDataVisRtBg !important background: $colorTimeCondDataVisRtBg !important
} }

6
platform/commonUI/themes/espresso/res/sass/_constants.scss

@ -210,7 +210,7 @@ $colorLoadingFg: $colorAlt1;
$colorLoadingBg: rgba($colorBodyFg, 0.2); $colorLoadingBg: rgba($colorBodyFg, 0.2);
// Time Conductor // Time Conductor
$colorTimeCondKeyBg: #1d7a96; $colorTimeCondKeyBg: #4e70dc;
$colorTimeCondKeyFg: #fff; $colorTimeCondKeyFg: #fff;
$colorTimeCondDataVisBg: pushBack($colorTick, 20%); $colorTimeCondDataVisBg: pullForward($colorBodyBg, 10%);
$colorTimeCondDataVisRtBg: pushBack($colorTimeCondKeyBg, 30%); $colorTimeCondDataVisRtBg: pushBack($colorTimeCondKeyBg, 10%);

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

@ -210,7 +210,7 @@ $colorLoadingFg: $colorAlt1;
$colorLoadingBg: rgba($colorLoadingFg, 0.1); $colorLoadingBg: rgba($colorLoadingFg, 0.1);
// Time Conductor // Time Conductor
$colorTimeCondKeyBg: #0092b3; $colorTimeCondKeyBg: #6178dc;
$colorTimeCondKeyFg: #fff; $colorTimeCondKeyFg: #fff;
$colorTimeCondDataVisBg: pushBack($colorTick, 20%); $colorTimeCondDataVisBg: pullForward($colorBodyBg, 10%);
$colorTimeCondDataVisRtBg: pushBack($colorTimeCondKeyBg, 30%); $colorTimeCondDataVisRtBg: pushBack($colorTimeCondKeyBg, 30%);