summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Mishunov <dmishunov@gitlab.com>2019-03-28 14:31:07 +0100
committerDenys Mishunov <dmishunov@gitlab.com>2019-03-28 15:27:22 +0100
commita7d169b47b8464896eb9b4c0d955c34b448a43f5 (patch)
tree2fdbb1d2d0ca7bc827567f2408bcb7de9eac9272
parenta85fd76f524802a02957ccdcca7674f618a9e069 (diff)
downloadgitlab-ce-a7d169b47b8464896eb9b4c0d955c34b448a43f5.tar.gz
Enabled text selection in diffs in Web IDE47771-highlighting-in-diff
Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/47771 Changelog entry
-rw-r--r--app/assets/stylesheets/page_bundles/ide.scss8
-rw-r--r--changelogs/unreleased/47771-highlighting-in-diff.yml5
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