deblan/journalduhacker
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

cancel link is now a button, js formatting consistency, removed extra styling

Browse source
This commit is contained in:
Jordan Scales 2012-09-02 12:51:32 -04:00
parent 56e061db72
commit d410f4f424
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/application.js.erb
View file

@ -217,8 +217,7 @@ $(document).ready(function() {
box.html($("#comment_form").clone()); box.html($("#comment_form").clone());
box.find("ol").remove(); box.find("ol").remove();
console.log(box.find('button.comment-preview')); box.find("button.comment-preview").after("&nbsp;\n&nbsp;<button class=\"comment-cancel\" name=\"button\" type=\"button\">Cancel</button>");
box.find('button.comment-preview').after('<a class="comment-cancel" href="#">Cancel</a>');
box.find("textarea").focus(); box.find("textarea").focus();
@ -231,8 +230,8 @@ $(document).ready(function() {
return false; return false;
}); });
$("a.comment-cancel").live("click", function() { $("button.comment-cancel").live("click", function() {
$(this).parents('div.comment_reply form').remove(); $(this).parents("div.comment_reply form").remove();
}); });
$("a.comment_editor").live("click", function() { $("a.comment_editor").live("click", function() {

7
app/assets/stylesheets/application.css
View file

@ -553,15 +553,10 @@ div.comment_reply form {
padding-top: 1em; padding-top: 1em;
} }
div.comment_reply a.comment-cancel { div.comment_reply button.comment-cancel {
margin-left: 15px;
color: #AC130D; color: #AC130D;
} }
div.comment_reply a.comment-cancel:hover {
color: #DD4B3C;
}
a.pagelink { a.pagelink {
border: 1px solid #ddd; border: 1px solid #ddd;
background-color: #fbfbfb; background-color: #fbfbfb;