diff options
| author | Paul Slaughter <pslaughter@gitlab.com> | 2019-07-16 23:25:11 +0000 |
|---|---|---|
| committer | Paul Slaughter <pslaughter@gitlab.com> | 2019-07-16 23:25:11 +0000 |
| commit | b55fc93be0d244f10960d04c7143adeb148fb4f4 (patch) | |
| tree | 4da4142bd055d0da4d7fe437ff47d48d644cff9b | |
| parent | f0400dc7c01ab53cdc286d639b50e1ce98a9beaf (diff) | |
| parent | 9d5ce415cc1f541e810c1b3961bd1a01d25a4f68 (diff) | |
| download | gitlab-ce-b55fc93be0d244f10960d04c7143adeb148fb4f4.tar.gz | |
Merge branch 'revert-222d0019' into 'master'
Revert "Merge branch 'button-bug-fixes' into 'master'"
See merge request gitlab-org/gitlab-ce!30821
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/button-bug-fixes.yml | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index e453f4a2264..c80beceae52 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -303,7 +303,7 @@ .count-badge-count, .count-badge-button { - border: 1px solid $gray-400; + border: 1px solid $border-color; line-height: 1; } diff --git a/changelogs/unreleased/button-bug-fixes.yml b/changelogs/unreleased/button-bug-fixes.yml deleted file mode 100644 index b63bfdf24ad..00000000000 --- a/changelogs/unreleased/button-bug-fixes.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix Project Badge Button Styles -merge_request: 30678 -author: -type: fixed |