summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-06-10 15:38:52 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-06-10 15:38:52 +0000
commit0adc6d1bc06daa881213a39fa4f1ae645c0e3b32 (patch)
tree589000adb38bade7693594b43d399086b61f4177
parentc7eecb4a203cac4994cfa700a630c569ee3398eb (diff)
parente0a90c467c4ffaf6fec03ad54afa5f18b71a6aa3 (diff)
downloadgitlab-ce-0adc6d1bc06daa881213a39fa4f1ae645c0e3b32.tar.gz
Merge branch 'prettier-awardable-button-active' into 'master'
Made the awardable buttons prettier when active ## What does this MR do? Made the active and hover state of the award emoji buttons prettier. ## Why was this MR needed? 'cause @JobV wanted them to look nicer :wink: ## What are the relevant issue numbers? Closes #18379 ## Screenshots (if relevant) ![Screen_Shot_2016-06-09_at_09.10.44](/uploads/5ecd0f12679e3484de1ab1d2dbe50cd8/Screen_Shot_2016-06-09_at_09.10.44.png) See merge request !4554
-rw-r--r--app/assets/stylesheets/pages/awards.scss10
1 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/stylesheets/pages/awards.scss b/app/assets/stylesheets/pages/awards.scss
index 05d1ee5b998..6211f3a52eb 100644
--- a/app/assets/stylesheets/pages/awards.scss
+++ b/app/assets/stylesheets/pages/awards.scss
@@ -101,13 +101,21 @@
line-height: 20px;
outline: 0;
+ &:hover,
&.active,
&:active {
- background-color: $white-dark;
+ background-color: $row-hover;
+ border-color: $row-hover-border;
box-shadow: none;
outline: 0;
}
+ &.btn {
+ &:focus {
+ outline: 0;
+ }
+ }
+
&.is-loading {
.award-control-icon-normal,
.emoji-icon {