Skip to content

Commit

Permalink
[Frontend] Tweaks to sass code
Browse files Browse the repository at this point in the history
Fixes #1047
- Splitter and mini-tab-icon elements
  • Loading branch information
charlesh88 committed Jul 27, 2016
1 parent 44fda8d commit 18e0807
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
3 changes: 1 addition & 2 deletions platform/commonUI/general/res/sass/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
9 changes: 2 additions & 7 deletions platform/commonUI/general/res/sass/user-environ/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion platform/commonUI/themes/snow/res/sass/_constants.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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%);
Expand Down

0 comments on commit 18e0807

Please sign in to comment.