diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2019-04-03 07:34:41 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2019-04-03 07:34:41 +0000 |
| commit | b7c818192defb929e08a6487a3450f4bee484014 (patch) | |
| tree | cab54c38dd68c859f692f2cd8a057cd7a11b6513 | |
| parent | d11d8fa948e5cd9b44126b0fe45a908ec3119678 (diff) | |
| parent | a7d169b47b8464896eb9b4c0d955c34b448a43f5 (diff) | |
| download | gitlab-ce-b7c818192defb929e08a6487a3450f4bee484014.tar.gz | |
Merge branch '47771-highlighting-in-diff' into 'master'
Enabled text selection in diffs in Web IDE
Closes #47771
See merge request gitlab-org/gitlab-ce!26721
| -rw-r--r-- | app/assets/stylesheets/page_bundles/ide.scss | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/47771-highlighting-in-diff.yml | 5 |
2 files changed, 13 insertions, 0 deletions
diff --git a/app/assets/stylesheets/page_bundles/ide.scss b/app/assets/stylesheets/page_bundles/ide.scss index a80158943c6..0c1067bfacc 100644 --- a/app/assets/stylesheets/page_bundles/ide.scss +++ b/app/assets/stylesheets/page_bundles/ide.scss @@ -179,6 +179,14 @@ $ide-commit-header-height: 48px; display: none; } + .monaco-editor .selected-text { + z-index: 1; + } + + .monaco-editor .view-lines { + z-index: 2; + } + .is-readonly, .editor.original { .view-lines { diff --git a/changelogs/unreleased/47771-highlighting-in-diff.yml b/changelogs/unreleased/47771-highlighting-in-diff.yml new file mode 100644 index 00000000000..a8e8cbf0174 --- /dev/null +++ b/changelogs/unreleased/47771-highlighting-in-diff.yml @@ -0,0 +1,5 @@ +--- +title: Enabled text selection highlighting in diffs in Web IDE +merge_request: 26721 +author: Isaac Smith +type: fixed |