Skip to content

Commit ee3a5b7

Browse files
authored
GH41457 Upgrade Bootstrap to v5.0 (#41651)
1 parent ae1ccef commit ee3a5b7

File tree

4 files changed

+26
-20
lines changed

4 files changed

+26
-20
lines changed

web/pandas/_templates/layout.html

+9-15
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
1515
<link rel='shortcut icon' type='image/x-icon' href='{{ base_url }}/static/img/favicon.ico'/>
1616
<link rel="stylesheet"
17-
href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
18-
integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm"
17+
href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css"
18+
integrity="sha384-+0n0xVW2eSR5OomGNYDnhzAbDsOXxcvSN1TPprVMTNDbiYZCxYbOOl7+AMvyTG2x"
1919
crossorigin="anonymous">
2020
{% for stylesheet in static.css %}
2121
<link rel="stylesheet"
@@ -27,14 +27,14 @@
2727
<header>
2828
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
2929
<div class="container">
30-
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#nav-content" aria-controls="nav-content" aria-expanded="false" aria-label="Toggle navigation">
30+
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#nav-content" aria-controls="nav-content" aria-expanded="false" aria-label="Toggle navigation">
3131
<span class="navbar-toggler-icon"></span>
3232
</button>
3333

3434
{% if static.logo %}<a class="navbar-brand" href="{{ base_url }}/"><img alt="" src="{{ base_url }}{{ static.logo }}"/></a>{% endif %}
3535

3636
<div class="collapse navbar-collapse" id="nav-content">
37-
<ul class="navbar-nav ml-auto">
37+
<ul class="navbar-nav ms-auto">
3838
{% for item in navbar %}
3939
{% if not item.has_subitems %}
4040
<li class="nav-item">
@@ -43,7 +43,7 @@
4343
{% else %}
4444
<li class="nav-item dropdown">
4545
<a class="nav-link dropdown-toggle"
46-
data-toggle="dropdown"
46+
data-bs-toggle="dropdown"
4747
id="{{ item.slug }}"
4848
href="#"
4949
role="button"
@@ -68,7 +68,7 @@
6868
</div>
6969
</main>
7070
<footer class="container pt-4 pt-md-5 border-top">
71-
<ul class="list-inline social-buttons float-right">
71+
<ul class="list-inline social-buttons float-end">
7272
<li class="list-inline-item">
7373
<a href="https://twitter.com/pandas_dev/">
7474
<i class="fab fa-twitter"></i>
@@ -89,15 +89,9 @@
8989
pandas is a fiscally sponsored project of <a href="https://numfocus.org">NumFOCUS.</a>
9090
</p>
9191
</footer>
92-
93-
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"
94-
integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
95-
crossorigin="anonymous"></script>
96-
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"
97-
integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
98-
crossorigin="anonymous"></script>
99-
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"
100-
integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl"
92+
93+
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"
94+
integrity="sha384-gtEjrD/SeCtmISkJkNUaaKMoLD0//ElJ19smozuHV6z3Iehds+3Ulb9Bn9Plx0x4"
10195
crossorigin="anonymous"></script>
10296
</body>
10397
</html>

web/pandas/contribute.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ and about current sponsors in the [sponsors page](about/sponsors.html).
1414
<i class="fas fa-circle fa-stack-2x pink"></i>
1515
<i class="fas fa-building fa-stack-1x fa-inverse"></i>
1616
</span>
17-
<h4 class="service-heading mt-3 font-weight-bold blue">Corporate support</h4>
17+
<h4 class="service-heading mt-3 fw-bold blue">Corporate support</h4>
1818
<p class="text-muted">
1919
pandas depends on companies and institutions using the software to support its development. Hiring
2020
people to work on pandas, or letting existing employees to contribute to the
@@ -28,7 +28,7 @@ and about current sponsors in the [sponsors page](about/sponsors.html).
2828
<i class="fas fa-circle fa-stack-2x pink"></i>
2929
<i class="fas fa-users fa-stack-1x fa-inverse"></i>
3030
</span>
31-
<h4 class="service-heading mt-3 font-weight-bold blue">Individual contributors</h4>
31+
<h4 class="service-heading mt-3 fw-bold blue">Individual contributors</h4>
3232
<p class="text-muted">
3333
pandas is mostly developed by volunteers. All kind of contributions are welcome,
3434
such as contributions to the code, to the website (including graphical designers),
@@ -42,7 +42,7 @@ and about current sponsors in the [sponsors page](about/sponsors.html).
4242
<i class="fas fa-circle fa-stack-2x pink"></i>
4343
<i class="fas fa-dollar-sign fa-stack-1x fa-inverse"></i>
4444
</span>
45-
<h4 class="service-heading mt-3 font-weight-bold blue">Donations</h4>
45+
<h4 class="service-heading mt-3 fw-bold blue">Donations</h4>
4646
<p class="text-muted">
4747
Individual donations are appreciated, and are used for things like the project
4848
infrastructure, travel expenses for our volunteer contributors to attend

web/pandas/index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="container">
44
<div class="row">
55
<div class="col-md-9">
6-
<section class="jumbotron text-center">
6+
<section class="h-30 p-5 bg-light border rounded-3 text-center mb-4">
77
<h1>pandas</h1>
88
<p>
99
<strong>pandas</strong> is a fast, powerful, flexible and easy to use open source data analysis and manipulation tool,<br/>
@@ -98,7 +98,7 @@ <h4>Previous versions</h4>
9898
{% endif %}
9999
{% if releases[5:] %}
100100
<p class="text-center">
101-
<a data-toggle="collapse" href="#show-more-releases" role="button" aria-expanded="false" aria-controls="show-more-releases">Show more</a>
101+
<a data-bs-toggle="collapse" href="#show-more-releases" role="button" aria-expanded="false" aria-controls="show-more-releases">Show more</a>
102102
</p>
103103
<ul id="show-more-releases" class="collapse">
104104
{% for release in releases[5:] %}

web/pandas/static/css/pandas.css

+12
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,18 @@ ol ol, ol ul, ul ol, ul ul {
4242
a.navbar-brand img {
4343
height: 3rem;
4444
}
45+
a:link:not(.btn):not(.dropdown-item):not(.nav-link) {
46+
text-decoration: none;
47+
}
48+
a:visited:not(.btn):not(.dropdown-item):not(.nav-link) {
49+
text-decoration: none;
50+
}
51+
a:hover:not(.btn):not(.dropdown-item):not(.nav-link) {
52+
text-decoration: underline;
53+
}
54+
a:active:not(.btn):not(.dropdown-item):not(.nav-link) {
55+
text-decoration: underline;
56+
}
4557
div.card {
4658
margin: 0 0 .2em .2em !important;
4759
}

0 commit comments

Comments
 (0)