summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-06-01 17:02:59 +0000
committerAnnabel Gray <annabel.m.gray@gmail.com>2018-06-01 17:02:59 +0000
commit204688ee2ecc785cfc9f9ee6d86b77251da91efd (patch)
treee34e13ae8aa6123b8ad49682ba8e68c8bff012a5
parent1cb3b9b29cd7a3e086b204f06971ffd562cb6330 (diff)
downloadgitlab-ce-204688ee2ecc785cfc9f9ee6d86b77251da91efd.tar.gz
Resolve "Branch names in system notes have incorrect color"
-rw-r--r--app/assets/stylesheets/bootstrap_migration.scss6
-rw-r--r--app/assets/stylesheets/framework/typography.scss4
2 files changed, 6 insertions, 4 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss
index 877da371ce7..d8e57834f9e 100644
--- a/app/assets/stylesheets/bootstrap_migration.scss
+++ b/app/assets/stylesheets/bootstrap_migration.scss
@@ -53,6 +53,12 @@ a {
}
}
+code {
+ padding: 2px 4px;
+ background-color: $red-100;
+ border-radius: 3px;
+}
+
table {
// Remove any table border lines
border-spacing: 0;
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index ed0bfbbe08b..97b821e0cb9 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -340,10 +340,6 @@ code {
}
}
-a > code {
- color: $link-color;
-}
-
.monospace {
font-family: $monospace_font;
}