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-20 09:51:26 +0100
commit8e1a73f07baa54ec776936b09c904e963c0b94ce (patch)
tree1dffc92f144f6d97cb400d3dcf04cef72aa8628e
parent4b0547ebd0f93506c0d107210e55d3cdbb73ef5b (diff)
downloadgitlab-ce-8e1a73f07baa54ec776936b09c904e963c0b94ce.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 {