summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-04-13 09:30:47 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-04-13 09:30:47 +0000
commitab98308db7d907e5fad53d2b1e3435960a1665cd (patch)
treeff0576a3557877fb1a0695ccbc2e26f0d6dce046
parent59707ade1bf18bb2614959ea57d6c5d817bf409e (diff)
parent5a84020f23be6e8c9cfddbf3275c67c91e2a1145 (diff)
downloadgitlab-ce-ab98308db7d907e5fad53d2b1e3435960a1665cd.tar.gz
Merge branch 'ide-firefox-scroll-fix' into 'master'
Fixed IDE sidebar not being scrollable in FireFox Closes #45314 See merge request gitlab-org/gitlab-ce!18350
-rw-r--r--app/assets/stylesheets/pages/repo.scss3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss
index a414deb8921..5f46e69a56d 100644
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -429,6 +429,7 @@
.projects-sidebar {
display: flex;
flex-direction: column;
+ height: 100%;
.context-header {
width: auto;
@@ -438,8 +439,8 @@
.multi-file-commit-panel-inner {
display: flex;
- flex: 1;
flex-direction: column;
+ height: 100%;
}
.multi-file-commit-panel-inner-scroll {