summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-07-12 18:20:46 +0000
committerAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-07-12 18:20:46 +0000
commit222d0019e4c23bbc43114f893891611acf028651 (patch)
tree34c8408dad7cddbbb9f07a0fcb3d6efa31bbb7af
parent04954448b093a2bd6bdca454a78dfaed15fa4d8b (diff)
parentc6ff3d3c918d37dd620ee05d512b3cffeb6b0587 (diff)
downloadgitlab-ce-222d0019e4c23bbc43114f893891611acf028651.tar.gz
Merge branch 'button-bug-fixes' into 'master'
Fix Project Badge Buttons See merge request gitlab-org/gitlab-ce!30678
-rw-r--r--app/assets/stylesheets/pages/projects.scss2
-rw-r--r--changelogs/unreleased/button-bug-fixes.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 73ba09dbba5..09a576c11cb 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 $border-color;
+ border: 1px solid $gray-400;
line-height: 1;
}
diff --git a/changelogs/unreleased/button-bug-fixes.yml b/changelogs/unreleased/button-bug-fixes.yml
new file mode 100644
index 00000000000..b63bfdf24ad
--- /dev/null
+++ b/changelogs/unreleased/button-bug-fixes.yml
@@ -0,0 +1,5 @@
+---
+title: Fix Project Badge Button Styles
+merge_request: 30678
+author:
+type: fixed