diff options
| author | Phil Hughes <me@iamphill.com> | 2018-06-15 07:40:37 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-06-15 07:40:37 +0000 |
| commit | fd34c9d6fe03b1dcd6698519dbe136dcc970e98e (patch) | |
| tree | 7a9fbb6792b2d715a0aadb8625cbcfa3441baddb | |
| parent | fb08183e63733dd7845a16d9f827a5cd5f2d9080 (diff) | |
| parent | 16854ee6f8ba80d86d47befb631da3eb44da5e76 (diff) | |
| download | gitlab-ce-fd34c9d6fe03b1dcd6698519dbe136dcc970e98e.tar.gz | |
Merge branch 'safari-scrollbar-bug' into 'master'
Remove scrollbar in Safari in repo settings page
Closes #47410
See merge request gitlab-org/gitlab-ce!19809
| -rw-r--r-- | app/assets/stylesheets/pages/settings.scss | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/safari-scrollbar-bug.yml | 5 |
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 |