summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-07-09 09:39:31 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-07-09 09:39:31 +0000
commitc17e9a63606f552b75ee6b1aff8b96cd1d5116e0 (patch)
treed8a45cf11ef800ba28b1ee1f50ed3c20b4ad35cd /app
parentdc71b4004bd9773d03d5a4eeaba2db883e5a2251 (diff)
parentd3ebeb566e5ed1e6f5b4b2b6eb9929a5b681fb92 (diff)
downloadgitlab-ce-c17e9a63606f552b75ee6b1aff8b96cd1d5116e0.tar.gz
Merge branch 'ide-indent-guide' into 'master'
Updated color of indent guide in Web IDE Closes #48931 See merge request gitlab-org/gitlab-ce!20425
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/ide/lib/themes/gl_theme.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/ide/lib/themes/gl_theme.js b/app/assets/javascripts/ide/lib/themes/gl_theme.js
index 2fc96250c7d..439ae50448a 100644
--- a/app/assets/javascripts/ide/lib/themes/gl_theme.js
+++ b/app/assets/javascripts/ide/lib/themes/gl_theme.js
@@ -9,6 +9,7 @@ export default {
'diffEditor.insertedTextBackground': '#ddfbe6',
'diffEditor.removedTextBackground': '#f9d7dc',
'editor.selectionBackground': '#aad6f8',
+ 'editorIndentGuide.activeBackground': '#cccccc',
},
},
};