diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-08-30 19:09:32 -0300 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-08-30 19:09:32 -0300 |
| commit | afc6213cf40fa3bfda5cb19028d4e034d8af170a (patch) | |
| tree | 3526f2cd8dc6dd595a732d77f1f2f01d8cb91205 | |
| parent | 8800be0a7e5e55415b32d4c15dfb57ef8d255dc5 (diff) | |
| parent | 40d4c8b54b2ce4b0320b6ac781019cc55594be04 (diff) | |
| download | askbot-afc6213cf40fa3bfda5cb19028d4e034d8af170a.tar.gz askbot-afc6213cf40fa3bfda5cb19028d4e034d8af170a.tar.bz2 askbot-afc6213cf40fa3bfda5cb19028d4e034d8af170a.zip | |
Merge branch 'adolfo'
| -rw-r--r-- | askbot/skins/default/media/js/post.js | 4 | ||||
| -rw-r--r-- | askbot/skins/default/media/style/style.css | 21 | ||||
| -rw-r--r-- | askbot/skins/default/templates/macros.html | 2 |
3 files changed, 20 insertions, 7 deletions
diff --git a/askbot/skins/default/media/js/post.js b/askbot/skins/default/media/js/post.js index fa194e86..a70aca5f 100644 --- a/askbot/skins/default/media/js/post.js +++ b/askbot/skins/default/media/js/post.js @@ -1040,12 +1040,14 @@ EditCommentForm.prototype.createDom = function(){ this._textarea = $('<textarea></textarea>'); this._textarea.attr('id', this._id); + /* this._help_text = $('<span></span>').attr('class', 'help-text'); this._help_text.html(gettext('Markdown is allowed in the comments')); div.append(this._help_text); this._help_text = $('<div></div>').attr('class', 'clearfix'); div.append(this._help_text); + */ this._element.append(div); div.append(this._textarea); @@ -1270,7 +1272,7 @@ Comment.prototype.setContent = function(data){ this._comment_body = $('<div class="comment-body"></div>'); this._comment_body.html(this._data['html']); - this._comment_body.append(' – '); + //this._comment_body.append(' – '); this._user_link = $('<a></a>').attr('class', 'author'); this._user_link.attr('href', this._data['user_url']); diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css index 7627be5e..7d2c558f 100644 --- a/askbot/skins/default/media/style/style.css +++ b/askbot/skins/default/media/style/style.css @@ -1100,6 +1100,12 @@ div.comment .comment-body { color: #666; } +div.comment .comment-body p{ + font-size:inherit; + margin-bottom: 3px; + padding: 0; +} + div.comment .comment-delete { float: right; width: 14px; @@ -1147,13 +1153,15 @@ div.comment .upvote:hover { .comments textarea { display: block; - height: 48px; - width: 560px; - margin: 3px 0px; + height: 42px; + width: 572px; + margin: 6px 0 5px 1px; font-family: sans-serif; + outline: none; + overflow:auto; font-size: 12px; - line-height: 130%; - padding: 4px; + line-height: 140%; + padding-left:2px; } .comments input { @@ -1184,6 +1192,9 @@ div.comment .upvote:hover { float: right; text-align:right; color: gray; + margin-bottom: 0px; + margin-top: 0px; + line-height: 50%; } span.text-counter { diff --git a/askbot/skins/default/templates/macros.html b/askbot/skins/default/templates/macros.html index fa15426f..50e768ce 100644 --- a/askbot/skins/default/templates/macros.html +++ b/askbot/skins/default/templates/macros.html @@ -494,7 +494,7 @@ for the purposes of the AJAX comment editor #} {% endif %} </div> <div class="comment-body"> - {{comment.html}} – + {{comment.html}} <a class="author" href="{{comment.user.get_profile_url()}}" |