summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Gray <annabel.m.gray@gmail.com>2018-06-05 01:43:31 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-06-05 11:13:11 +0100
commit06f59cbcd15a98fd810a3ad02488815a0940d89c (patch)
tree2c4bcc6d03b43e5f4c0c009952300d1584892a09
parent43eeff8415533efea4147e2df371f332d06f2448 (diff)
downloadgitlab-ce-06f59cbcd15a98fd810a3ad02488815a0940d89c.tar.gz
Merge branch 'bootstrap-markdown-code-highlight' into 'master'
Fix markdown code highlighting Closes #47131 See merge request gitlab-org/gitlab-ce!19325
-rw-r--r--app/assets/stylesheets/bootstrap_migration.scss1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss
index c83144eb1ef..d5679177f8f 100644
--- a/app/assets/stylesheets/bootstrap_migration.scss
+++ b/app/assets/stylesheets/bootstrap_migration.scss
@@ -61,6 +61,7 @@ a {
code {
padding: 2px 4px;
+ color: $red-600;
background-color: $red-100;
border-radius: 3px;