diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-07 19:35:45 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-07 19:35:45 +0000 |
| commit | c2a8daf9928439114ed4125577d376b76460d023 (patch) | |
| tree | e61ec1e8480f5e51c779c310788ef401efb47fcd /app/assets/stylesheets/pages/wiki.scss | |
| parent | 60bc0fc16900316ff22b83c6de3b358767d838b9 (diff) | |
| parent | 1e39b51a8a32ea469838fc473d41c8b04c2f935a (diff) | |
| download | gitlab-ce-c2a8daf9928439114ed4125577d376b76460d023.tar.gz | |
Merge branch '15664-remove-jquery-nicescroll' into 'master'
Resolve "Remove jQuery Nicescroll"
Closes #15664, #30860, and #35885
See merge request !13262
Diffstat (limited to 'app/assets/stylesheets/pages/wiki.scss')
| -rw-r--r-- | app/assets/stylesheets/pages/wiki.scss | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/wiki.scss b/app/assets/stylesheets/pages/wiki.scss index 45c21c5d274..fa6bdd297eb 100644 --- a/app/assets/stylesheets/pages/wiki.scss +++ b/app/assets/stylesheets/pages/wiki.scss @@ -95,12 +95,22 @@ } .right-sidebar.wiki-sidebar { - padding: $gl-padding 0; + padding: 0; &.right-sidebar-collapsed { display: none; } + .sidebar-container { + padding: $gl-padding 0; + width: calc(100% + 100px); + padding-right: 100px; + height: 100%; + overflow-y: scroll; + overflow-x: hidden; + -webkit-overflow-scrolling: touch; + } + .blocks-container { padding: 0 $gl-padding; } |