summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-08-25 19:20:58 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-08-25 19:20:58 +0000
commitb3a14fe2ddfcc2839afa18fe787361734a646966 (patch)
tree14b4f0fce008623e8585735a64cc62bcf3ed37d6
parent13d4285b0e976ad61faecab45e5fae1bcde50f87 (diff)
parent3a9091b43d06ab499968571bfa13e1c613114e4d (diff)
downloadgitlab-ce-b3a14fe2ddfcc2839afa18fe787361734a646966.tar.gz
Merge branch '21146-windows-scrollbar' into 'master'
Remove ugly horizontal scrollbars in windows ## What does this MR do? Removes horizontal scrollbars from pipelines view ## Why was this MR needed? It looked terrible. ## What are the relevant issue numbers? Closes #21146 See merge request !5942
-rw-r--r--app/assets/stylesheets/pages/builds.scss2
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss
index c1bb250b42d..8c33e7d9a2e 100644
--- a/app/assets/stylesheets/pages/builds.scss
+++ b/app/assets/stylesheets/pages/builds.scss
@@ -150,7 +150,7 @@
border-top: 1px solid $border-color;
border-bottom: 1px solid $border-color;
max-height: 300px;
- overflow: scroll;
+ overflow: auto;
svg {
position: relative;
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index fcdcc837298..7fdd79fa8b9 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -269,7 +269,7 @@
.builds {
.table-holder {
- overflow-x: scroll;
+ overflow-x: auto;
}
}