diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2017-09-13 21:42:51 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-09-13 21:42:51 +0000 |
| commit | a78657a633c1a8fe0aa2c36a2f912ade32327747 (patch) | |
| tree | 063cab54ccd98dbfb616a9587e34a1086e00945d | |
| parent | f06d370b20ffbb7b8dba83b841df053b39cf3b1a (diff) | |
| parent | 6457f6c7e85e4399a8e1d60ccd76a30ef2f9edcd (diff) | |
| download | gitlab-ce-a78657a633c1a8fe0aa2c36a2f912ade32327747.tar.gz | |
Merge branch 'repo-editor-ui-fix' into 'master'
Several repo editor fixes
Closes #36128, #36240, and #37733
See merge request !14126
| -rw-r--r-- | app/assets/stylesheets/pages/repo.scss | 14 | ||||
| -rw-r--r-- | app/views/projects/blob/viewers/_download.html.haml | 2 |
2 files changed, 14 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index 69abb13add4..7dfcf7b7d9c 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -71,6 +71,11 @@ height: 100%; .monaco-editor.vs { + .current-line { + border: none; + background: $well-light-border; + } + .line-numbers { cursor: pointer; @@ -84,6 +89,13 @@ } } + .blob-no-preview { + .vertical-center { + justify-content: center; + width: 100%; + } + } + &.edit-mode { .blob-viewer-container { overflow: hidden; @@ -103,7 +115,7 @@ overflow: auto; > div, - .file-content { + .file-content:not(.wiki) { display: flex; } diff --git a/app/views/projects/blob/viewers/_download.html.haml b/app/views/projects/blob/viewers/_download.html.haml index 6d1138f7959..253566c43be 100644 --- a/app/views/projects/blob/viewers/_download.html.haml +++ b/app/views/projects/blob/viewers/_download.html.haml @@ -1,5 +1,5 @@ .file-content.blob_file.blob-no-preview - .center + .center.render-error.vertical-center = link_to blob_raw_path do %h1.light = icon('download') |