ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-20 17:33:23 +00:00
Code Issues Actions 1 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
commit 717ceff02c
3 changed files with 14 additions and 11 deletions
Show Stats 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%);
// 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;
$splitterDSm: 17px; // Smaller splitter, used inside elements like a Timeline view
$colorSplitterBg: rgba(#fff, 0.1); //pullForward($colorBodyBg, 5%);
$splitterShdw: rgba(black, 0.4) 0 0 3px;
$splitterEndCr: none;
$colorSplitterHover: pullForward($colorBodyBg, 15%);
$colorSplitterHover: pullForward($colorBodyBg, 40%);
$colorSplitterActive: $colorKey;
// Mobile

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

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

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

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