summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-07-26 18:17:01 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-07-26 18:17:01 +0000
commit20e63ba1567dc18878e48e59df95ff9c7729d071 (patch)
tree2c1bab3821047de9927205fcbceb8274ca9a7200
parent8e675082374eefdcb7ae6a004fcf2b16d3c68201 (diff)
parent42e16e0419122061a71455427a625c9d1864d230 (diff)
downloadgitlab-ce-20e63ba1567dc18878e48e59df95ff9c7729d071.tar.gz
Merge branch '48542-code-link' into 'master'
Resolve "BS4: Link in code brackets has two different styles" Closes #48542 See merge request gitlab-org/gitlab-ce!20841
-rw-r--r--app/assets/stylesheets/framework/typography.scss4
-rw-r--r--changelogs/unreleased/48542-code-link.yml5
2 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index 56307777a72..a2789021ab4 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -179,6 +179,10 @@
font-weight: inherit;
}
+ a > code {
+ color: $gl-link-color;
+ }
+
dd {
margin-left: $gl-padding;
}
diff --git a/changelogs/unreleased/48542-code-link.yml b/changelogs/unreleased/48542-code-link.yml
new file mode 100644
index 00000000000..8d8d9bf8d74
--- /dev/null
+++ b/changelogs/unreleased/48542-code-link.yml
@@ -0,0 +1,5 @@
+---
+title: Fix link color in markdown code brackets
+merge_request: 20841
+author:
+type: fixed