summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgfyoung <gfyoung17@gmail.com>2018-06-14 00:39:20 -0700
committergfyoung <gfyoung17@gmail.com>2018-06-14 14:04:34 -0700
commit16854ee6f8ba80d86d47befb631da3eb44da5e76 (patch)
tree4ec75d387cc88be44132d5834ac36425c12f3c51
parentbb0875a67a308e1c6f9a16a7fe43b066f8765a39 (diff)
downloadgitlab-ce-16854ee6f8ba80d86d47befb631da3eb44da5e76.tar.gz
Remove scrollbar in Safari in repo settings page
Closes #47410.
-rw-r--r--app/assets/stylesheets/pages/settings.scss2
-rw-r--r--changelogs/unreleased/safari-scrollbar-bug.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss
index 1f8e61257a9..4abb145067a 100644
--- a/app/assets/stylesheets/pages/settings.scss
+++ b/app/assets/stylesheets/pages/settings.scss
@@ -52,7 +52,7 @@
.settings-content {
max-height: 1px;
- overflow-y: scroll;
+ overflow-y: hidden;
padding-right: 110px;
animation: collapseMaxHeight 300ms ease-out;
// Keep the section from expanding when we scroll over it
diff --git a/changelogs/unreleased/safari-scrollbar-bug.yml b/changelogs/unreleased/safari-scrollbar-bug.yml
new file mode 100644
index 00000000000..792a66d1ada
--- /dev/null
+++ b/changelogs/unreleased/safari-scrollbar-bug.yml
@@ -0,0 +1,5 @@
+---
+title: Remove scrollbar in Safari in repo settings page
+merge_request: 19809
+author: gfyoung
+type: fixed