Skip to content

Commit

Permalink
Fix more colors
Browse files Browse the repository at this point in the history
  • Loading branch information
@larseggert @NGPixel
larseggert authored and NGPixel committed Apr 25, 2023
1 parent ac9c360 commit bc4097c
Show file tree
Hide file tree
Showing 37 changed files with 54 additions and 54 deletions.
2 changes: 1 addition & 1 deletion ietf/templates/doc/charter/submit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h1>Charter submission</h1>
<th scope="row">State</th>
<td>
{{ group.state.name }}
{% if requested_close %}<div class="badge rounded-pill bg-info">In the process of being closed</div>{% endif %}
{% if requested_close %}<div class="badge rounded-pill bg-info-subtle">In the process of being closed</div>{% endif %}
</td>
</tr>
</tbody>
Expand Down
4 changes: 2 additions & 2 deletions ietf/templates/doc/document_charter.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@
{% else %}
No document state
{% endif %}
{% if chartering == "initial" %}<span class="badge rounded-pill bg-info">Initial chartering</span>{% endif %}
{% if chartering == "rechartering" %}<span class="badge rounded-pill bg-info">Rechartering</span>{% endif %}
{% if chartering == "initial" %}<span class="badge rounded-pill bg-info-subtle">Initial chartering</span>{% endif %}
{% if chartering == "rechartering" %}<span class="badge rounded-pill bg-info-subtle">Rechartering</span>{% endif %}
</td>
</tr>
</tbody>
Expand Down
2 changes: 1 addition & 1 deletion ietf/templates/doc/document_conflict_review.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<td>
<a href="{% url "ietf.doc.views_doc.document_main" name=conflictdoc.canonical_name %}">
{% if conflictdoc.get_state_slug == 'rfc' %}{{ conflictdoc.canonical_name|prettystdname }}{% else %}{{ conflictdoc.canonical_name }}-{{ conflictdoc.rev }}{% endif %}</a>
<span class="badge rounded-pill bg-info">{{ conflictdoc.stream }} stream</span>
<span class="badge rounded-pill bg-info-subtle">{{ conflictdoc.stream }} stream</span>
{% if snapshot %}<span class="badge rounded-pill bg-warning">Snapshot</span>{% endif %}
</td>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion ietf/templates/doc/document_referenced_by.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ <h1>References to {{ alias_name }}</h1>
<a href="{% url 'ietf.doc.views_doc.document_main' name=name %}">{{ name|prettystdname }}</a>
{% if ref.target.name != alias_name %}
<br>
<span class="badge rounded-pill bg-info">As {{ ref.target.name }}</span>
<span class="badge rounded-pill bg-info-subtle">As {{ ref.target.name }}</span>
{% endif %}
</td>
<td>
Expand Down
2 changes: 1 addition & 1 deletion ietf/templates/doc/drafts_in_iesg_process.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h1>{{ title }}</h1>
</thead>
{% for state, docs in grouped_docs %}
<tbody>
<tr class="table-info">
<tr class="bg-info-subtle">
<th scope="col" colspan="5">{{ state.name }}</th>
</tr>
</tbody>
Expand Down
2 changes: 1 addition & 1 deletion ietf/templates/doc/review_assignment_summary.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<span class="badge rounded-pill ms-1 bg-secondary">Partially completed</span>
{% endif %}
{% if review_assignment.result %}
<span class="badge rounded-pill ms-1 {% if review_assignment.result.name|slice:5|slugify == 'ready' %}bg-success{% else %}bg-info{% endif %}">
<span class="badge rounded-pill ms-1 {% if review_assignment.result.name|slice:5|slugify == 'ready' %}bg-success{% else %}bg-info-subtle{% endif %}">
{{ review_assignment.result.name }}
</span>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion ietf/templates/doc/search/search_result_row.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
<td class="text-center d-none d-sm-table-cell">
{% if doc.related_ipr %}
<a href="{% url "ietf.ipr.views.search" %}?submit=draft&amp;id={{ doc.name }}">
<span class="badge rounded-pill bg-info">{{ doc.related_ipr|length }}</span>
<span class="badge rounded-pill bg-info-subtle">{{ doc.related_ipr|length }}</span>
</a>
{% endif %}
</td>
Expand Down
2 changes: 1 addition & 1 deletion ietf/templates/doc/search/search_results.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
{% regroup docs by search_heading as grouped_docs %}
{% for doc_group in grouped_docs %}
<tbody>
<tr class="table-info">
<tr class="bg-info-subtle">
<td></td>
<th scope="col" colspan="{{ meta.headers|length|add:"-1" }}">
{{ doc_group.grouper|plural:doc_group.list }} ({{ doc_group.list|length }} {{"hit"|plural:doc_group.list }})
Expand Down
2 changes: 1 addition & 1 deletion ietf/templates/doc/search/status_columns.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
{% for review_assignment in doc.review_assignments %}
{% if review_assignment.state_id == "completed" or review_assignment.state_id == "part-completed" %}
<span title="{{ review_assignment.review_request.team.acronym|upper }} {{ review_assignment.review_request.type.name }} review {% if review_assignment.reviewed_rev and review_assignment.reviewed_rev != current_rev or review_assignment.review_request.doc.name != current_doc_name %}of {% if review_assignment.review_request.doc.name != current_doc_name %}{{ review_assignment.review_request.doc.name }}{% endif %}-{{ review_assignment.reviewed_rev }}{% endif %}: {{review_assignment.result}}"
class="badge rounded-pill {% if review_assignment.result.name|slice:5|slugify == 'ready' %}bg-success{% elif review_assignment.result.name|slice:9|slugify == 'not-ready' %}bg-danger{% elif review_assignment.result.name|slice:10|slugify == 'has-issues' %}bg-warning{% else %}bg-info{% endif %}">
class="badge rounded-pill {% if review_assignment.result.name|slice:5|slugify == 'ready' %}bg-success{% elif review_assignment.result.name|slice:9|slugify == 'not-ready' %}bg-danger{% elif review_assignment.result.name|slice:10|slugify == 'has-issues' %}bg-warning{% else %}bg-info-subtle{% endif %}">
{% else %}
<span title="Incomplete, due {{ review_assignment.review_request.deadline|date:"Y-m-d" }}" class="badge rounded-pill bg-secondary">
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion ietf/templates/doc/status_change/status_changes.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ <h1>RFC status changes</h1>
</thead>
{% for state in state_groups %}
<tbody>
<tr class="table-info">
<tr class="bg-info-subtle">
<th scope="col" colspan="2">{{ state.grouper }}</th>
</tr>
</tbody>
Expand Down
2 changes: 1 addition & 1 deletion ietf/templates/group/active_adm.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1>Active administrative groups</h1>
{% for grouptype in grouped_groups %}
<tbody>
<tr>
<th scope="col" colspan="2" class="table-info">
<th scope="col" colspan="2" class="bg-info-subtle">
Active {% firstof grouptype.grouper.verbose_name grouptype.grouper.name 'Top-level Administration' %}
</th>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion ietf/templates/group/active_iabgroups.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ <h1>Active IAB groups</h1>
{% regroup iabgroups by type as grouped_groups %}
{% for grouptype in grouped_groups %}
<tbody>
<tr class="table-info"><th scope="col" colspan="3">
<tr class="bg-info-subtle"><th scope="col" colspan="3">
{% firstof grouptype.grouper.verbose_name grouptype.grouper.name %}{{ grouptype.list|pluralize }}
</th></tr>
</tbody>
Expand Down
2 changes: 1 addition & 1 deletion ietf/templates/group/active_rfced.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h1>Active RFC Editor Groups</h1>
{% for grouptype in grouped_groups %}
<tbody>
<tr>
<th scope="col" colspan="2" class="table-info">
<th scope="col" colspan="2" class="bg-info-subtle">
Active {% firstof grouptype.grouper.verbose_name grouptype.grouper.name 'Top-level Organization' %} Groups
</th>
</tr>
Expand Down
2 changes: 1 addition & 1 deletion ietf/templates/group/active_wgs.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h3 class="mt-3 navskip">
{% for ad in area.ads_and_pre_ads %}
<li>
{% person_link ad.person %}
{% if ad.name == "pre-ad" %}<span class="badge rounded-pill bg-info">Incoming AD</span>{% endif %}
{% if ad.name == "pre-ad" %}<span class="badge rounded-pill bg-info-subtle">Incoming AD</span>{% endif %}
</li>
{% endfor %}
</ul>
Expand Down
2 changes: 1 addition & 1 deletion ietf/templates/group/edit_milestones.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ <h1>{{ title }}</h1>
Awaiting accept
</span>
{% endif %}
{% if form.changed %}<span class="badge rounded-pill bg-info">Changed</span>{% endif %}
{% if form.changed %}<span class="badge rounded-pill bg-info-subtle">Changed</span>{% endif %}
{% if form.delete.data %}<span class="badge rounded-pill bg-danger">Deleted</span>{% endif %}
{% for d in form.docs_names %}<div class="doc">{{ d }}</div>{% endfor %}
</div>
Expand Down
4 changes: 2 additions & 2 deletions ietf/templates/group/group_about.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
</td>
<td>
<span class="{% if group.state.name|slugify == 'active' %}text-success{% elif group.state.name|slugify == 'concluded' %}text-danger{% endif %}">{{ group.state.name }}</span>
{% if requested_close %}<div class="badge rounded-pill bg-info">Being closed</div>{% endif %}
{% if requested_close %}<div class="badge rounded-pill bg-info-subtle">Being closed</div>{% endif %}
</td>
</tr>
{% if group.features.has_chartering_process %}
Expand All @@ -80,7 +80,7 @@
<a href="{% url "ietf.doc.views_doc.document_main" name=group.charter.name %}">
{{ group.charter.name }}-{{ group.charter.rev }}</a>
{% if group.charter.get_state.name %}
<span class="badge rounded-pill bg-info">{{ group.charter.get_state.name }}</span>
<span class="badge rounded-pill bg-info-subtle">{{ group.charter.get_state.name }}</span>
{% endif %}
{% else %}
<span class="text-muted">(None)</span>
Expand Down
8 changes: 4 additions & 4 deletions ietf/templates/group/group_about_rendertest.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
{% if charter %}
{% comment %}
<div class="row">
<div class="col-md-6 h2 text-center bg-info border-end">Current about page rendering</div>
<div class="col-md-6 h2 text-center bg-info">Markdown rendering</div>
<div class="col-md-6 h2 text-center bg-info-subtle border-end">Current about page rendering</div>
<div class="col-md-6 h2 text-center bg-info-subtle">Markdown rendering</div>
</div>
<div class="row border-bottom text-center">
<div class="col-md-6 border-end">&nbsp;</div>
Expand All @@ -20,12 +20,12 @@
{% endcomment %}
<div class="my-3 row">
<div class="col-md-6 border-end">
<div class="h2 text-center bg-info">Current about page rendering</div>
<div class="h2 text-center bg-info-subtle">Current about page rendering</div>
<div class="border-bottom text-center">&nbsp;</div>
<div>{{ charter|linebreaks }}</div>
</div>
<div class="col-md-6 rightpanel">
<div class="h2 text-center bg-info">Markdown rendering</div>
<div class="h2 text-center bg-info-subtle">Markdown rendering</div>
<div class="border-bottom text-center">
<label class="form-label" for="widthconstraint">Constrain width</label>
<input type="checkbox" class="form-check-input" name="widthconstraint" id="widthconstraint">
Expand Down
2 changes: 1 addition & 1 deletion ietf/templates/group/group_base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ <h1>
<span class="badge rounded-pill bg-warning float-end ms-3">Concluded {{ group.type.name }}</span>
{% endif %}
{% if group.state_id == "replaced" %}<span class="badge rounded-pill bg-warning float-end ms-3">Replaced {{ group.type.name }}</span>{% endif %}
{% if group.state_id == "proposed" %}<span class="badge rounded-pill bg-info float-end ms-3">Proposed {{ group.type.name }}</span>{% endif %}
{% if group.state_id == "proposed" %}<span class="badge rounded-pill bg-info-subtle float-end ms-3">Proposed {{ group.type.name }}</span>{% endif %}
{{ group.name }} ({{ group.acronym }})
</h1>
<ul class="nav nav-tabs my-3">
Expand Down
2 changes: 1 addition & 1 deletion ietf/templates/group/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ <h1>Other RFC streams</h1>
<td>
{% with stream.get_chair as role %}
{% person_link role.person %}
{% if role %}<span class="badge rounded-pill bg-info">{{ role.name }}</span>{% endif %}
{% if role %}<span class="badge rounded-pill bg-info-subtle">{{ role.name }}</span>{% endif %}
{% endwith %}
</td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions ietf/templates/group/manage_review_requests.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ <h1>
{% endif %}
<br>
{% else %}
<span class="badge rounded-pill bg-info">Auto-suggested</span>
<span class="badge rounded-pill bg-info-subtle">Auto-suggested</span>
<br>
{% endif %}
{% if r.doc.authors %}
Expand Down Expand Up @@ -136,7 +136,7 @@ <h1>
{% endif %}
<div>
<span class="badge rounded-pill bg-secondary">{{ r.doc.pages }} page{{ r.doc.pages|pluralize }}</span>
<span class="badge rounded-pill bg-info">{{ r.doc.friendly_state }}</span>
<span class="badge rounded-pill bg-info-subtle">{{ r.doc.friendly_state }}</span>
</div>
{% if r.doc.telechat_date %}<span class="badge rounded-pill bg-warning">IESG telechat {{ r.doc.telechat_date }}</span>{% endif %}
{% if r.comment %}<pre class="border p-3 pasted">{{ r.comment }}</pre>{% endif %}
Expand Down
4 changes: 2 additions & 2 deletions ietf/templates/group/materials.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h2 class="mt-3">{{ doc_type.name }}</h2>
{% for p in past_pres_list %}
{{ p.grouper }}
{% if p.list|length > 1 %}
<span class="badge rounded-pill bg-info">{{ p.list|length }} sessions</span>
<span class="badge rounded-pill bg-info-subtle">{{ p.list|length }} sessions</span>
{% else %}
{% for pr in p.list %}
{% if pr.rev != d.rev %}(-{{ pr.rev }}){% endif %}
Expand All @@ -52,7 +52,7 @@ <h2 class="mt-3">{{ doc_type.name }}</h2>
{% for p in meeting_pres_list %}
{{ p.grouper }}
{% if p.list|length > 1 %}
<span class="badge rounded-pill bg-info">{{ p.list|length }} sessions</span>
<span class="badge rounded-pill bg-info-subtle">{{ p.list|length }} sessions</span>
{% else %}
{% for pr in p.list %}
{% if pr.rev != d.rev %}(-{{ pr.rev }}){% endif %}
Expand Down
2 changes: 1 addition & 1 deletion ietf/templates/group/reset_charter_milestones.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ <h1>
<label class="form-check-label" for="id-{{ milestone.id }}">
{{ milestone.desc }}
</label>
<span class="badge rounded-pill {% if milestone.resolved %}bg-success{% else %}bg-info{% endif %}">
<span class="badge rounded-pill {% if milestone.resolved %}bg-success{% else %}bg-info-subtle{% endif %}">
{% if milestone.resolved %}
{{ milestone.resolved }}
{% else %}
Expand Down
10 changes: 5 additions & 5 deletions ietf/templates/group/review_requests.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h2 class="mt-5" id="unassigned-and-open-review-requests">Unassigned and open re
</tr>
</thead>
<tbody>
<tr class="table-info" id="unassigned-review-requests">
<tr class="bg-info-subtle" id="unassigned-review-requests">
<th scope="col" colspan="6">Unassigned review requests</th>
</tr>
</tbody>
Expand All @@ -48,7 +48,7 @@ <h2 class="mt-5" id="unassigned-and-open-review-requests">Unassigned and open re
{% if r.pk %}
{{ r.time|date:"Y-m-d" }} by {% person_link r.requested_by %}
{% else %}
<span class="badge rounded-pill bg-info">Auto-suggested</span>
<span class="badge rounded-pill bg-info-subtle">Auto-suggested</span>
{% endif %}
</td>
<td>
Expand Down Expand Up @@ -79,7 +79,7 @@ <h2 class="mt-5" id="unassigned-and-open-review-requests">Unassigned and open re
</tr>
</thead>
<tbody>
<tr class="table-info" id="open_review_assignments">
<tr class="bg-info-subtle" id="open_review_assignments">
<th scope="col" colspan="7">Open review requests</th>
</tr>
</tbody>
Expand Down Expand Up @@ -148,7 +148,7 @@ <h2 class="mt-5" id="closed-review-requests">Closed review requests and assignme
</tr>
</thead>
<tbody>
<tr class="table-info">
<tr class="bg-info-subtle">
<th scope="col" colspan="6">
Closed review requests
</th>
Expand Down Expand Up @@ -212,7 +212,7 @@ <h2 class="mt-5" id="closed-review-requests">Closed review requests and assignme
</tr>
</thead>
<tbody>
<tr class="table-info">
<tr class="bg-info-subtle">
<th scope="col" colspan="8">
Closed review assignments
</th>
Expand Down
2 changes: 1 addition & 1 deletion ietf/templates/ipr/details_history.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ <h1>
<td>{% person_link e.by %}</td>
<td class="text-break">
{% if e.message %}
{% if e.response_due %}<span class="badge rounded-pill bg-info">Response due {{ e.response_due|date:"Y-m-d" }}</span>{% endif %}
{% if e.response_due %}<span class="badge rounded-pill bg-info-subtle">Response due {{ e.response_due|date:"Y-m-d" }}</span>{% endif %}
{# FIXME: can't do format_history_text, because that inserts a <div> into the <pre>, which is illegal. Need to rework the snippeting. #}
<pre>{{ e.message|render_message_for_history|urlize_ietf_docs|linkify }}</pre>
{% else %}
Expand Down
Loading

0 comments on commit bc4097c

Please sign in to comment.