diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-01-22 13:04:17 -0300 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-01-22 13:04:17 -0300 |
| commit | 5aa991bb5ba388e8d3007afdf324e0417841c7e4 (patch) | |
| tree | cbb5039df6e45d65b1beae22e8cd27a59d5c78a4 | |
| parent | 14776f49a3d960096a0d43e7de269439f6aa157a (diff) | |
| download | askbot-5aa991bb5ba388e8d3007afdf324e0417841c7e4.tar.gz askbot-5aa991bb5ba388e8d3007afdf324e0417841c7e4.tar.bz2 askbot-5aa991bb5ba388e8d3007afdf324e0417841c7e4.zip | |
small fixes in the user inbox
| -rw-r--r-- | askbot/media/style/style.less | 9 | ||||
| -rw-r--r-- | askbot/templates/macros.html | 33 | ||||
| -rw-r--r-- | askbot/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 @@ <div class="face"> {{ gravatar(response.user, 48) }} </div> - <a style="font-size:12px" href="{{ response.user.get_absolute_url() }}">{{ response.user.username|escape }}</a> - <a style="text-decoration:none;" href="{{ response.response_url }}"> - {{ response.response_type }} - ({{ timeago(response.timestamp) }}):<br/> - {% if inbox_section != 'flags' %} - {{ response.response_snippet }} - {% endif %} - </a> - {% if inbox_section == 'flags' %} - <a class="re_expand" href="{{ response.response_url }}"> - <!--div class="re_snippet">{{ response.response_snippet|escape }}</div--> - <div class="re_content">{{ response.response_content }}</div> - </a> - {% endif %} + <div class="content"> + <a + style="font-size:12px" + href="{{ response.user.get_absolute_url() }}" + >{{ response.user.username|escape }}</a> + <a style="text-decoration:none;" href="{{ response.response_url }}"> + {{ response.response_type }} + ({{ timeago(response.timestamp) }}):<br/> + {% if inbox_section != 'flags' %} + {{ response.response_snippet }} + {% endif %} + </a> + {% if inbox_section == 'flags' %} + <a class="re_expand" href="{{ response.response_url }}"> + <!--div class="re_snippet">{{ response.response_snippet|escape }}</div--> + <div class="re_content">{{ response.response_content }}</div> + </a> + {% endif %} + </div> </div> {%- 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 @@ <div id="responses"> {% for response in responses %} <div class="response-parent" data-response-id="{{response.id}}"> - <p class="headline"> - <strong>"{{ response.response_title.strip()|escape}}"</strong> - </p> + <h2>"{{ response.response_title.strip()|escape}}"</h2> {{ macros.inbox_post_snippet(response, inbox_section) }} {% for nested_response in response.nested_responses %} {{ macros.inbox_post_snippet(nested_response, inbox_section) }} |