Commit 3d045b6b authored by Sam Beckham's avatar Sam Beckham

Adds changes from @jareko review

- Made the dropdown menu toggle styles more specific
- Fixed the styling on the award emojis
parent 69c4c727
...@@ -446,7 +446,7 @@ export class AwardsHandler { ...@@ -446,7 +446,7 @@ export class AwardsHandler {
createAwardButtonForVotesBlock(votesBlock, emojiName) { createAwardButtonForVotesBlock(votesBlock, emojiName) {
const buttonHtml = ` const buttonHtml = `
<button class="btn award-control js-emoji-btn has-tooltip active" title="You"> <button class="gl-button btn btn-default award-control js-emoji-btn has-tooltip active" title="You">
${this.emoji.glEmojiTag(emojiName)} ${this.emoji.glEmojiTag(emojiName)}
<span class="award-control-text js-counter">1</span> <span class="award-control-text js-counter">1</span>
</button> </button>
......
...@@ -208,9 +208,8 @@ ...@@ -208,9 +208,8 @@
gl-emoji, gl-emoji,
.award-control-icon { .award-control-icon {
vertical-align: middle; vertical-align: middle;
margin-right: 0.15em; font-size: 1.4em;
font-size: 1.5em; line-height: 0.5em;
line-height: 1;
} }
.award-control-icon-loading { .award-control-icon-loading {
...@@ -219,11 +218,8 @@ ...@@ -219,11 +218,8 @@
.award-control-icon { .award-control-icon {
color: $border-gray-normal; color: $border-gray-normal;
margin-top: 1px;
padding: 0 2px;
svg { svg {
margin-bottom: 3px;
height: $default-icon-size; height: $default-icon-size;
width: $default-icon-size; width: $default-icon-size;
border-radius: 50%; border-radius: 50%;
......
...@@ -133,7 +133,8 @@ ...@@ -133,7 +133,8 @@
} }
} }
.dropdown-menu-toggle { // This is double classed to solve a specificity issue with the gitlab ui buttons
.dropdown-menu-toggle.dropdown-menu-toggle {
@extend .dropdown-toggle; @extend .dropdown-toggle;
justify-content: flex-start; justify-content: flex-start;
overflow: hidden; overflow: hidden;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment