From 5aa991bb5ba388e8d3007afdf324e0417841c7e4 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Tue, 22 Jan 2013 13:04:17 -0300 Subject: small fixes in the user inbox --- askbot/media/style/style.less | 9 +++--- askbot/templates/macros.html | 33 +++++++++++++--------- .../templates/user_inbox/responses_and_flags.html | 4 +-- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/askbot/media/style/style.less b/askbot/media/style/style.less index c2e20577..0411d4e3 100644 --- a/askbot/media/style/style.less +++ b/askbot/media/style/style.less @@ -3780,6 +3780,10 @@ p.signup_p { clear:both; line-height:18px; margin-bottom:15px; + h2 { + margin: 0; + padding: 0; + } } #responses div.face { @@ -3791,7 +3795,7 @@ p.signup_p { } .response-parent { - margin-top: 18px; + margin-top: 8px; } .response-parent strong{ @@ -3807,9 +3811,6 @@ p.signup_p { #responses input { float:left; } -#re_tools { - margin-bottom:10px; -} #re_sections { margin-bottom:6px; } diff --git a/askbot/templates/macros.html b/askbot/templates/macros.html index fefdb3d8..f94fc12d 100644 --- a/askbot/templates/macros.html +++ b/askbot/templates/macros.html @@ -12,20 +12,25 @@
{{ gravatar(response.user, 48) }}
- {{ response.user.username|escape }} - - {{ response.response_type }} - ({{ timeago(response.timestamp) }}):
- {% if inbox_section != 'flags' %} - {{ response.response_snippet }} - {% endif %} -
- {% if inbox_section == 'flags' %} - - -
{{ response.response_content }}
-
- {% endif %} +
+ {{ response.user.username|escape }} + + {{ response.response_type }} + ({{ timeago(response.timestamp) }}):
+ {% if inbox_section != 'flags' %} + {{ response.response_snippet }} + {% endif %} +
+ {% if inbox_section == 'flags' %} + + +
{{ response.response_content }}
+
+ {% endif %} +
{%- endmacro -%} diff --git a/askbot/templates/user_inbox/responses_and_flags.html b/askbot/templates/user_inbox/responses_and_flags.html index c889bb0a..16599c1d 100644 --- a/askbot/templates/user_inbox/responses_and_flags.html +++ b/askbot/templates/user_inbox/responses_and_flags.html @@ -28,9 +28,7 @@
{% for response in responses %}
-

- "{{ response.response_title.strip()|escape}}" -

+

"{{ response.response_title.strip()|escape}}"

{{ macros.inbox_post_snippet(response, inbox_section) }} {% for nested_response in response.nested_responses %} {{ macros.inbox_post_snippet(nested_response, inbox_section) }} -- cgit v1.2.3-1-g7c22