Skip to content

Commit 192533b

Browse files
committed
Merge remote-tracking branch 'jdufresne/clearfix'
* jdufresne/clearfix: Remove unused djdt-clearfix CSS class.
2 parents d6a2215 + 8479ff2 commit 192533b

File tree

2 files changed

+17
-29
lines changed

2 files changed

+17
-29
lines changed

debug_toolbar/static/debug_toolbar/css/toolbar.css

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
/* http://www.positioniseverything.net/easyclearing.html */
2-
#djDebug .djdt-clearfix:after {
3-
content: ".";
4-
display: block;
5-
height: 0;
6-
clear: both;
7-
visibility: hidden;
8-
}
9-
#djDebug .djdt-clearfix {display: block;}
10-
111
/* Debug Toolbar CSS Reset, adapted from Eric Meyer's CSS Reset */
122
#djDebug {color: #000;background: #FFF;}
133
#djDebug, #djDebug div, #djDebug span, #djDebug applet, #djDebug object, #djDebug iframe,

debug_toolbar/templates/debug_toolbar/panels/sql.html

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
{% load i18n l10n %}
2-
<div class="djdt-clearfix">
3-
<ul>
4-
{% for alias, info in databases %}
5-
<li>
6-
<strong><span class="djdt-color" style="background-color:rgb({{ info.rgb_color|join:', ' }})"></span> {{ alias }}</strong>
7-
{{ info.time_spent|floatformat:"2" }} ms ({% blocktrans count info.num_queries as num %}{{ num }} query{% plural %}{{ num }} queries{% endblocktrans %}
8-
{% if info.similar_count %}
9-
{% blocktrans with count=info.similar_count trimmed %}
10-
including <abbr title="Similar queries are queries with the same SQL, but potentially different parameters.">{{ count }} similar</abbr>
2+
<ul>
3+
{% for alias, info in databases %}
4+
<li>
5+
<strong><span class="djdt-color" style="background-color:rgb({{ info.rgb_color|join:', ' }})"></span> {{ alias }}</strong>
6+
{{ info.time_spent|floatformat:"2" }} ms ({% blocktrans count info.num_queries as num %}{{ num }} query{% plural %}{{ num }} queries{% endblocktrans %}
7+
{% if info.similar_count %}
8+
{% blocktrans with count=info.similar_count trimmed %}
9+
including <abbr title="Similar queries are queries with the same SQL, but potentially different parameters.">{{ count }} similar</abbr>
10+
{% endblocktrans %}
11+
{% if info.duplicate_count %}
12+
{% blocktrans with dupes=info.duplicate_count trimmed %}
13+
and <abbr title="Duplicate queries are identical to each other: they execute exactly the same SQL and parameters.">{{ dupes }} duplicates</abbr>
1114
{% endblocktrans %}
12-
{% if info.duplicate_count %}
13-
{% blocktrans with dupes=info.duplicate_count trimmed %}
14-
and <abbr title="Duplicate queries are identical to each other: they execute exactly the same SQL and parameters.">{{ dupes }} duplicates</abbr>
15-
{% endblocktrans %}
16-
{% endif %}
17-
{% endif %})
18-
</li>
19-
{% endfor %}
20-
</ul>
21-
</div>
15+
{% endif %}
16+
{% endif %})
17+
</li>
18+
{% endfor %}
19+
</ul>
2220

2321
{% if queries %}
2422
<table>

0 commit comments

Comments
 (0)