From a394b952595169e97aa93f52e28952829e24bde2 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Thu, 2 Jun 2016 16:04:26 -0700 Subject: [PATCH 1/3] [Frontend] Tweaks to scrollbar visibility Fixes #913 - Scrollbar now always visible in the right side of the tabular area, in order to avoid column bottom edges not aligning; --- platform/features/timeline/res/sass/_timelines.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/features/timeline/res/sass/_timelines.scss b/platform/features/timeline/res/sass/_timelines.scss index 006fccfbd9..68cc5efdf7 100644 --- a/platform/features/timeline/res/sass/_timelines.scss +++ b/platform/features/timeline/res/sass/_timelines.scss @@ -58,7 +58,7 @@ } &.l-tabular-r { // Start, end, duration, activity modes columns - @include scrollH(); + @include scrollH(scroll); left: $timelineTabularTitleW; .l-width { @include absPosDefault(0, visible); @@ -331,4 +331,4 @@ &:hover { background-color: $colorItemTreeHoverBg; } -} \ No newline at end of file +} From 808ccd03766f5106dceb982247284e8029c63b2a Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Thu, 2 Jun 2016 16:23:42 -0700 Subject: [PATCH 2/3] [Frontend] Tweaks to splitter Fixes #913 - IN PROGRESS: working on making smaller splitter in Timelines --- .../themes/espresso/res/sass/_constants.scss | 3 ++- .../commonUI/themes/snow/res/sass/_constants.scss | 3 ++- platform/features/timeline/res/sass/_timelines.scss | 12 +++++++----- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss index bb774fb7a8..87770c3eef 100644 --- a/platform/commonUI/themes/espresso/res/sass/_constants.scss +++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss @@ -183,8 +183,9 @@ $scrollbarThumbColorOverlay: lighten($colorOvrBg, 10%); $scrollbarThumbColorOverlayHov: lighten($scrollbarThumbColorOverlay, 2%); // Splitter -$splitterD: 25px; // splitterD and HandleD should both be odd, or even +$splitterD: 25px; // 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; diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss index f85b5c328f..00ec69c139 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/platform/commonUI/themes/snow/res/sass/_constants.scss @@ -183,8 +183,9 @@ $scrollbarThumbColorOverlay: darken($colorOvrBg, 50%); $scrollbarThumbColorOverlayHov: $scrollbarThumbColorHov; // Splitter -$splitterD: 24px; +$splitterD: 24px; // splitterD and $splitterHandleD should both be odd, or even $splitterHandleD: 2px; +$splitterDSm: 16px; // Smaller splitter, used inside elements like a Timeline view $colorSplitterBg: pullForward($colorBodyBg, 10%); $splitterShdw: none; $splitterEndCr: none; diff --git a/platform/features/timeline/res/sass/_timelines.scss b/platform/features/timeline/res/sass/_timelines.scss index 68cc5efdf7..8a59aef5f4 100644 --- a/platform/features/timeline/res/sass/_timelines.scss +++ b/platform/features/timeline/res/sass/_timelines.scss @@ -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; @@ -304,11 +311,6 @@ } } - .splitter { - // Top of splitter within Timelines should be 0 - top: 0; - } - // Ticks .l-ticks, .l-subticks { From 8e0858bb24b33cbe03f55c31bb2cf631d68b1024 Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Fri, 3 Jun 2016 10:00:16 -0700 Subject: [PATCH 3/3] [Frontend] Tweaks to splitter dimensions Fixes #913 - Tightened up splitter height and width; - Added hover color for snow theme; --- platform/commonUI/themes/espresso/res/sass/_constants.scss | 4 ++-- platform/commonUI/themes/snow/res/sass/_constants.scss | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss index 87770c3eef..4d98f1208d 100644 --- a/platform/commonUI/themes/espresso/res/sass/_constants.scss +++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss @@ -183,13 +183,13 @@ $scrollbarThumbColorOverlay: lighten($colorOvrBg, 10%); $scrollbarThumbColorOverlayHov: lighten($scrollbarThumbColorOverlay, 2%); // Splitter -$splitterD: 25px; // splitterD and $splitterHandleD 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 diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss index 00ec69c139..292358078a 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/platform/commonUI/themes/snow/res/sass/_constants.scss @@ -183,13 +183,12 @@ $scrollbarThumbColorOverlay: darken($colorOvrBg, 50%); $scrollbarThumbColorOverlayHov: $scrollbarThumbColorHov; // Splitter -$splitterD: 24px; // splitterD and $splitterHandleD should both be odd, or even +$splitterD: 16px; // splitterD and $splitterHandleD should both be odd, or even $splitterHandleD: 2px; -$splitterDSm: 16px; // Smaller splitter, used inside elements like a Timeline view $colorSplitterBg: pullForward($colorBodyBg, 10%); $splitterShdw: none; $splitterEndCr: none; -$colorSplitterHover: none; +$colorSplitterHover: pullForward($colorBodyBg, 30%); $colorSplitterActive: $colorKey; // Mobile