summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-07-16 21:49:04 +0000
committerAnnabel Dunstone Gray <annabel.m.gray@gmail.com>2019-07-16 21:49:04 +0000
commit9d5ce415cc1f541e810c1b3961bd1a01d25a4f68 (patch)
tree018a451a07b1e6fbd54bc5270de5afb8d62a8e47
parent1cb21ec289a223fe30d2d8977f4dd0238b24c6da (diff)
downloadgitlab-ce-revert-222d0019.tar.gz
Revert "Merge branch 'button-bug-fixes' into 'master'"revert-222d0019
This reverts merge request !30678
-rw-r--r--app/assets/stylesheets/pages/projects.scss2
-rw-r--r--changelogs/unreleased/button-bug-fixes.yml5
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