From 18e08074a8e8c076ac927d3948af2865d88acb2d Mon Sep 17 00:00:00 2001 From: Charles Hacskaylo Date: Wed, 27 Jul 2016 16:33:25 -0700 Subject: [PATCH] [Frontend] Tweaks to sass code Fixes #1047 - Splitter and mini-tab-icon elements --- platform/commonUI/general/res/sass/_mixins.scss | 3 +-- .../commonUI/general/res/sass/user-environ/_layout.scss | 9 ++------- platform/commonUI/themes/snow/res/sass/_constants.scss | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index 3fcbfe3cf3..fdf111db85 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -294,10 +294,9 @@ @function splitterHandleInset($splitterD: 21px, $splitterHandleD: 1px) { // Space to either side of the handle - @return ($splitterD - $splitterHandleD) * 0.5; + @return ($splitterD - $splitterHandleD) / 2; } - /*********************************************** CONTROLS, FORM ELEMENTS */ @mixin containerBase($bg: $colorBodyBg, $fg: $colorBodyFg) { diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index 6de5dc0f2b..09aee0409c 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -147,14 +147,9 @@ } body.desktop .pane .mini-tab-icon.toggle-pane { - $paneExpandedOffset: splitterHandleInset($splitterD, $splitterHandleD) + $splitterHandleD + $uePaneMiniTabW; - //$paneExpandedOffset: ceil($splitterD / 2) + $splitterHandleDHalf + if($splitterHandleDHalf % 2 != 0, 0px, 0px); //$splitterHandleD; //ceil($splitterD / 2) + ceil($splitterHandleD / 2); + $hi: splitterHandleInset($splitterD, $splitterHandleD); + $paneExpandedOffset: $hi + $splitterHandleD + $uePaneMiniTabW; top: $bodyMargin + ($ueTopBarH - $uePaneMiniTabH)/2; - /* - * The left anchor is able to move with its parent, - * but the right one can't and must have a anim - * or transition - */ &.toggle-tree.anchor-left.collapsed, &.toggle-inspect.anchor-right:not(.collapsed) { diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss index d99c040e57..4c85752b23 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/platform/commonUI/themes/snow/res/sass/_constants.scss @@ -193,7 +193,7 @@ $scrollbarThumbColorOverlayHov: $scrollbarThumbColorHov; // Splitter // All splitterD* values MUST both be either odd or even numbers $splitterD: 16px; -$splitterDSm: 14px; // Smaller splitter, used inside elements like a Timeline view +$splitterDSm: 10px; // Smaller splitter, used inside elements like a Timeline view $splitterHandleD: 2px; $colorSplitterBaseBg: $colorBodyBg; $colorSplitterBg: pullForward($colorSplitterBaseBg, 15%);