Skip to content

Fix #1184 -- Replace loading gif with css animation #1353

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 1 commit into from
Sep 30, 2020
Merged

Fix #1184 -- Replace loading gif with css animation #1353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion debug_toolbar/static/debug_toolbar/css/toolbar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,18 @@
}

#djDebug .djDebugPanelContent .djdt-loader {
display: block;
margin: 80px auto;
border: 6px solid white;
border-radius: 50%;
border-top: 6px solid #ffe761;
width: 38px;
height: 38px;
animation: spin 2s linear infinite;
}

@keyframes spin {
0% { transform: rotate(0deg); }
100% { transform: rotate(360deg); }
}

#djDebug .djDebugPanelContent .djdt-scroll {
Expand Down
Binary file removed debug_toolbar/static/debug_toolbar/img/ajax-loader.gif
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion debug_toolbar/templates/debug_toolbar/includes/panel_content.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ <h3>{{ panel.title }}</h3>
</div>
<div class="djDebugPanelContent">
{% if toolbar.store_id %}
<img src="{% static 'debug_toolbar/img/ajax-loader.gif' %}" alt="loading" class="djdt-loader">
<div class="djdt-loader"></div>
<div class="djdt-scroll"></div>
{% else %}
<div class="djdt-scroll">{{ panel.content }}</div>
Expand Down
2 changes: 1 addition & 1 deletion tests/panels/test_custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def test_escapes_panel_title(self):
<h3>Title with special chars &amp;&quot;&#39;&lt;&gt;</h3>
</div>
<div class="djDebugPanelContent">
<img class="djdt-loader" src="/static/debug_toolbar/img/ajax-loader.gif" alt="loading">
<div class="djdt-loader"></div>
<div class="djdt-scroll"></div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion tests/panels/test_settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def test_panel_title(self):
<h3>Settings from None</h3>
</div>
<div class="djDebugPanelContent">
<img class="djdt-loader" src="/static/debug_toolbar/img/ajax-loader.gif" alt="loading">
<div class="djdt-loader"></div>
<div class="djdt-scroll"></div>
</div>
</div>
Expand Down