diff options
author | Clement Ho <ClemMakesApps@gmail.com> | 2018-06-18 15:12:07 -0500 |
---|---|---|
committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-06-18 15:12:07 -0500 |
commit | b4882941f43d3086a7ad0216703275c3b942a584 (patch) | |
tree | aa03839ba072855b0a633fdf67f8583c557408cc | |
parent | d527c8822dc835c8168ca397157b9dcc48e15a38 (diff) | |
download | gitlab-ce-48072-bs4-labels-in-issues-system-notes-are-misaligned-again.tar.gz |
-rw-r--r-- | app/assets/stylesheets/bootstrap_migration.scss | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/app/assets/stylesheets/bootstrap_migration.scss b/app/assets/stylesheets/bootstrap_migration.scss index e4db11d51f3..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; @@ -191,10 +194,6 @@ table { } } -.label { - @extend .badge; -} - .divider { @extend .dropdown-divider; } |