summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-08-07 16:42:24 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-08-07 16:42:24 +0000
commit97eb1d5ae11d7a56b425f9894b5c6a87c1ec055d (patch)
tree94f46079bcf4d6b287dec997981d98ccabef0bdf /app
parent4ccecb8f898f5ef3f4e0fe5aee8319996cbb3252 (diff)
parent1c9a5b5665378c334d9fd07c93183586bbbd4141 (diff)
downloadgitlab-ce-97eb1d5ae11d7a56b425f9894b5c6a87c1ec055d.tar.gz
Merge branch 'ide-fixed-height-sidebar' into 'master'
Fixed the height of the tree list in the Web IDE See merge request gitlab-org/gitlab-ce!21068
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/page_bundles/ide.scss2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/page_bundles/ide.scss b/app/assets/stylesheets/page_bundles/ide.scss
index c3381e06c30..2b8163b8c68 100644
--- a/app/assets/stylesheets/page_bundles/ide.scss
+++ b/app/assets/stylesheets/page_bundles/ide.scss
@@ -533,7 +533,7 @@ $ide-tree-text-start: $ide-activity-bar-width + $ide-tree-padding;
position: relative;
display: flex;
flex-direction: column;
- height: 100%;
+ min-height: 100%;
min-width: 0;
width: 100%;
}