summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Gray <annabel.m.gray@gmail.com>2018-06-18 21:29:43 +0000
committerAnnabel Gray <annabel.m.gray@gmail.com>2018-06-18 21:29:43 +0000
commit7491a20020e9ac95059b609972479ee4b42866e5 (patch)
treeaa03839ba072855b0a633fdf67f8583c557408cc
parentafa47b7c481210df659706930a9f43d53023ce5e (diff)
parent145288945df6db5f1ffb8abb1bb107796506b651 (diff)
downloadgitlab-ce-7491a20020e9ac95059b609972479ee4b42866e5.tar.gz
Merge branch '48072-bs4-labels-in-issues-system-notes-are-misaligned-again' into 'master'
Resolve "BS4: Labels in issues system notes are misaligned again" Closes #48072 See merge request gitlab-org/gitlab-ce!19972
-rw-r--r--app/assets/stylesheets/bootstrap_migration.scss5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss
index 6017e5554d8..0d8e867f41d 100644
--- a/app/assets/stylesheets/bootstrap_migration.scss
+++ b/app/assets/stylesheets/bootstrap_migration.scss
@@ -173,7 +173,10 @@ table {
display: none;
}
-.badge {
+// Add to .label so that old system notes that are saved to the db
+// will still receive the correct styling
+.badge,
+.label {
padding: 4px 5px;
font-size: 12px;
font-style: normal;