Merge branch 'master' of github.com:gitlabhq/gitlabhq

Dmitriy Zaporozhets
2 parents a4993f16 945702a3
Showing 3 changed files with 13 additions and 4 deletions Show diff stats
app/assets/stylesheets/common.scss
app/views/issues/show.html.haml
app/views/merge_requests/show.html.haml
@@ -926,3 +926,12 @@ p.time {
   font-style: italic;
   color: #999;
 }
+
+.upvotes {
+  font-size: 14px;
+  font-weight: bold;
+  color: #468847;
+  text-align: right;
+  padding: 4px;
+  margin: 2px;
+}
@@ -14,9 +14,9 @@
       = link_to edit_project_issue_path(@project, @issue), :class => "btn" do 
         Edit
+    %br
     - if @issue.upvotes > 0
-      = link_to "#notes", :class => "btn success" do
-        +#{@issue.upvotes}
+      .upvotes#upvotes= "+#{pluralize @issue.upvotes, 'upvote'}"
 .back_link
@@ -16,9 +16,9 @@
         = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn" do 
           Edit
+    %br
     - if @merge_request.upvotes > 0
-      = link_to "#notes", :class => "btn success" do
-        +#{@merge_request.upvotes}
+      .upvotes#upvotes= "+#{pluralize @merge_request.upvotes, 'upvote'}"
 .back_link
   = link_to project_merge_requests_path(@project) do
	@@ -926,3 +926,12 @@ p.time {		@@ -926,3 +926,12 @@ p.time {
926	font-style: italic;	926	font-style: italic;
927	color: #999;	927	color: #999;
928	}	928	}
		929	+
		930	+.upvotes {
		931	+ font-size: 14px;
		932	+ font-weight: bold;
		933	+ color: #468847;
		934	+ text-align: right;
		935	+ padding: 4px;
		936	+ margin: 2px;
		937	+}