diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-11-17 13:16:16 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-11-19 01:25:59 +0200 |
| commit | 06a4fd1035c58d89251fb979dafa8610ba8c5157 (patch) | |
| tree | 27b80cbb10133be0aed1dd2d236504f72f93ffae /app/assets | |
| parent | fd2c0fe446c7f761b845c91307ef8110d869e8e8 (diff) | |
| download | gitlab-ce-06a4fd1035c58d89251fb979dafa8610ba8c5157.tar.gz | |
css improvements
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/awards_handler.coffee | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 20 |
2 files changed, 16 insertions, 6 deletions
diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee index aab3179f10e..1ede7c317c8 100644 --- a/app/assets/javascripts/awards_handler.coffee +++ b/app/assets/javascripts/awards_handler.coffee @@ -39,7 +39,7 @@ class @AwardsHandler nodes.push("<div class='counter'>1") nodes.push("</div></div>") - $(".awards").append(nodes.join("\n")) + $(".awards-controls").before(nodes.join("\n")) getImage: (emoji) -> $("li." + emoji).html() diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index efeb2393165..3f79d0d4967 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -128,12 +128,22 @@ } } - #add-award { - font-size: 20px; - border-radius: 5px; + .awards-controls { + height: 25px; + width: 28px; float: left; - width: 50px; - font-weight: bold; + padding: 0 0 5px 5px; + line-height: 1; + + #add-award { + font-size: 27px; + &:hover { + text-decoration: none; + } + &:link { + text-decoration: none; + } + } } .awards-menu{ |