Skip to content

Commit f49750d

Browse files
federicobondfedericobond
committed
Update more styles
1 parent 18924ee commit f49750d

File tree

6 files changed

+34
-47
lines changed

6 files changed

+34
-47
lines changed

‎debug_toolbar/panels/settings.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from django.utils.translation import gettext_lazy as _
22
from django.views.debug import get_default_exception_reporter_filter
3-
3+
from pprint import pformat
44
from debug_toolbar.panels import Panel
55
from debug_toolbar.sanitize import force_str
66

@@ -27,7 +27,7 @@ def generate_stats(self, request, response):
2727
self.record_stats(
2828
{
2929
"settings": {
30-
key: force_str(value)
30+
key: pformat(value)
3131
for key, value in sorted(get_safe_settings().items())
3232
}
3333
}

‎debug_toolbar/static/debug_toolbar/css/toolbar.css‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@
1919
--djdt-background-color: white;
2020
--djdt-panel-content-background-color: #eee;
2121
--djdt-panel-content-table-background-color: var(--djdt-background-color);
22-
--djdt-panel-content-table-alternate-background-color: #fafafa;
2322
--djdt-panel-title-background-color: #ffc;
2423
--djdt-djdt-panel-content-table-strip-background-color: #f5f5f5;
2524
--djdt-highlighted-background-color: #ffc;
2625
--djdt-toggle-template-background-color: #bbb;
2726

2827
--djdt-sql-font-color: #333;
29-
--djdt-pre-text-color: #555;
28+
--djdt-pre-text-color: #666;
3029
--djdt-path-and-locals: black;
30+
--djdt-stack-color: #666;
3131
--djdt-stack-span-color: black;
3232
--djdt-template-highlight-color: #333;
3333

3434
--djdt-table-header-color: #666;
3535
--djdt-table-header-background-color: #f8f8f8;
36-
--djdt-table-border-color: #e8e8e8;
36+
--djdt-table-border-color: #ddd;
3737
--djdt-button-border-color: #ccc;
3838
--djdt-button-hover-border-color: #666;
3939
--djdt-pre-border-color: var(--djdt-table-border-color);
@@ -45,15 +45,15 @@
4545
--djdt-background-color: #121212;
4646
--djdt-panel-content-background-color: #121212;
4747
--djdt-panel-content-table-background-color: var(--djdt-background-color);
48-
--djdt-panel-content-table-alternate-background-color: #171717;
4948
--djdt-panel-title-background-color: #417690;
50-
--djdt-djdt-panel-content-table-strip-background-color: #324154ff;
49+
--djdt-djdt-panel-content-table-strip-background-color: #171717;
5150
--djdt-highlighted-background-color: #00363a;
5251
--djdt-toggle-template-background-color: #282755;
5352

5453
--djdt-sql-font-color: var(--djdt-font-color);
5554
--djdt-pre-text-color: var(--djdt-font-color);
5655
--djdt-path-and-locals: #65758cff;
56+
--djdt-stack-color: #888;
5757
--djdt-stack-span-color: #ccc;
5858
--djdt-template-highlight-color: var(--djdt-stack-span-color);
5959

@@ -472,12 +472,13 @@
472472
top: 4px;
473473
right: 15px;
474474
line-height: 16px;
475-
border: 6px solid #ddd;
475+
border: 3px solid #ddd;
476476
border-radius: 50%;
477-
background: #fff;
477+
background: transparent;
478+
box-shadow: none;
478479
color: #ddd;
479-
font-weight: 900;
480-
font-size: 20px;
480+
font-weight: 400;
481+
font-size: 26px;
481482
height: 36px;
482483
width: 36px;
483484
padding: 0 0 5px;
@@ -543,6 +544,8 @@
543544

544545
#djDebug .highlight {
545546
color: var(--djdt-font-color);
547+
padding: 10px 13px;
548+
border: 1px solid var(--djdt-table-border-color);
546549
}
547550
#djDebug .highlight .err {
548551
color: var(--djdt-font-color);
@@ -561,6 +564,9 @@ To regenerate:
561564
from pygments.formatters import HtmlFormatter
562565
print(HtmlFormatter(wrapcode=True).get_style_defs())
563566
*/
567+
#djDebug[data-theme="light"] .highlight {
568+
background: #fff;
569+
}
564570
#djDebug[data-theme="light"] .highlight pre {
565571
line-height: 125%;
566572
}
@@ -1084,7 +1090,7 @@ To regenerate:
10841090
}
10851091

10861092
#djDebug .djDetailsRow {
1087-
background-color: var(--djdt-panel-content-table-alternate-background-color);
1093+
background-color: var(--djdt-djdt-panel-content-table-strip-background-color);
10881094
}
10891095

10901096
#djDebug .djDebugRowWarning .djdt-time {
@@ -1122,25 +1128,23 @@ To regenerate:
11221128
}
11231129

11241130
#djDebug .djdt-stack {
1125-
color: var(--djdt-stack-span-color);
1131+
color: var(--djdt-stack-color);
11261132
}
11271133

11281134
#djDebug .djdt-stack span {
11291135
color: var(--djdt-stack-span-color);
1130-
font-weight: bold;
1136+
font-weight: 500;
11311137
}
11321138
#djDebug .djdt-stack pre.djdt-locals,
11331139
#djDebug .djdt-stack pre.djdt-locals span {
11341140
color: var(--djdt-path-and-locals);
11351141
font-weight: normal;
11361142
}
11371143
#djDebug .djdt-stack .djdt-code {
1144+
font-size: 14px;
11381145
font-weight: normal;
11391146
margin: 5px 0 10px;
1140-
border: 1px solid var(--djdt-pre-border-color);
1141-
border-collapse: collapse;
1142-
background-color: var(--djdt-background-color);
1143-
padding: 5px;
1147+
color: var(--djdt-stack-color);
11441148
}
11451149
#djDebug .djdt-stack pre.djdt-locals {
11461150
margin: 0 27px 27px 27px;

‎debug_toolbar/static/debug_toolbar/js/toolbar.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,15 @@ const djdt = {
116116
const isSelected = container.classList.contains("djSelected");
117117
container.classList.toggle("djSelected", !isSelected);
118118
container.classList.toggle("djUnselected", isSelected);
119+
120+
for (const el of this.querySelectorAll(".djDebugCollapsed")) {
121+
$$.toggle(el, !isSelected);
122+
}
123+
for (const el of this.querySelectorAll(
124+
".djDebugUncollapsed"
125+
)) {
126+
$$.toggle(el, isSelected);
127+
}
119128
});
120129

121130
// Used by the cache, profiling and SQL panels

‎debug_toolbar/templates/debug_toolbar/panels/history_tr.html‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,7 @@
1010
<p>{{ history_context.history_stats.request_url|truncatechars:100|escape }}</p>
1111
</td>
1212
<td>
13-
<button type="button" class="djToggleSwitch" data-toggle-name="historyMain" data-toggle-id="{{ request_id }}">+</button>
14-
<div class="djUnselected djToggleDetails_{{ request_id }}">
15-
<table>
16-
<colgroup>
17-
<col class="djdt-width-20">
18-
<col>
19-
</colgroup>
20-
<thead>
21-
<tr>
22-
<th>{% translate "Variable" %}</th>
23-
<th>{% translate "Value" %}</th>
24-
</tr>
25-
</thead>
26-
<tbody>
27-
{% for key, value in history_context.history_stats.data.items %}
28-
<tr>
29-
<td><code>{{ key|pprint }}</code></td>
30-
<td><code>{{ value|pprint }}</code></td>
31-
</tr>
32-
{% empty %}
33-
<tr>
34-
<td colspan="2">No data</td>
35-
</tr>
36-
{% endfor %}
37-
</tbody>
38-
</table>
39-
</div>
13+
{% if history_context.history_stats.data %}{{ history_context.history_stats.data }}{% endif %}
4014
</td>
4115
<td>
4216
<p>

‎debug_toolbar/templates/debug_toolbar/panels/settings.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
{% for name, value in settings.items %}
1111
<tr>
1212
<td>{{ name }}</td>
13-
<td><code>{{ value|pprint }}</code></td>
13+
<td><code>{{ value }}</code></td>
1414
</tr>
1515
{% endfor %}
1616
</tbody>

‎debug_toolbar/templates/debug_toolbar/panels/templates.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ <h4>{% blocktranslate count template_count=templates|length %}Template{% plural
2525
<td class="djToggleRow" data-toggle-name="templateDetails" data-toggle-id="{{ template.template.name }}">
2626
<strong><a class="remoteCall" href="{% url 'djdt:template_source' %}?template={{ template.template.name }}&amp;template_origin={{ template.template.origin_hash }}">{{ template.template.name|addslashes }}</a></strong>
2727
<br>
28-
<samp style="color: #666;">{{ template.template.origin_name|addslashes }}</samp>
28+
<samp style="color: var(--djdt-stack-span-color);">{{ template.template.origin_name|addslashes }}</samp>
2929
</td>
3030
<td>
3131
<a class="djButton remoteCall toggleTemplate" href="{% url 'djdt:template_source' %}?template={{ template.template.name }}&amp;template_origin={{ template.template.origin_hash }}">{% translate "Source" %}</a>

0 commit comments

Comments
 (0)