Merge branch 'backport-ee-fix-settings-scss' into 'master'

Backport settings.scss bug fix from EE branch See merge request !11969

Merge branch 'backport-ee-fix-settings-scss' into 'master'
6ee216c4 · Phil Hughes · ee0e3ffc · f15ea423 · 6ee216c4
Commit 6ee216c4 authored Jun 07, 2017 by Phil Hughes
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

settings.scss app/assets/stylesheets/pages/settings.scss +1 -1

No files found.
--- a/app/assets/stylesheets/pages/settings.scss
+++ b/app/assets/stylesheets/pages/settings.scss
@@ -56,7 +56,7 @@

  &.expanded {
    max-height: none;
-    overflow-y: hidden;
+    overflow-y: visible;
    animation: expandMaxHeight 300ms ease-in;
  }