Skip to content

Commit 9d5d9d5

Browse files
authored
fix: replace deprecated bootstrap things (ietf-tools#5858)
* text-muted -> text-body-secondary * navbar-dark is deprecated * Remove FIXME block, not an issue anymore * Remove `navbar-light`
1 parent 3f228c7 commit 9d5d9d5

204 files changed

Lines changed: 339 additions & 345 deletions

File tree

Some content is hidden

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

client/agenda/Agenda.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
span.meeting-warning(v-if='agendaStore.meeting.warningNote') {{agendaStore.meeting.warningNote}}
1010
h4
1111
span {{agendaStore.meeting.city}}, {{ meetingDate }}
12-
h6.float-end.d-none.d-lg-inline(v-if='meetingUpdated') #[span.text-muted Updated:] {{ meetingUpdated }}
12+
h6.float-end.d-none.d-lg-inline(v-if='meetingUpdated') #[span.text-body-secondary Updated:] {{ meetingUpdated }}
1313

1414
.agenda-topnav.my-3
1515
meeting-navigation
@@ -49,7 +49,7 @@
4949
n-popover(v-if='!agendaStore.infoNoteShown')
5050
template(#trigger)
5151
n-button.ms-2(text, @click='toggleInfoNote')
52-
i.bi.bi-info-circle.text-muted
52+
i.bi.bi-info-circle.text-body-secondary
5353
span Show Info Note
5454
.col-12.col-sm-auto.d-flex.align-items-center
5555
i.bi.bi-globe.me-2

client/agenda/AgendaQuickAccess.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
)
5959
i.bi.bi-x-square.me-2
6060
span Discard
61-
n-divider: small.text-muted Calendar
61+
n-divider: small.text-body-secondary Calendar
6262
n-button.mt-2(
6363
id='agenda-quickaccess-calview-btn'
6464
block
@@ -86,7 +86,7 @@
8686
i.bi.bi-calendar-check.me-2
8787
span {{ shortMode ? '.ics' : 'Add to your calendar...' }}
8888
template(v-if='agendaStore.meetingDays.length > 0')
89-
n-divider: small.text-muted Jump to...
89+
n-divider: small.text-body-secondary Jump to...
9090
ul.nav.nav-pills.flex-column.small.agenda-quickaccess-jumpto
9191
li.nav-item(v-if='agendaStore.isMeetingLive')
9292
a.nav-link(

client/agenda/AgendaShareModal.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ n-modal(v-model:show='modalShown')
2020
i.bi.bi-share
2121
span Share this view
2222
.agenda-share-content
23-
.text-muted.pb-2 Use the following URL for sharing the current view #[em (including any active filters)] with other users:
23+
.text-body-secondary.pb-2 Use the following URL for sharing the current view #[em (including any active filters)] with other users:
2424
n-input-group
2525
n-input(
2626
ref='filteredUrlIpt'

client/components/ChatLog.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
)
1616
template(#default)
1717
div(v-html='item.text')
18-
span.text-muted(v-else)
18+
span.text-body-secondary(v-else)
1919
em No chat log available.
2020
</template>
2121

client/components/Polls.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
:columns='columns'
77
striped
88
)
9-
span.text-muted(v-else)
9+
span.text-body-secondary(v-else)
1010
em No polls available.
1111
</template>
1212

ietf/ietfauth/widgets.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def render(self, name, value, attrs=None, renderer=None):
4141
<div class="progress" style="margin-bottom: 10px;">
4242
<div class="progress-bar progress-bar-warning password_strength_bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="5" style="width: 0%%"></div>
4343
</div>
44-
<p class="text-muted password_strength_info hidden">
44+
<p class="text-body-secondary password_strength_info hidden">
4545
<span class="label label-danger">
4646
%s
4747
</span>
@@ -89,7 +89,7 @@ def render(self, name, value, attrs=None, renderer=None):
8989

9090
confirmation_markup = """
9191
<div style="margin-top: 10px;" class="hidden password_strength_info">
92-
<p class="text-muted">
92+
<p class="text-body-secondary">
9393
<span class="label label-danger">
9494
%s
9595
</span>

ietf/static/css/document_html.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
@use "sass:map";
22

3-
// FIXME: It's not clear why these three variables remain unset by bs5, but just
4-
// set them to placeholder values so the CSS embedded in the HTML validates.
5-
$btn-font-family: inherit !default;
6-
$nav-link-font-weight: inherit !default;
7-
$tooltip-margin: inherit !default;
8-
93
$font-family-sans-serif: "Inter", system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
104
$font-family-monospace: "Noto Sans Mono", SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
115

ietf/static/js/edit-meeting-schedule.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -487,13 +487,13 @@ $(function () {
487487

488488
// Disable a particular swap modal radio input
489489
let updateSwapRadios = function (labels, radios, disableValue, datePrecision) {
490-
labels.removeClass('text-muted');
490+
labels.removeClass('text-body-secondary');
491491
radios.prop('disabled', false);
492492
radios.prop('checked', false);
493493
// disable the input requested by value
494494
let disableInput = radios.filter('[value="' + disableValue + '"]');
495495
if (disableInput) {
496-
disableInput.parent().addClass('text-muted');
496+
disableInput.parent().addClass('text-body-secondary');
497497
disableInput.prop('disabled', true);
498498
}
499499
if (officialSchedule) {
@@ -502,7 +502,7 @@ $(function () {
502502
const past_radios = radios.filter(
503503
(_, radio) => parseISOTimestamp(radio.closest('*[data-start]').dataset.start).isSameOrBefore(now, datePrecision)
504504
);
505-
past_radios.parent().addClass('text-muted');
505+
past_radios.parent().addClass('text-body-secondary');
506506
past_radios.prop('disabled', true);
507507
}
508508
return disableInput; // return the input that was specifically disabled, if any
@@ -859,10 +859,10 @@ $(function () {
859859
.not('.hidden')
860860
.length === 0) {
861861
purpose_input.setAttribute('disabled', 'disabled');
862-
purpose_input.closest('.session-purpose-toggle').classList.add('text-muted');
862+
purpose_input.closest('.session-purpose-toggle').classList.add('text-body-secondary');
863863
} else {
864864
purpose_input.removeAttribute('disabled');
865-
purpose_input.closest('.session-purpose-toggle').classList.remove('text-muted');
865+
purpose_input.closest('.session-purpose-toggle').classList.remove('text-body-secondary');
866866
}
867867
});
868868
}

ietf/static/js/ietf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ $(function () {
184184
.after($(`
185185
<div class="col-xl-2 ps-0 small">
186186
<div id="righthand-panel" class="position-fixed col-xl-2 bg-light d-flex flex-column justify-content-between align-items-start">
187-
<nav id="righthand-nav" class="navbar navbar-light w-100 overflow-auto align-items-start flex-fill"></nav>
187+
<nav id="righthand-nav" class="navbar w-100 overflow-auto align-items-start flex-fill"></nav>
188188
</div>
189189
</div>
190190
`));

ietf/static/js/password_strength.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
.removeClass("label-danger");
3535

3636
widget
37-
.find(".text-muted")
37+
.find(".text-body-secondary")
3838
.addClass("form-text")
39-
.removeClass("text-muted");
39+
.removeClass("text-body-secondary");
4040

4141
self.initListeners();
4242
},

0 commit comments

Comments
 (0)