Skip to content

GH41457 Upgrade Bootstrap to v5.0 #41651

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

Merged
merged 4 commits into from
Jul 6, 2021
Merged

GH41457 Upgrade Bootstrap to v5.0 #41651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
79a496f
GH41457 Upgrade Bootstrap to v5.0
calvh May 24, 2021
917ff6c
Merge branch 'master' into 41457-upgrade-to-bootstrap5
calvh Jun 8, 2021
28c17c7
Update to pass CI checks
calvh Jul 6, 2021
ef84fed
Merge to pass CI test
calvh Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 9 additions & 15 deletions web/pandas/_templates/layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel='shortcut icon' type='image/x-icon' href='{{ base_url }}/static/img/favicon.ico'/>
<link rel="stylesheet"
href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm"
href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.1/dist/css/bootstrap.min.css"
integrity="sha384-+0n0xVW2eSR5OomGNYDnhzAbDsOXxcvSN1TPprVMTNDbiYZCxYbOOl7+AMvyTG2x"
crossorigin="anonymous">
{% for stylesheet in static.css %}
<link rel="stylesheet"
Expand All @@ -27,14 +27,14 @@
<header>
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
<div class="container">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#nav-content" aria-controls="nav-content" aria-expanded="false" aria-label="Toggle navigation">
<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">
<span class="navbar-toggler-icon"></span>
</button>

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

<div class="collapse navbar-collapse" id="nav-content">
<ul class="navbar-nav ml-auto">
<ul class="navbar-nav ms-auto">
{% for item in navbar %}
{% if not item.has_subitems %}
<li class="nav-item">
Expand All @@ -43,7 +43,7 @@
{% else %}
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle"
data-toggle="dropdown"
data-bs-toggle="dropdown"
id="{{ item.slug }}"
href="#"
role="button"
Expand All @@ -68,7 +68,7 @@
</div>
</main>
<footer class="container pt-4 pt-md-5 border-top">
<ul class="list-inline social-buttons float-right">
<ul class="list-inline social-buttons float-end">
<li class="list-inline-item">
<a href="https://twitter.com/pandas_dev/">
<i class="fab fa-twitter"></i>
Expand All @@ -89,15 +89,9 @@
pandas is a fiscally sponsored project of <a href="https://numfocus.org">NumFOCUS.</a>
</p>
</footer>

<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"
integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"
integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q"
crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"
integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl"

<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"
integrity="sha384-gtEjrD/SeCtmISkJkNUaaKMoLD0//ElJ19smozuHV6z3Iehds+3Ulb9Bn9Plx0x4"
crossorigin="anonymous"></script>
</body>
</html>
6 changes: 3 additions & 3 deletions web/pandas/contribute.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ and about current sponsors in the [sponsors page](about/sponsors.html).
<i class="fas fa-circle fa-stack-2x pink"></i>
<i class="fas fa-building fa-stack-1x fa-inverse"></i>
</span>
<h4 class="service-heading mt-3 font-weight-bold blue">Corporate support</h4>
<h4 class="service-heading mt-3 fw-bold blue">Corporate support</h4>
<p class="text-muted">
pandas depends on companies and institutions using the software to support its development. Hiring
people to work on pandas, or letting existing employees to contribute to the
Expand All @@ -28,7 +28,7 @@ and about current sponsors in the [sponsors page](about/sponsors.html).
<i class="fas fa-circle fa-stack-2x pink"></i>
<i class="fas fa-users fa-stack-1x fa-inverse"></i>
</span>
<h4 class="service-heading mt-3 font-weight-bold blue">Individual contributors</h4>
<h4 class="service-heading mt-3 fw-bold blue">Individual contributors</h4>
<p class="text-muted">
pandas is mostly developed by volunteers. All kind of contributions are welcome,
such as contributions to the code, to the website (including graphical designers),
Expand All @@ -42,7 +42,7 @@ and about current sponsors in the [sponsors page](about/sponsors.html).
<i class="fas fa-circle fa-stack-2x pink"></i>
<i class="fas fa-dollar-sign fa-stack-1x fa-inverse"></i>
</span>
<h4 class="service-heading mt-3 font-weight-bold blue">Donations</h4>
<h4 class="service-heading mt-3 fw-bold blue">Donations</h4>
<p class="text-muted">
Individual donations are appreciated, and are used for things like the project
infrastructure, travel expenses for our volunteer contributors to attend
Expand Down
4 changes: 2 additions & 2 deletions web/pandas/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="container">
<div class="row">
<div class="col-md-9">
<section class="jumbotron text-center">
<section class="h-30 p-5 bg-light border rounded-3 text-center mb-4">
<h1>pandas</h1>
<p>
<strong>pandas</strong> is a fast, powerful, flexible and easy to use open source data analysis and manipulation tool,<br/>
Expand Down Expand Up @@ -98,7 +98,7 @@ <h4>Previous versions</h4>
{% endif %}
{% if releases[5:] %}
<p class="text-center">
<a data-toggle="collapse" href="#show-more-releases" role="button" aria-expanded="false" aria-controls="show-more-releases">Show more</a>
<a data-bs-toggle="collapse" href="#show-more-releases" role="button" aria-expanded="false" aria-controls="show-more-releases">Show more</a>
</p>
<ul id="show-more-releases" class="collapse">
{% for release in releases[5:] %}
Expand Down
12 changes: 12 additions & 0 deletions web/pandas/static/css/pandas.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,18 @@ ol ol, ol ul, ul ol, ul ul {
a.navbar-brand img {
height: 3rem;
}
a:link:not(.btn):not(.dropdown-item):not(.nav-link) {
text-decoration: none;
}
a:visited:not(.btn):not(.dropdown-item):not(.nav-link) {
text-decoration: none;
}
a:hover:not(.btn):not(.dropdown-item):not(.nav-link) {
text-decoration: underline;
}
a:active:not(.btn):not(.dropdown-item):not(.nav-link) {
text-decoration: underline;
}
div.card {
margin: 0 0 .2em .2em !important;
}
Expand Down