Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-08-25 22:20:58 +0300
committerRuben Davila <rdavila84@gmail.com>2016-08-31 17:55:33 +0300
commit745236d37b380e4b021560ab8e452ad840f66f91 (patch)
tree01c0962f87c7c85b37328a8068551691fdf00933 /app
parentec3568345200a597ac7c4f4777f14d8a21587437 (diff)
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
Diffstat (limited to 'app')
-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 fcdaf671538..4bfdc4a2b26 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;
}
}