Skip to content

Commit

Permalink
replace text-muted with text-body-secondary
Browse files Browse the repository at this point in the history
  • Loading branch information
felixrindt committed Jun 27, 2023
1 parent f4cd383 commit 0a57e65
Show file tree
Hide file tree
Showing 19 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions ephios/api/templates/api/access_token_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h2>
<h5 class="card-title">
{{ token.application.name }}
</h5>
<p class="text-muted">
<p class="text-body-secondary">
</p>
</div>
<div class="col-12 col-lg">
Expand Down Expand Up @@ -73,7 +73,7 @@ <h2>
<h5 class="card-title">
{{ token.description|rich_text }}
</h5>
<p class="text-muted">
<p class="text-body-secondary">
{% blocktranslate trimmed with created=token.created %}
created on {{ created }}
{% endblocktranslate %}
Expand Down
2 changes: 1 addition & 1 deletion ephios/core/templates/core/disposition/disposition.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{% block content %}
<div class="page-header text-break pb-3">
<h1>{{ shift.event }}</h1>
<h3 class="subtitle text-muted">
<h3 class="subtitle text-body-secondary">
{{ shift.get_datetime_display }}
</h3>
</div>
Expand Down
8 changes: 4 additions & 4 deletions ephios/core/templates/core/event_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,15 @@ <h1 class="card-title fw-bold fs-1">
{% endif %}
{{ event.title }}
</h1>
<h5 class="card-subtitle mb-2 text-muted fw-bolder lh-base">
<h5 class="card-subtitle mb-2 text-body-secondary fw-bolder lh-base">
<span class="me-1 badge eventtype-{{ event.type.pk }}-color">{{ event.type }}</span>
<span class="text-muted me-1 d-inline-block">
<span class="text-body-secondary me-1 d-inline-block">
<i class="fas fa-map-marker-alt"></i>
{{ event.location }}
</span>
{% with start_time=event.get_start_time end_time=event.get_end_time %}
{% if start_time %}
<span class="text-muted d-inline-block">
<span class="text-body-secondary d-inline-block">
<i class="far fa-calendar"></i>
{{ start_time|date:"D" }},
{% if not event.is_multi_day %}
Expand All @@ -115,7 +115,7 @@ <h5 class="card-subtitle mb-2 text-muted fw-bolder lh-base">
{% endif %}
{% endwith %}
</h5>
<div class="card-text text-muted">
<div class="card-text text-body-secondary">
{{ event.description|rich_text:"h1,h2" }}
</div>
<div class="event-plugin-content">
Expand Down
4 changes: 2 additions & 2 deletions ephios/core/templates/core/event_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ <h1>{% translate "Events" %}
{% elif counter|get:ParticipationStates.USER_DECLINED > 0 and counter|length == 1 %}
<span class="text-danger fa fa-user-minus ps-2"></span>
{% else %}
<span class="text-muted far fa-user ps-2"></span>
<span class="text-body-secondary far fa-user ps-2"></span>
{% endif %}
</div>
{% if perms.core.add_event %}
Expand All @@ -177,7 +177,7 @@ <h5 class="mb-0 text-break">
{{ event.title }}

</h5>
<span class="w-100 text-muted text-break">
<span class="w-100 text-body-secondary text-break">
{{ event.location }}
</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ephios/core/templates/core/event_notification.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{% block content %}
<div class="page-header">
<h1>{% translate "Event notifications" %}</h1>
<h4 class="text-muted">{{ event.title }} ({{ event.get_start_time }} - {{ event.get_end_time }})</h4>
<h4 class="text-body-secondary">{{ event.title }} ({{ event.get_start_time }} - {{ event.get_end_time }})</h4>
</div>
{% crispy form %}
{% endblock %}
4 changes: 2 additions & 2 deletions ephios/core/templates/core/fragments/shift_box_big.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
{{ shift.end_time|time }}
{% endif %}
</span>
<small class="fw-bold text-muted d-inline-block">
<small class="fw-bold text-body-secondary d-inline-block">
<span class="d-inline-block">
{{ shift.meeting_time|time }} {% translate "Meetup" %}
</span>
Expand Down Expand Up @@ -99,7 +99,7 @@
</span>
</div>
{% elif not can_sign_up or not can_decline %}
<div class="text-muted mb-1">
<div class="text-body-secondary mb-1">
{% for error in request|signup_errors:shift %}
<span>{{ error.message }}</span>
{% endfor %}
Expand Down
2 changes: 1 addition & 1 deletion ephios/core/templates/core/fragments/shift_box_small.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<div class="card mb-2 {% if shift == editing_shift %}border-info{% endif %}">
<div class="card-body">
<h5 class="card-subtitle mb-2 text-muted">
<h5 class="card-subtitle mb-2 text-body-secondary">
{% trans "Shift" %}
{% if can_change and not shift == editing_shift %}
<small class="float-end">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% load i18n %}

<p class="text-muted">
<p class="text-body-secondary">
{% translate "We're sorry! There is a problem displaying the state of the shift." %}
</p>
2 changes: 1 addition & 1 deletion ephios/core/templates/core/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ <h5 class="card-title mb-0">{% trans "Your upcoming events" %}</h5>
</li>
{% empty %}
<li class="list-group-item d-flex flex-column align-items-center justify-content-center">
<span class="pb-1 text-muted">{% translate "None yet" context "empty list of upcoming shifts" %}</span>
<span class="pb-1 text-body-secondary">{% translate "None yet" context "empty list of upcoming shifts" %}</span>
<a class="btn btn-sm btn-primary" href="{% url "core:event_list" %}">{% translate "View events" %}</a>
</li>

Expand Down
2 changes: 1 addition & 1 deletion ephios/core/templates/core/shift_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ <h5 class="card-title">
{% if not object %}
<div class="card mb-2 border-info">
<div class="card-body">
<h5 class="card-subtitle mb-2 text-muted">{% trans "Shift" %}</h5>
<h5 class="card-subtitle mb-2 text-body-secondary">{% trans "Shift" %}</h5>
<p class="card-text">{% trans "You are currently adding this shift" %}</p>
</div>
{% endif %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</div>

<a class="badge
{% if participation.state == participation.States.CONFIRMED %}bg-secondary text-dark{% else %}bg-light text-muted{% endif %}
{% if participation.state == participation.States.CONFIRMED %}bg-secondary text-dark{% else %}bg-light text-body-secondary{% endif %}
{% if participation.participant.is_minor %}participation-card-minor{% endif %}
"
tabindex="0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

{% block participation_detail %}
{% if form.preferred_section %}
<small class="text-muted">
<small class="text-body-secondary">
<br> {% translate "prefers" %}
{{ form.preferred_section.title }}
</small>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{{ section.stats.confirmed_count }}{% if section.stats.max_count %}/{{ section.stats.max_count }}{% endif %}
</strong>
{{ section.title }}
<span class="text-muted float-end">{{ section.qualifications_label }}</span>
<span class="text-body-secondary float-end">{{ section.qualifications_label }}</span>
</span>

<div class="mb-4">
Expand Down
2 changes: 1 addition & 1 deletion ephios/plugins/guests/templates/guests/event_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
{% load i18n %}

{% block content %}
<h6 class="text-muted"><b>{{ object.as_participant }}</b></h6>
<h6 class="text-body-secondary"><b>{{ object.as_participant }}</b></h6>
{{ block.super }}
{% endblock %}
2 changes: 1 addition & 1 deletion ephios/plugins/guests/templates/guests/guestuser_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<div class="page-header">
<h1>{{ event }}</h1>
{% if event.shifts.exists %}
<h4 class="text-muted">{{ event.get_start_time }} {% trans "to" %} {{ event.get_end_time }}</h4>
<h4 class="text-body-secondary">{{ event.get_start_time }} {% trans "to" %} {{ event.get_end_time }}</h4>
{% endif %}
<h2>{% trans "Register as guest" %}</h2>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ <h2>{% trans "Edit qualification categories" %}</h2>
data-formset-delete-button><span
class="fas fa-trash-alt"></span> {% trans "Delete" %}</button>
{% else %}
<p class="text-muted">
<p class="text-body-secondary">
{% translate "cannot delete, has qualifications" %}
</p>
{% endif %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h1>{% trans "Edit resource categories" %}</h1>
data-formset-delete-button><span
class="fas fa-trash-alt"></span> {% trans "Delete" %}</button>
{% else %}
<p class="text-muted">
<p class="text-body-secondary">
{% translate "cannot delete, has resources" %}
</p>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion ephios/static/ephios/scss/ephios_bootstrap_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ $card-bg: $gray-100;
$card-cap-bg: $gray-100;
$list-group-bg: $gray-100;

$text-muted: $gray-550;
$body-secondary-color: $gray-550;

$enable-negative-margins: true;

Expand Down
2 changes: 1 addition & 1 deletion ephios/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
{% for label, url in footer.items %}
<a href="{{ url }}">{{ label }}</a> ·
{% endfor %}
<span class="text-muted">
<span class="text-body-secondary">
{% blocktranslate with brand='<a href="https://ephios.de/" rel="noreferrer" target="_blank">ephios</a>' %}
powered by {{ brand }}
{% endblocktranslate %}
Expand Down

0 comments on commit 0a57e65

Please sign in to comment.