Commit b6fea5cb3642d16bda56e91459594a9ce25fd04b
1 parent
c34fa37b
Exists in
master
and in
39 other branches
Fixing up small space issues
Showing
2 changed files
with
3 additions
and
29 deletions
Show diff stats
src/colab/static/css/screen.css
src/super_archives/templates/message-thread.html
@@ -109,32 +109,9 @@ | @@ -109,32 +109,9 @@ | ||
109 | <div class="col-lg-10 col-md-10 col-sm-12"> | 109 | <div class="col-lg-10 col-md-10 col-sm-12"> |
110 | <ul class="unstyled-list"> | 110 | <ul class="unstyled-list"> |
111 | {% for email in emails %} | 111 | {% for email in emails %} |
112 | - {% with email.from_address.get_absolute_url as profile_link %} | 112 | + {% with email.from_address.user.get_absolute_url as profile_link %} |
113 | <li> | 113 | <li> |
114 | - <!-- | ||
115 | - <div class="col-lg-2 col-md-3 hidden-sm hidden-xm text-center"> | ||
116 | - {% if profile_link %} | ||
117 | - <a href="{{ profile_link }}"> | ||
118 | - {% endif %} | ||
119 | - <div>{% gravatar email.from_address 80 %}</div> | ||
120 | - <span>{{ email.from_address.get_full_name_or_anonymous }}</span> | ||
121 | - {% if profile_link %} | ||
122 | - </a> | ||
123 | - {% endif %} | ||
124 | - | ||
125 | - <p>{{ email.received_time|date:"SHORT_DATETIME_FORMAT" }}</p> | ||
126 | - | ||
127 | - <div class="plus"> | ||
128 | - <span>{{ email.votes_count }}</span> | ||
129 | - <img title="{% trans 'Vote' %}" class="pull-right" src="{{ STATIC_URL }}img/plus.png"> | ||
130 | - </div> | ||
131 | - | ||
132 | - <p class="{% if not user in email.vote_list %}hide{% endif %}"> | ||
133 | - <a href="#">{% trans "Remove votes" %}</a> | ||
134 | - </p> | ||
135 | - </div> | ||
136 | - --> | ||
137 | - | 114 | + {% spaceless %} |
138 | <div class="email-message" id="msg-{{ email.id }}"> | 115 | <div class="email-message" id="msg-{{ email.id }}"> |
139 | <div class="panel panel-default"> | 116 | <div class="panel panel-default"> |
140 | <div class="panel-heading clearfix"> | 117 | <div class="panel-heading clearfix"> |
@@ -176,6 +153,7 @@ | @@ -176,6 +153,7 @@ | ||
176 | </div> | 153 | </div> |
177 | </div> | 154 | </div> |
178 | </div> | 155 | </div> |
156 | + {% endspaceless %} | ||
179 | </li> | 157 | </li> |
180 | {% endwith %} | 158 | {% endwith %} |
181 | {% endfor %} | 159 | {% endfor %} |