summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-06-14 07:46:22 +0000
committerPhil Hughes <me@iamphill.com>2019-06-14 07:46:22 +0000
commit96a46468c23d7017db00f78e200fddfee832eb39 (patch)
tree2cab33c180bd733f919eef1453ff538221e6f7de
parent286a593849d1ee1b9908fd924d8272a5e03375df (diff)
parent5d59826edfd62068c3d2c8620092c5efe0039625 (diff)
downloadgitlab-ce-96a46468c23d7017db00f78e200fddfee832eb39.tar.gz
Merge branch 'fix-sticky-tabs-position' into 'master'
Update height of $mr-tabs-height See merge request gitlab-org/gitlab-ce!29619
-rw-r--r--app/assets/stylesheets/framework/variables.scss2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 07fc655307e..b6a24247d40 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -823,7 +823,7 @@ $issues-analytics-popover-boarder-color: rgba(0, 0, 0, 0.15);
/*
Merge Requests
*/
-$mr-tabs-height: 51px;
+$mr-tabs-height: 48px;
$mr-version-controls-height: 56px;
/*