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.

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 v5 #7411

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 22 commits
Commits
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
2 changes: 1 addition & 1 deletion docs_theme/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@

<h1 id="404-page-not-found" style="text-align: center">404</h1>
<p style="text-align: center"><strong>Page not found</strong></p>
<p style="text-align: center">Try the <a href="{{ base_url }}">homepage</a>, or <a href="#mkdocs_search_modal" data-toggle="modal">search the documentation</a>.</p>
<p style="text-align: center">Try the <a href="{{ base_url }}">homepage</a>, or <a href="#mkdocs_search_modal" data-bs-toggle="modal">search the documentation</a>.</p>

{% endblock %}
4 changes: 2 additions & 2 deletions docs_theme/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<!-- Search Modal -->
<div id="mkdocs_search_modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<button type="button" class="close" data-bs-dismiss="modal" aria-hidden="true">&times;</button>
<h3 id="myModalLabel">Documentation search</h3>
</div>

Expand All @@ -71,7 +71,7 @@ <h3 id="myModalLabel">Documentation search</h3>
</div>

<div class="modal-footer">
<button class="btn" data-dismiss="modal" aria-hidden="true">Close</button>
<button class="btn" data-bs-dismiss="modal" aria-hidden="true">Close</button>
</div>
</div>

Expand Down
6 changes: 3 additions & 3 deletions docs_theme/nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<a class="repo-link btn btn-inverse btn-small {% if not page.previous_page %}disabled{% endif %}" rel="prev" {% if page.previous_page %}href="{{ page.previous_page.url|url }}"{% endif %}>
<i class="icon-arrow-left icon-white"></i> Previous
</a>
<a id="search_modal_show" class="repo-link btn btn-inverse btn-small" href="#mkdocs_search_modal" data-toggle="modal" data-target="#mkdocs_search_modal"><i class="icon-search icon-white"></i> Search</a>
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<a id="search_modal_show" class="repo-link btn btn-inverse btn-small" href="#mkdocs_search_modal" data-bs-toggle="modal" data-bs-target="#mkdocs_search_modal"><i class="icon-search icon-white"></i> Search</a>
<a class="btn btn-navbar" data-bs-toggle="collapse" data-bs-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
Expand All @@ -21,7 +21,7 @@
<ul class="nav navbar-nav">
{% for nav_item in nav %} {% if nav_item.children %}
<li class="dropdown{% if nav_item.active %} active{% endif %}">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ nav_item.title }} <b class="caret"></b></a>
<a href="#" class="dropdown-toggle" data-bs-toggle="dropdown">{{ nav_item.title }} <b class="caret"></b></a>
<ul class="dropdown-menu">
{% for nav_item in nav_item.children %}
<li {% if nav_item.active %}class="active" {% endif %}>
Expand Down

This file was deleted.

33 changes: 2 additions & 31 deletions rest_framework/static/rest_framework/css/bootstrap-tweaks.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ a single block in the template.
font-size: 80%;
}

.navbar-inverse .brand a {
.navbar-dark .navbar-brand {
color: #999999;
}
.navbar-inverse .brand:hover a {
.navbar-inverse .navbar-brand:hover {
color: white;
text-decoration: none;
}
Expand Down Expand Up @@ -124,21 +124,6 @@ html, body {
margin-bottom: 0;
}

.well {
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
}

.well .form-actions {
padding-bottom: 0;
margin-bottom: 0;
}

.well form {
margin-bottom: 0;
}

.nav-tabs {
border: 0;
}
Expand Down Expand Up @@ -213,20 +198,6 @@ body a:hover {
clear:both;
}

.horizontal-checkbox label {
padding-top: 0;
}

.horizontal-checkbox label {
padding-top: 0 !important;
}

.horizontal-checkbox input {
float: left;
width: 20px;
margin-top: 3px;
}

.modal-footer form {
margin-left: 5px;
margin-right: 5px;
Expand Down
11 changes: 6 additions & 5 deletions rest_framework/static/rest_framework/css/bootstrap.min.css

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Loading