diff options
author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-05 01:43:31 +0000 |
---|---|---|
committer | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-05 01:43:31 +0000 |
commit | 6db04d49dd3033e93b14c10f20d75205274deec4 (patch) | |
tree | e2ea5ba0425b0b3bf892488d3cb582269abcfe52 | |
parent | ca13e1596852201801ed91240f47f7aa53a25938 (diff) | |
parent | 7a7fdbdc1fe008b3ae368d9f9bdd0d294205b738 (diff) | |
download | gitlab-ce-6db04d49dd3033e93b14c10f20d75205274deec4.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.scss | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index e24f8b1d4e8..5cf3bb4ae09 100644 --- a/app/assets/stylesheets/bootstrap_migration.scss +++ b/app/assets/stylesheets/bootstrap_migration.scss @@ -61,8 +61,18 @@ a { code { padding: 2px 4px; + color: $red-600; background-color: $red-100; border-radius: 3px; + + .code & { + background-color: inherit; + padding: unset; + } +} + +.code { + padding: 9.5px; } table { |