diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-05-18 03:51:36 +0000 |
|---|---|---|
| committer | Annabel Gray <annabel.m.gray@gmail.com> | 2018-05-18 03:51:36 +0000 |
| commit | 1b9ff9db8171c54240f8eff228da6e905548d761 (patch) | |
| tree | 8399821dbe209d85bbb287b4b0d8568b4e755ae4 | |
| parent | 0f0400d10d6f0634b483f5e1f0584448571e26ae (diff) | |
| parent | db0454fe74776ef13ef1ad6b6ce688867d9a6c64 (diff) | |
| download | gitlab-ce-1b9ff9db8171c54240f8eff228da6e905548d761.tar.gz | |
Merge branch '45934-ide-firefox-scroll-md-preview' into 'master'
Resolve "Web IDE: Previewing Markdown in Firefox doesn’t show a scroll bar"
Closes #45934
See merge request gitlab-org/gitlab-ce!18992
| -rw-r--r-- | app/assets/stylesheets/pages/repo.scss | 18 | ||||
| -rw-r--r-- | changelogs/unreleased/45934-ide-firefox-scroll-md-preview.yml | 5 |
2 files changed, 17 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index 00457717f00..7637a3f577c 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -306,8 +306,18 @@ } .preview-container { - height: 100%; - overflow: auto; + flex-grow: 1; + position: relative; + + .md-previewer { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + overflow: auto; + padding: $gl-padding; + } .file-container { background-color: $gray-darker; @@ -347,10 +357,6 @@ color: $diff-image-info-color; } } - - .md-previewer { - padding: $gl-padding; - } } .ide-mode-tabs { diff --git a/changelogs/unreleased/45934-ide-firefox-scroll-md-preview.yml b/changelogs/unreleased/45934-ide-firefox-scroll-md-preview.yml new file mode 100644 index 00000000000..b9e70bc5679 --- /dev/null +++ b/changelogs/unreleased/45934-ide-firefox-scroll-md-preview.yml @@ -0,0 +1,5 @@ +--- +title: Fix unscrollable Markdown preview of WebIDE on Firefox +merge_request: +author: +type: fixed |