Skip to content

Commit 6ed8ba6

Browse files
committed
Minor CSS cleaning
- Legacy-Id: 2070
1 parent 2092927 commit 6ed8ba6

3 files changed

Lines changed: 10 additions & 9 deletions

File tree

ietf/idrfc/templatetags/ballot_icon.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,13 @@ def state_age_colored(doc):
186186
goal1 = 14
187187
goal2 = 28
188188
if days > goal2:
189-
style = 'padding:0 2px;background:#ffa0a0;'
189+
class_name = "ietf-small ietf-highlight-r"
190190
elif days > goal1:
191-
style = 'padding:0 2px;background:yellow;'
191+
class_name = "ietf-small ietf-highlight-y"
192192
else:
193-
style = ''
194-
if style:
193+
class_name = "ietf-small"
194+
if days > goal1:
195195
title = ' title="Goal is <%d days"' % (goal1,)
196196
else:
197197
title = ''
198-
return '<span style="font-size:85%%;%s"%s>(for&nbsp;%d&nbsp;day%s)</span>' % (style,title,days,('','s')[days != 1])
198+
return '<span class="%s"%s>(for&nbsp;%d&nbsp;day%s)</span>' % (class_name,title,days,('','s')[days != 1])

ietf/templates/idrfc/search_result_row.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
{% else %}<a href="/doc/{{doc.id.draft_name}}/">{{doc.id.draft_name_and_revision}}</a>{% endif %}</td>
4242
<td class="title">{{ doc.title|escape }}</td>
4343
<td class="date">{% if not doc.rfc %}{{ doc.publication_date }}{% else %}{{ doc.publication_date|date:"Y-m" }}{% endif %}
44-
{% if doc.publication_date|timesince_days|less_than:"14" %}<br/><span style="padding:0 2px;background:yellow;font-size:85%;">{% if not doc.rfc%}<a href="http://tools.ietf.org/rfcdiff?url2={{doc.id.draft_name_and_revision}}">new</a>{%else%}new{%endif%}</span>{%endif%}
45-
{% if doc.id and doc.id.expected_expiration_date and doc.id.expected_expiration_date|timesince_days|greater_than:"-14" %}<br/><span style="padding:0 2px;font-size:85%;background:yellow;">expires soon</span>{%endif%}
44+
{% if doc.publication_date|timesince_days|less_than:"14" %}<br/><span class="ietf-small ietf-highlight-y">{% if not doc.rfc%}<a href="http://tools.ietf.org/rfcdiff?url2={{doc.id.draft_name_and_revision}}">new</a>{%else%}new{%endif%}</span>{%endif%}
45+
{% if doc.id and doc.id.expected_expiration_date and doc.id.expected_expiration_date|timesince_days|greater_than:"-14" %}<br/><span class="ietf-small ietf-highlight-y">expires soon</span>{%endif%}
4646
</td>
4747

4848
<td class="status">{{ doc.friendly_state|safe }}

static/css/base2.css

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ td.ballot_icon_gray { background: #c0c0c0; }
113113
td.ballot_icon_yellow { background: #ffff00; }
114114
table.ballot_icon td.ballot_icon_my { border: 3px outset black;}
115115

116-
.ietf-highlight-y { padding:0 2px;background:yellow;font-size:85%;}
117-
.ietf-highlight-r { padding:0 2px;background:#ffa0a0;font-size:85%;}
116+
.ietf-small { font-size:85%; }
117+
.ietf-highlight-y { padding:0 2px;background:yellow;}
118+
.ietf-highlight-r { padding:0 2px;background:#ffa0a0;}
118119
.ietf-divider { background: #2647a0; color: white; font-size:116%; padding:0.5em 1em; }

0 commit comments

Comments
 (0)