Skip to content

Commit 3a47871

Browse files
larseggertlarseggert
authored
fix: More dark mode fixes (ietf-tools#6001)
* fix: More small dark mode fixes * "badge rounded-pill bg-" -> "badge rounded-pill text-bg-" This sets the text color correctly for more readable badges. * Same for cards * Fix tests
1 parent 05644a1 commit 3a47871

60 files changed

Lines changed: 146 additions & 146 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎ietf/doc/templatetags/ballot_icon.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,9 @@ def state_age_colored(doc):
212212
goal1 = 14
213213
goal2 = 28
214214
if days > goal2:
215-
class_name = "bg-danger"
215+
class_name = "text-bg-danger"
216216
elif days > goal1:
217-
class_name = "bg-warning"
217+
class_name = "text-bg-warning"
218218
else:
219219
# don't show a badge when things are in the green; clutters display
220220
# class_name = "text-success"
@@ -247,6 +247,6 @@ def auth48_alert_badge(doc):
247247

248248
rfced_state = doc.get_state_slug('draft-rfceditor')
249249
if rfced_state == 'auth48':
250-
return mark_safe('<span class="badge rounded-pill bg-info" title="AUTH48">AUTH48</span>')
250+
return mark_safe('<span class="badge rounded-pill text-bg-info" title="AUTH48">AUTH48</span>')
251251

252252
return ''

‎ietf/doc/templatetags/ietf_filters.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -704,18 +704,18 @@ def action_holder_badge(action_holder):
704704
''
705705
706706
>>> action_holder_badge(DocumentActionHolderFactory(time_added=timezone.now() - datetime.timedelta(days=16)))
707-
'<span class="badge rounded-pill bg-danger" title="In state for 16 days; goal is &lt;15 days."><i class="bi bi-clock-fill"></i> 16</span>'
707+
'<span class="badge rounded-pill text-bg-danger" title="In state for 16 days; goal is &lt;15 days."><i class="bi bi-clock-fill"></i> 16</span>'
708708
709709
>>> action_holder_badge(DocumentActionHolderFactory(time_added=timezone.now() - datetime.timedelta(days=30)))
710-
'<span class="badge rounded-pill bg-danger" title="In state for 30 days; goal is &lt;15 days."><i class="bi bi-clock-fill"></i> 30</span>'
710+
'<span class="badge rounded-pill text-bg-danger" title="In state for 30 days; goal is &lt;15 days."><i class="bi bi-clock-fill"></i> 30</span>'
711711
712712
>>> settings.DOC_ACTION_HOLDER_AGE_LIMIT_DAYS = old_limit
713713
"""
714714
age_limit = settings.DOC_ACTION_HOLDER_AGE_LIMIT_DAYS
715715
age = (timezone.now() - action_holder.time_added).days
716716
if age > age_limit:
717717
return mark_safe(
718-
'<span class="badge rounded-pill bg-danger" title="In state for %d day%s; goal is &lt;%d days."><i class="bi bi-clock-fill"></i> %d</span>'
718+
'<span class="badge rounded-pill text-bg-danger" title="In state for %d day%s; goal is &lt;%d days."><i class="bi bi-clock-fill"></i> %d</span>'
719719
% (age, "s" if age != 1 else "", age_limit, age)
720720
)
721721
else:

‎ietf/doc/tests.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,8 +434,8 @@ def test_recent_drafts(self):
434434
self.assertEqual(r.status_code, 200)
435435
q = PyQuery(r.content)
436436
self.assertEqual(len(q('td.doc')),3)
437-
self.assertTrue(q('td.status span.bg-warning[title*="%s"]' % "for 15 days"))
438-
self.assertTrue(q('td.status span.bg-danger[title*="%s"]' % "for 29 days"))
437+
self.assertTrue(q('td.status span.text-bg-warning[title*="%s"]' % "for 15 days"))
438+
self.assertTrue(q('td.status span.text-bg-danger[title*="%s"]' % "for 29 days"))
439439
for ah in [draft.action_holders.first() for draft in drafts]:
440440
self.assertContains(r, escape(ah.name))
441441

‎ietf/group/tests_info.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -478,13 +478,13 @@ def test_nonactive_group_badges(self):
478478
r = self.client.get(url)
479479
self.assertEqual(r.status_code,200)
480480
q = PyQuery(r.content)
481-
self.assertEqual(q('.badge.bg-warning').text(),"Concluded WG")
481+
self.assertEqual(q('.badge.text-bg-warning').text(),"Concluded WG")
482482
replaced_group = GroupFactory(state_id='replaced')
483483
url = urlreverse("ietf.group.views.history",kwargs={'acronym':replaced_group.acronym})
484484
r = self.client.get(url)
485485
self.assertEqual(r.status_code,200)
486486
q = PyQuery(r.content)
487-
self.assertEqual(q('.badge.bg-warning').text(),"Replaced WG")
487+
self.assertEqual(q('.badge.text-bg-warning').text(),"Replaced WG")
488488

489489

490490
class GroupEditTests(TestCase):

‎ietf/nomcom/tests.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1485,7 +1485,7 @@ def test_feedback_index_badges(self):
14851485
response = self.client.get(url)
14861486
self.assertEqual(response.status_code,200)
14871487
q = PyQuery(response.content)
1488-
self.assertEqual( len(q('.bg-success')), 4 )
1488+
self.assertEqual( len(q('.text-bg-success')), 4 )
14891489

14901490
f = self.nc.feedback_set.first()
14911491
f.time = self.hour_ago
@@ -1495,20 +1495,20 @@ def test_feedback_index_badges(self):
14951495
response = self.client.get(url)
14961496
self.assertEqual(response.status_code,200)
14971497
q = PyQuery(response.content)
1498-
self.assertEqual( len(q('.bg-success')), 3 )
1498+
self.assertEqual( len(q('.text-bg-success')), 3 )
14991499

15001500
FeedbackLastSeen.objects.update(time=self.second_from_now)
15011501
response = self.client.get(url)
15021502
self.assertEqual(response.status_code,200)
15031503
q = PyQuery(response.content)
1504-
self.assertEqual( len(q('.bg-success')), 1 )
1504+
self.assertEqual( len(q('.text-bg-success')), 1 )
15051505

15061506
TopicFeedbackLastSeen.objects.create(reviewer=self.member,topic=self.topic)
15071507
TopicFeedbackLastSeen.objects.update(time=self.second_from_now)
15081508
response = self.client.get(url)
15091509
self.assertEqual(response.status_code,200)
15101510
q = PyQuery(response.content)
1511-
self.assertEqual( len(q('.bg-success')), 0 )
1511+
self.assertEqual( len(q('.text-bg-success')), 0 )
15121512

15131513
def test_feedback_nominee_badges(self):
15141514
url = reverse('ietf.nomcom.views.view_feedback_nominee', kwargs={'year':self.nc.year(), 'nominee_id':self.nominee.id})
@@ -1517,7 +1517,7 @@ def test_feedback_nominee_badges(self):
15171517
response = self.client.get(url)
15181518
self.assertEqual(response.status_code,200)
15191519
q = PyQuery(response.content)
1520-
self.assertEqual( len(q('.bg-success')), 3 )
1520+
self.assertEqual( len(q('.text-bg-success')), 3 )
15211521

15221522
f = self.nc.feedback_set.first()
15231523
f.time = self.hour_ago
@@ -1527,13 +1527,13 @@ def test_feedback_nominee_badges(self):
15271527
response = self.client.get(url)
15281528
self.assertEqual(response.status_code,200)
15291529
q = PyQuery(response.content)
1530-
self.assertEqual( len(q('.bg-success')), 2 )
1530+
self.assertEqual( len(q('.text-bg-success')), 2 )
15311531

15321532
FeedbackLastSeen.objects.update(time=self.second_from_now)
15331533
response = self.client.get(url)
15341534
self.assertEqual(response.status_code,200)
15351535
q = PyQuery(response.content)
1536-
self.assertEqual( len(q('.bg-success')), 0 )
1536+
self.assertEqual( len(q('.text-bg-success')), 0 )
15371537

15381538
def test_feedback_topic_badges(self):
15391539
url = reverse('ietf.nomcom.views.view_feedback_topic', kwargs={'year':self.nc.year(), 'topic_id':self.topic.id})
@@ -1542,7 +1542,7 @@ def test_feedback_topic_badges(self):
15421542
response = self.client.get(url)
15431543
self.assertEqual(response.status_code,200)
15441544
q = PyQuery(response.content)
1545-
self.assertEqual( len(q('.bg-success')), 1 )
1545+
self.assertEqual( len(q('.text-bg-success')), 1 )
15461546

15471547
f = self.topic.feedback_set.first()
15481548
f.time = self.hour_ago
@@ -1552,13 +1552,13 @@ def test_feedback_topic_badges(self):
15521552
response = self.client.get(url)
15531553
self.assertEqual(response.status_code,200)
15541554
q = PyQuery(response.content)
1555-
self.assertEqual( len(q('.bg-success')), 0 )
1555+
self.assertEqual( len(q('.text-bg-success')), 0 )
15561556

15571557
TopicFeedbackLastSeen.objects.update(time=self.second_from_now)
15581558
response = self.client.get(url)
15591559
self.assertEqual(response.status_code,200)
15601560
q = PyQuery(response.content)
1561-
self.assertEqual( len(q('.bg-success')), 0 )
1561+
self.assertEqual( len(q('.text-bg-success')), 0 )
15621562

15631563
class NewActiveNomComTests(TestCase):
15641564

‎ietf/static/js/password_strength.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
widget
3232
.find(".label-danger")
33-
.addClass("bg-danger")
33+
.addClass("text-bg-danger")
3434
.removeClass("label-danger");
3535

3636
widget
@@ -64,13 +64,13 @@
6464
.val());
6565

6666
if (result.score < 3) {
67-
password_strength_bar.removeClass('bg-success')
68-
.addClass('bg-warning');
67+
password_strength_bar.removeClass('text-bg-success')
68+
.addClass('text-bg-warning');
6969
password_strength_info.find('.badge')
7070
.removeClass('d-none');
7171
} else {
72-
password_strength_bar.removeClass('bg-warning')
73-
.addClass('bg-success');
72+
password_strength_bar.removeClass('text-bg-warning')
73+
.addClass('text-bg-success');
7474
password_strength_info.find('.badge')
7575
.addClass('d-none');
7676
}
@@ -86,8 +86,8 @@
8686
.html(result.crack_times_display.offline_slow_hashing_1e4_per_second);
8787
password_strength_offline_info.removeClass('d-none');
8888
} else {
89-
password_strength_bar.removeClass('bg-success')
90-
.addClass('bg-warning');
89+
password_strength_bar.removeClass('text-bg-success')
90+
.addClass('text-bg-warning');
9191
password_strength_bar.width('0%')
9292
.attr('aria-valuenow', 0);
9393
password_strength_info.addClass('d-none');
@@ -186,4 +186,4 @@
186186
// Call the init for backwards compatibility
187187
djangoPasswordStrength.init();
188188

189-
})(jQuery, window, document);
189+
})(jQuery, window, document);

‎ietf/templates/base.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
data-group-menu-data-url="{% url 'ietf.group.views.group_menu_data' %}">
3636
{% analytical_body_top %}
3737
<a class="visually-hidden visually-hidden-focusable" href="#content">Skip to main content</a>
38-
<nav class="navbar navbar-expand-lg fixed-top {% if server_mode and server_mode != "production" %}bg-danger-subtle navbar-light{% else %}navbar-dark bg-secondary{% endif %}">
38+
<nav class="navbar navbar-expand-lg fixed-top {% if server_mode and server_mode != "production" %}bg-danger-subtle{% else %}bg-secondary{% endif %}">
3939
<div class="container-fluid">
4040
<a class="navbar-brand" href="/">
4141
<img alt="IETF Logo" class="me-2"

‎ietf/templates/doc/charter/submit.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ <h1>Charter submission</h1>
3939
<th scope="row">State</th>
4040
<td>
4141
{{ group.state.name }}
42-
{% if requested_close %}<div class="badge rounded-pill bg-info">In the process of being closed</div>{% endif %}
42+
{% if requested_close %}<div class="badge rounded-pill text-bg-info">In the process of being closed</div>{% endif %}
4343
</td>
4444
</tr>
4545
</tbody>

‎ietf/templates/doc/document_ballot_content.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
</div>
105105
{% if p.pos.blocking and p.discuss %}
106106
<div class="card border-danger {% if p.comment %} mb-2{% endif %}">
107-
<div class="card-header bg-danger text-light">
107+
<div class="card-header text-bg-danger">
108108
<div>
109109
<b>{{ p.pos.name }}</b>
110110
({{ p.discuss_time|date:"Y-m-d" }}{% if not p.for_current_revision and p.get_dochistory.rev %}{% if p.discuss_time %} {% endif %}for -{{ p.get_dochistory.rev }}{% endif %})
@@ -180,7 +180,7 @@
180180
<div class="h5 d-flex mt-4"
181181
id="{{ doc.name|slugify }}_{{ p.balloter.plain_name|slugify }}">
182182
<div class="flex-fill text-body-secondary">
183-
{{ p.balloter.plain_name }} <span class="badge rounded-pill bg-secondary">Former IESG member</span>
183+
{{ p.balloter.plain_name }} <span class="badge rounded-pill text-bg-secondary">Former IESG member</span>
184184
</div>
185185
<div class="flex-fill text-end">
186186
{% if p.old_positions %}<span class="text-body-secondary small">(was {{ p.old_positions|join:", " }})</span>{% endif %}

‎ietf/templates/doc/document_bofreq.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<td class="edit"></td>
2222
<td>
2323
{{ doc.get_state.slug|capfirst }} BOF request
24-
{% if snapshot %}<span class="badge rounded-pill bg-warning">Snapshot</span>{% endif %}
24+
{% if snapshot %}<span class="badge rounded-pill text-bg-warning">Snapshot</span>{% endif %}
2525
</td>
2626
</tr>
2727
<tr>

0 commit comments

Comments
 (0)