From c1a50aae048825528aa12d22f06992816b2d8e0b Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Fri, 15 Feb 2013 01:45:37 -0800
Subject: [PATCH] add more delete button styles on delete.. buttons
---
app/assets/javascripts/admin/templates/user.js.handlebars | 2 +-
.../javascripts/discourse/views/post_menu_view.js.coffee | 4 ++--
app/assets/stylesheets/application/topic-post.css.scss | 5 +++++
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/app/assets/javascripts/admin/templates/user.js.handlebars b/app/assets/javascripts/admin/templates/user.js.handlebars
index ddfbfec07ef..074e3fd7216 100644
--- a/app/assets/javascripts/admin/templates/user.js.handlebars
+++ b/app/assets/javascripts/admin/templates/user.js.handlebars
@@ -156,7 +156,7 @@
<div class='value'>{{content.post_count}}</div>
<div class='controls'>
{{#if content.can_delete_all_posts}}
- <button class='btn' {{action deleteAllPosts target="content"}}>
+ <button class='btn btn-danger' {{action deleteAllPosts target="content"}}>
<i class='icon icon-trash'></i>
{{i18n admin.user.delete_all_posts}}
</button>
diff --git a/app/assets/javascripts/discourse/views/post_menu_view.js.coffee b/app/assets/javascripts/discourse/views/post_menu_view.js.coffee
index bf884bbcfea..4e63da3a217 100644
--- a/app/assets/javascripts/discourse/views/post_menu_view.js.coffee
+++ b/app/assets/javascripts/discourse/views/post_menu_view.js.coffee
@@ -54,9 +54,9 @@ window.Discourse.PostMenuView = Ember.View.extend Discourse.Presence,
# Show the correct button
if post.get('deleted_at')
if post.get('can_recover')
- buffer.push("<button title=\"#{Em.String.i18n("post.controls.undelete")}\" data-action=\"recover\"><i class=\"icon-undo\"></i></button>")
+ buffer.push("<button title=\"#{Em.String.i18n("post.controls.undelete")}\" data-action=\"recover\" class=\"delete\"><i class=\"icon-undo\"></i></button>")
else if post.get('can_delete')
- buffer.push("<button title=\"#{Em.String.i18n("post.controls.delete")}\" data-action=\"delete\"><i class=\"icon-trash\"></i></button>")
+ buffer.push("<button title=\"#{Em.String.i18n("post.controls.delete")}\" data-action=\"delete\" class=\"delete\"><i class=\"icon-trash\"></i></button>")
clickDeleteTopic: -> @get('controller').deleteTopic()
clickRecover: -> @get('controller').recoverPost(@get('post'))
diff --git a/app/assets/stylesheets/application/topic-post.css.scss b/app/assets/stylesheets/application/topic-post.css.scss
index 6381dbad9dd..e6a2239c2ab 100644
--- a/app/assets/stylesheets/application/topic-post.css.scss
+++ b/app/assets/stylesheets/application/topic-post.css.scss
@@ -279,7 +279,12 @@
}
}
button.delete {
+ &:hover {
+ color: white;
+ background-color: $btn-danger-background-color;
+ }
}
+
button.like {
&:hover {
color: $nav-like-button-color-hover;