diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-18 21:29:43 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-06-18 16:56:39 -0500 |
| commit | 97441204546ca50b25a3f4a682bac3eff0231ba0 (patch) | |
| tree | c3ba0be0c0c0ac8fe4ac12fba32f0303814f403d | |
| parent | 4447389cc02bd1e43467c388bce66ceda1db6f2e (diff) | |
| download | gitlab-ce-97441204546ca50b25a3f4a682bac3eff0231ba0.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.scss | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index d92b6f9fe09..0c0d25693fb 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; |