Skip to content

Commit

Permalink
[Frontend] Styling for Time Conductor v2
Browse files Browse the repository at this point in the history
Fixes #933
In-progress: color tweaks, bar sizing,
field widths
  • Loading branch information
charlesh88 committed Jul 13, 2016
1 parent 06af84c commit fcfda50
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion platform/commonUI/general/res/sass/_constants.scss
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ $uePaneMiniTabW: 10px;
$uePaneMiniTabCollapsedW: 11px;
$ueEditLeftPaneW: 75%;
$treeSearchInputBarH: 25px;
$ueTimeControlH: (25px, 18px, 20px);
$ueTimeControlH: (25px, 4px, 20px);
/*************** Panes */
$ueBrowseLeftPaneTreeMinW: 150px;
$ueBrowseLeftPaneTreeMaxW: 35%;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
.time-delta {
&:before {
@extend .ui-symbol;
margin-right: $interiorMarginSm;
}
}

Expand All @@ -52,7 +51,7 @@

.l-time-conductor-inputs-holder {
$trInputW: 180px;
$hmInputW: 80px;
$hmInputW: 60px;
$ticksBlockerFadeW: 50px;
$iconCalendarW: 16px;
$wBgColor: $colorBodyBg;
Expand Down Expand Up @@ -92,7 +91,6 @@
$c: $colorTick;
height: $r1H;
mct-conductor-axis {
//@include transform(translateY(1px));
display: block;
position: relative;
width: 100%;
Expand Down Expand Up @@ -121,7 +119,7 @@
}
}
.l-data-visualization {
background: rgba($colorTick, 0.3);
background: $colorTimeCondDataVisBg;
height: $r2H;
}

Expand Down Expand Up @@ -158,7 +156,7 @@
}

.l-data-visualization {
background: rgba($colorTimeCondKeyBg, 0.5) !important
background: $colorTimeCondDataVisRtBg !important
}
.mode-selector .s-menu-btn {
@include btnSubtle($colorTimeCondKeyBg, pullForward($colorTimeCondKeyBg, $ltGamma), $colorTimeCondKeyFg);
Expand Down
4 changes: 3 additions & 1 deletion platform/commonUI/themes/espresso/res/sass/_constants.scss
Original file line number Diff line number Diff line change
Expand Up @@ -211,4 +211,6 @@ $colorLoadingBg: rgba($colorBodyFg, 0.2);

// Time Conductor
$colorTimeCondKeyBg: #1d7a96;
$colorTimeCondKeyFg: #fff;
$colorTimeCondKeyFg: #fff;
$colorTimeCondDataVisBg: pushBack($colorTick, 20%);
$colorTimeCondDataVisRtBg: pushBack($colorTimeCondKeyBg, 30%);
2 changes: 2 additions & 0 deletions platform/commonUI/themes/snow/res/sass/_constants.scss
Original file line number Diff line number Diff line change
Expand Up @@ -212,3 +212,5 @@ $colorLoadingBg: rgba($colorLoadingFg, 0.1);
// Time Conductor
$colorTimeCondKeyBg: #0092b3;
$colorTimeCondKeyFg: #fff;
$colorTimeCondDataVisBg: pushBack($colorTick, 20%);
$colorTimeCondDataVisRtBg: pushBack($colorTimeCondKeyBg, 30%);

0 comments on commit fcfda50

Please sign in to comment.