diff options
4 files changed, 8 insertions, 5 deletions
diff --git a/askbot/skins/common/templates/question/answer_controls.html b/askbot/skins/common/templates/question/answer_controls.html index 0dddc72d..9ae6e8dd 100644 --- a/askbot/skins/common/templates/question/answer_controls.html +++ b/askbot/skins/common/templates/question/answer_controls.html @@ -12,10 +12,11 @@ {% if request.user|can_flag_offensive(answer) %}{{ pipe() }} <span id="answer-offensive-flag-{{ answer.id }}" class="offensive-flag" title="{% trans %}report as offensive (i.e containing spam, advertising, malicious text, etc.){% endtrans %}"> - <a class="question-flag">{% trans %}flag offensive{% endtrans %}</a> + <a class="question-flag">{% trans %}flag offensive{% endtrans %} {% if request.user|can_see_offensive_flags(answer) %} <span class="darkred">{% if answer.offensive_flag_count > 0 %}({{ answer.offensive_flag_count }}){% endif %}</span> {% endif %} + </a> </span> {% elif request.user|can_remove_flag_offensive(answer)%}{{ pipe() }} <span id="answer-offensive-flag-remove-{{ answer.id }}" class="offensive-flag" diff --git a/askbot/skins/common/templates/question/question_controls.html b/askbot/skins/common/templates/question/question_controls.html index ea112aa6..ab41f769 100644 --- a/askbot/skins/common/templates/question/question_controls.html +++ b/askbot/skins/common/templates/question/question_controls.html @@ -20,10 +20,11 @@ {% if request.user|can_flag_offensive(question) %}{{ pipe() }} <span id="question-offensive-flag-{{ question.id }}" class="offensive-flag" title="{% trans %}report as offensive (i.e containing spam, advertising, malicious text, etc.){% endtrans %}"> - <a class="question-flag">{% trans %}flag offensive{% endtrans %}</a> + <a class="question-flag">{% trans %}flag offensive{% endtrans %} {% if request.user|can_see_offensive_flags(question) %} <span class="darkred">{% if question.offensive_flag_count > 0 %}({{ question.offensive_flag_count }}){% endif %}</span> {% endif %} + </a> </span> {% elif request.user|can_remove_flag_offensive(question)%}{{ pipe() }} <span id="question-offensive-flag-remove-{{ question.id }}" class="offensive-flag" diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css index 491469d3..71653444 100644 --- a/askbot/skins/default/media/style/style.css +++ b/askbot/skins/default/media/style/style.css @@ -234,7 +234,7 @@ span.delete-icon:hover{background:url(../images/close-small-dark.png) top no-rep .question-page .post-update-info .gravatar{float:left;margin-right:4px;} .question-page .post-update-info p.tip{color:#444;line-height:13px;font-size:10px;} .question-page .post-controls{font-size:11px;line-height:12px;min-width:200px;padding-left:5px;text-align:right;clear:left;float:right;margin-top:10px;}.question-page .post-controls a{color:#777;padding:0px 3px 3px 22px;cursor:pointer;border:none;font-size:12px;font-family:Arial;text-decoration:none;height:18px;display:block;float:right;line-height:18px;margin-top:-2px;margin-left:4px;} -.question-page .post-controls a:hover{background-color:#f5f0c9;} +.question-page .post-controls a:hover{background-color:#f5f0c9;border-radius:3px;-ms-border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px;-khtml-border-radius:3px;} .question-page .post-controls .sep{color:#ccc;float:right;height:18px;font-size:18px;} .question-page .post-controls .question-delete,.question-page .answer-controls .question-delete{background:url(../images/delete.png) no-repeat center left;padding-left:16px;} .question-page .post-controls .question-flag,.question-page .answer-controls .question-flag{background:url(../images/flag.png) no-repeat center left;} diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less index 49b1de4c..1a83c754 100644 --- a/askbot/skins/default/media/style/style.less +++ b/askbot/skins/default/media/style/style.less @@ -384,7 +384,7 @@ body.user-messages { height:42px; margin:6px 0px 0px 15px; - .searchInput, .searchInputCancelable { + .searchInput, .searchInputCancelable{ font-size: 30px; height: 40px; font-weight:300; @@ -396,7 +396,7 @@ body.user-messages { vertical-align: middle; } - .searchInput { + .searchInput,{ width: 352px; } @@ -1625,6 +1625,7 @@ span.delete-icon:hover { a:hover { background-color: #f5f0c9; + .rounded-corners(3px); } .sep { |