Skip to content

Commit 1b5785a

Browse files
committed
prefix timeline and query with djdt to avoid conflicting class names
1 parent 374a046 commit 1b5785a

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

debug_toolbar/static/debug_toolbar/css/toolbar.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@
503503
#djDebug .highlight .s2 { color:#333 } /* Literal.String.Double */
504504
#djDebug .highlight .cp { color:#333 } /* Comment.Preproc */
505505

506-
#djDebug .timeline {
506+
#djDebug .djdt-timeline {
507507
width: 30%;
508508
}
509509
#djDebug .djDebugTimeline {

debug_toolbar/static/debug_toolbar/js/toolbar.timer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
if (endStat) {
2525
// Render a start through end bar
2626
$row.html('<td>' + stat.replace('Start', '') + '</td>' +
27-
'<td class="timeline"><div class="djDebugTimeline"><div class="djDebugLineChart"><strong>&#160;</strong></div></div></td>' +
27+
'<td class="djdt-timeline"><div class="djDebugTimeline"><div class="djDebugLineChart"><strong>&#160;</strong></div></div></td>' +
2828
'<td>' + (perf.timing[stat] - timingOffset) + ' (+' + (perf.timing[endStat] - perf.timing[stat]) + ')</td>');
2929
$row.find('strong').css({width: getCSSWidth(stat, endStat)});
3030
} else {
3131
// Render a point in time
3232
$row.html('<td>' + stat + '</td>' +
33-
'<td class="timeline"><div class="djDebugTimeline"><div class="djDebugLineChart"><strong>&#160;</strong></div></div></td>' +
33+
'<td class="djdt-timeline"><div class="djDebugTimeline"><div class="djDebugLineChart"><strong>&#160;</strong></div></div></td>' +
3434
'<td>' + (perf.timing[stat] - timingOffset) + '</td>');
3535
$row.find('strong').css({width: 2});
3636
}

debug_toolbar/templates/debug_toolbar/panels/sql.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<thead>
1919
<tr>
2020
<th class="djdt-color">&#160;</th>
21-
<th class="query" colspan="2">{% trans "Query" %}</th>
22-
<th class="timeline">{% trans "Timeline" %}</th>
21+
<th class="djdt-query" colspan="2">{% trans "Query" %}</th>
22+
<th class="djdt-timeline">{% trans "Timeline" %}</th>
2323
<th class="djdt-time">{% trans "Time (ms)" %}</th>
2424
<th class="djdt-actions">{% trans "Action" %}</th>
2525
</tr>
@@ -31,7 +31,7 @@
3131
<td class="djdt-toggle">
3232
<a class="djToggleSwitch" data-toggle-name="sqlMain" data-toggle-id="{{ forloop.counter }}" data-toggle-open="+" data-toggle-close="-" href="">+</a>
3333
</td>
34-
<td class="query">
34+
<td class="djdt-query">
3535
<div class="djDebugSqlWrap">
3636
<div class="djDebugSql">{{ query.sql|safe }}</div>
3737
</div>
@@ -42,7 +42,7 @@
4242
</strong>
4343
{% endif %}
4444
</td>
45-
<td class="timeline">
45+
<td class="djdt-timeline">
4646
<div class="djDebugTimeline"><div class="djDebugLineChart{% if query.is_slow %} djDebugLineChartWarning{% endif %}" data-left="{{ query.start_offset|unlocalize }}%"><strong data-width="{{ query.width_ratio_relative|unlocalize }}%" data-background-color="{{ query.trace_color }}">{{ query.width_ratio }}%</strong></div></div>
4747
</td>
4848
<td class="djdt-time">

debug_toolbar/templates/debug_toolbar/panels/timer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ <h4>{% trans "Browser timing" %}</h4>
3333
<thead>
3434
<tr>
3535
<th>{% trans "Timing attribute" %}</th>
36-
<th class="timeline">{% trans "Timeline" %}</th>
36+
<th class="djdt-timeline">{% trans "Timeline" %}</th>
3737
<th class="djdt-time">{% trans "Milliseconds since navigation start (+length)" %}</th>
3838
</tr>
3939
</thead>

0 commit comments

Comments
 (0)