Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bootstrap migration to v5.0.2 #214

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

Bootstrap migration to v5.0.2 #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5644688
updated bootstrap to v5
KajetanLewandowski Apr 12, 2023
ffb4116
Merge branch 'master' of github.com:KajetanLewandowski/oioioi
KajetanLewandowski Apr 12, 2023
56a33af
probably finished migration to bootstrap 5
KajetanLewandowski May 21, 2023
a71d321
hotfix
KajetanLewandowski May 21, 2023
839c5ab
> fixed tooltips and popovers
KajetanLewandowski Jun 5, 2023
ba978d0
Merge branch 'sio2project:master' into master
KajetanLewandowski Jun 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions oioioi/acm/templates/acm/acm_ranking.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<th>#</th>
<th>{% trans "User" %}</th>
<th class="text-center">{% trans "Score" %}</th>
<th class="text-right">{% trans "Time" %}</th>
<th class="text-end">{% trans "Time" %}</th>
{% for pi, statement_visible in problem_instances %}
{% if statement_visible %}
{% url 'problem_statement' contest_id=contest.id problem_instance=pi.short_name as link %}
Expand All @@ -34,7 +34,7 @@
<td>{{ row.place }}</td>
<td>{% public_name row.user %}</td>
<td class="text-center"><strong>{{ row.sum.problems_solved }}</strong></td>
<td class="text-right">{{ row.sum.total_time_repr }}</td>
<td class="text-end">{{ row.sum.total_time_repr }}</td>

{% for result in row.results %}
<td class="text-center {% if result.problem_instance.round.is_trial %}trial-round{% endif %}">
Expand Down
4 changes: 2 additions & 2 deletions oioioi/balloons/static/balloons/delivery-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ $(function() {
'</tr>';
var deliveredButtonTemplate =
'<button class="btn btn-primary btn-sm" ' +
'data-loading-text="' + gettext("Delivering...") + '">' +
'data-bs-loading-text="' + gettext("Delivering...") + '">' +
gettext("Delivered") +
'</button>';
var notDeliveredButtonTemplate =
'<button class="btn btn-danger btn-sm"' +
' data-loading-text="' + gettext("Taking back...") + '">' +
' data-bs-loading-text="' + gettext("Taking back...") + '">' +
gettext("Not delivered") + '</button>';
var firstAcceptedTemplate =
'<i class="fa-solid fa-star"></i> ' +
Expand Down
7 changes: 0 additions & 7 deletions oioioi/base/static/bootstrap-datetimepicker-oioioi/bootstrap-datetimepicker.min.css
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions oioioi/base/static/bootstrap-datetimepicker-oioioi/bootstrap-datetimepicker.min.js
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions oioioi/base/static/bootstrap-datetimepicker-oioioi/moment.min.js
View file
Open in desktop

This file was deleted.

107 changes: 0 additions & 107 deletions oioioi/base/static/bootstrap-datetimepicker-oioioi/pl.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion oioioi/base/static/bootstrap-markdown/js/bootstrap-markdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
'data-hotkey': hotkey
});
if (button.toggle === true) {
buttonContainer.attr('data-toggle', 'button');
buttonContainer.attr('data-bs-toggle', 'button');
}
buttonIconContainer = $('<span/>');
buttonIconContainer.addClass(buttonIcon);
Expand Down
Loading