diff options
author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-08 02:07:00 +0000 |
---|---|---|
committer | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-08 02:07:00 +0000 |
commit | 9f69be38673c2d0f0e4c07c377195c3b310132bd (patch) | |
tree | 5d7bcf68a67e63e27953800c73a3d7c2cc6a8c29 | |
parent | e0b36899437f958f12f3c4e98df46638fd96c30a (diff) | |
parent | 0e794561bd5d45e48581cc03102b85f4aa17a0ab (diff) | |
download | gitlab-ce-9f69be38673c2d0f0e4c07c377195c3b310132bd.tar.gz |
Merge branch 'fix-markdown-code-mr-discussion' into 'master'
Fix markdown code highlighting in mr discussion
Closes #47521
See merge request gitlab-org/gitlab-ce!19564
-rw-r--r-- | app/assets/stylesheets/bootstrap_migration.scss | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index 79e59fb5263..8183664c352 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -107,7 +107,7 @@ code { background-color: $red-100; border-radius: 3px; - .code & { + .code > & { background-color: inherit; padding: unset; } |