From 06a4fd1035c58d89251fb979dafa8610ba8c5157 Mon Sep 17 00:00:00 2001
From: Valery Sizov <vsv2711@gmail.com>
Date: Tue, 17 Nov 2015 13:16:16 +0200
Subject: [PATCH] css improvements
---
app/assets/javascripts/awards_handler.coffee | 2 +-
app/assets/stylesheets/pages/issuable.scss | 20 +++++++++++++++-----
app/finders/notes_finder.rb | 4 ++--
app/views/votes/_votes_block.html.haml | 2 +-
4 files changed, 19 insertions(+), 9 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{
diff --git a/app/finders/notes_finder.rb b/app/finders/notes_finder.rb
index ab252821b52..fa4c635f55c 100644
--- a/app/finders/notes_finder.rb
+++ b/app/finders/notes_finder.rb
@@ -12,9 +12,9 @@ class NotesFinder
when "commit"
project.notes.for_commit_id(target_id).not_inline
when "issue"
- project.issues.find(target_id).notes.inc_author
+ project.issues.find(target_id).notes.nonawards.inc_author
when "merge_request"
- project.merge_requests.find(target_id).mr_and_commit_notes.inc_author
+ project.merge_requests.find(target_id).mr_and_commit_notes.nonawards.inc_author
when "snippet", "project_snippet"
project.snippets.find(target_id).notes
else
diff --git a/app/views/votes/_votes_block.html.haml b/app/views/votes/_votes_block.html.haml
index 3c3ae9dd0b2..7f988160ad9 100644
--- a/app/views/votes/_votes_block.html.haml
+++ b/app/views/votes/_votes_block.html.haml
@@ -6,7 +6,7 @@
.counter
= vote.last.count
- %button.dropdown
+ .dropdown.awards-controls
%a#add-award{"data-toggle" => "dropdown", "data-target" => "#", "href" => "#"} +
%ul.dropdown-menu.awards-menu
- ["100", "blush", "heart", "smile", "rage", "beers", "thumbsup", "disappointed", "ok_hand", "helicopter"].each do |emoji|
--
GitLab