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

Merge pull request #995 from nasa/timeline-913a

Browse Source 
R&I tweaks to Timeline scrollbar and splitters
This commit is contained in:
Andrew Henry
2016-06-15 11:45:17 -07:00
committed by GitHub
parent 6878c59f45 8e0858bb24
commit 717ceff02c
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -183,12 +183,13 @@ $scrollbarThumbColorOverlay: lighten($colorOvrBg, 10%);
$scrollbarThumbColorOverlayHov: lighten($scrollbarThumbColorOverlay, 2%); $scrollbarThumbColorOverlayHov: lighten($scrollbarThumbColorOverlay, 2%);
// Splitter // Splitter
$splitterD: 25px; // splitterD and HandleD should both be odd, or even $splitterD: 17px; // splitterD and $splitterHandleD should both be odd, or even
$splitterHandleD: 1px; $splitterHandleD: 1px;
$splitterDSm: 17px; // Smaller splitter, used inside elements like a Timeline view
$colorSplitterBg: rgba(#fff, 0.1); //pullForward($colorBodyBg, 5%); $colorSplitterBg: rgba(#fff, 0.1); //pullForward($colorBodyBg, 5%);
$splitterShdw: rgba(black, 0.4) 0 0 3px; $splitterShdw: rgba(black, 0.4) 0 0 3px;
$splitterEndCr: none; $splitterEndCr: none;
$colorSplitterHover: pullForward($colorBodyBg, 15%); $colorSplitterHover: pullForward($colorBodyBg, 40%);
$colorSplitterActive: $colorKey; $colorSplitterActive: $colorKey;
// Mobile // Mobile

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

@@ -183,12 +183,12 @@ $scrollbarThumbColorOverlay: darken($colorOvrBg, 50%);
$scrollbarThumbColorOverlayHov: $scrollbarThumbColorHov; $scrollbarThumbColorOverlayHov: $scrollbarThumbColorHov;
// Splitter // Splitter
$splitterD: 24px; $splitterD: 16px; // splitterD and $splitterHandleD should both be odd, or even
$splitterHandleD: 2px; $splitterHandleD: 2px;
$colorSplitterBg: pullForward($colorBodyBg, 10%); $colorSplitterBg: pullForward($colorBodyBg, 10%);
$splitterShdw: none; $splitterShdw: none;
$splitterEndCr: none; $splitterEndCr: none;
$colorSplitterHover: none; $colorSplitterHover: pullForward($colorBodyBg, 30%);
$colorSplitterActive: $colorKey; $colorSplitterActive: $colorKey;
// Mobile // Mobile

14
platform/features/timeline/res/sass/_timelines.scss
View File

@@ -23,6 +23,13 @@
.l-timeline-holder { .l-timeline-holder {
@include absPosDefault(); @include absPosDefault();
&.split-layout {
>.splitter {
// Top of splitter within Timelines should be 0
top: 0;
}
}
.l-header { .l-header {
@include user-select(none); @include user-select(none);
cursor: default; cursor: default;
@@ -58,7 +65,7 @@
} }
&.l-tabular-r { &.l-tabular-r {
// Start, end, duration, activity modes columns // Start, end, duration, activity modes columns
@include scrollH(); @include scrollH(scroll);
left: $timelineTabularTitleW; left: $timelineTabularTitleW;
.l-width { .l-width {
@include absPosDefault(0, visible); @include absPosDefault(0, visible);
@@ -304,11 +311,6 @@
} }
} }
.splitter {
// Top of splitter within Timelines should be 0
top: 0;
}
// Ticks // Ticks
.l-ticks, .l-ticks,
.l-subticks { .l-subticks {