8000 bug #30860 [Profiler] Fix dark theme elements color (dFayet) · symfony/symfony@07a1095 · GitHub
[go: up one dir, main page]
Skip to content

Commit 07a1095

Browse files
fabpotfabpot
committed
bug #30860 [Profiler] Fix dark theme elements color (dFayet)
This PR was squashed before being merged into the 4.2 branch (closes #30860). Discussion ---------- [Profiler] Fix dark theme elements color | Q | A | ------------- | --- | Branch? | 4.2 | Bug fix? | yes | New feature? | no <!-- don't forget to update src/**/CHANGELOG.md files --> | BC breaks? | no <!-- see https://symfony.com/bc --> | Deprecations? | no <!-- don't forget to update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Tests pass? | yes <!-- please add some, will be required by reviewers --> | Fixed tickets | #29194 <!-- #-prefixed issue number(s), if any --> | License | MIT | Doc PR | - I think the color handling of the code highlighted (exceptions, ...) is quite questionnable, but as we use the `highlight_file()` function, I don't really see an other way to handle it, tell me what you think. ### Before/After **Form** ![Capture d’écran de 2019-04-04 10-07-18](https://user-images.githubusercontent.com/7721219/55539945-2cfe0580-56c2-11e9-8e5c-a4b6352ab12d.png) ![Capture d’écran de 2019-04-04 10-03-27](https://user-images.githubusercontent.com/7721219/55539906-15268180-56c2-11e9-90e7-326cc1c01ccd.png) **Twig render graph** ![Capture d’écran de 2019-04-04 10-07-36](https://user-images.githubusercontent.com/7721219/55539969-3b4c2180-56c2-11e9-9064-1fd10bf1da02.png) ![Capture d’écran de 2019-04-06 19-37-02](https://user-images.githubusercontent.com/7721219/55673094-693c8c00-58a3-11e9-90a4-76f6b312d516.png) **Exceptions** ![Capture d’écran de 2019-04-04 10-08-19](https://user-images.githubusercontent.com/7721219/55540012-51f27880-56c2-11e9-930b-98d680093e49.png) ![Capture d’écran de 2019-04-06 09-39-27](https://user-images.githubusercontent.com/7721219/55667421-4f2b8b00-585c-11e9-81c7-dc09bd982375.png) **Doctrine queries** ![Capture d’écran de 2019-04-04 10-08-37](https://user-images.githubusercontent.com/7721219/55540059-73536480-56c2-11e9-9b0d-ea691a16a1a5.png) ![Capture d’écran de 2019-04-04 10-04-47](https://user-images.githubusercontent.com/7721219/55540068-78b0af00-56c2-11e9-88f7-2181800006a7.png) Commits ------- 8a9c2c8 [Profiler] Fix dark theme elements color
2 parents 4c3a48a + 8a9c2c8 commit 07a1095

File tree

8 files changed

+105
-49
lines changed

8 files changed

+105
-49
lines changed

‎src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,12 @@ public function getHtmlCallGraph()
127127
'<span style="background-color: #ffd">',
128128
'<span style="color: #d44">',
129129
'<span style="background-color: #dfd">',
130+
'<span style="background-color: #ddf">',
130131
], [
131132
'<span class="status-warning">',
132133
'<span class="status-error">',
133134
'<span class="status-success">',
135+
'<span class="status-info">',
134136
], $dump);
135137

136138
return new Markup($dump, 'UTF-8');

‎src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.html.twig

Copy file name to clipboard
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
{% if trace.file|default(false) %}
2626
<div id="trace-html-{{ prefix ~ '-' ~ i }}" class="trace-code sf-toggle-content">
2727
{{ trace.file|file_excerpt(trace.line, 5)|replace({
28-
'#DD0000': '#183691',
29-
'#007700': '#a71d5d',
30-
'#0000BB': '#222222',
31-
'#FF8000': '#969896'
28+
'#DD0000': 'var(--highlight-string)',
29+
'#007700': 'var(--highlight-keyword)',
30+
'#0000BB': 'var(--highlight-default)',
31+
'#FF8000': 'var(--highlight-comment)'
3232
})|raw }}
3333
</div>
3434
{% endif %}

‎src/Symfony/Bundle/TwigBundle/Resources/views/exception.css.twig

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,15 @@
2323
--table-border: #e0e0e0;
2424
--table-background: #fff;
2525
--table-header: #e0e0e0;
26+
--tree-active-background: #F7E5A1;
27+
--exception-title-color: var(--base-2);
2628
--shadow: 0px 0px 1px rgba(128, 128, 128, .2);
2729
--border: 1px solid #e0e0e0;
30+
--background-error: var(--color-error);
31+
--highlight-comment: #969896;
32+
--highlight-default: #222222;
33+
--highlight-keyword: #a71d5d;
34+
--highlight-string: #183691;
2835
--base-0: #fff;
2936
--base-1: #f5f5f5;
3037
--base-2: #e0e0e0;
@@ -40,7 +47,7 @@ html {
4047
/* always display the vertical scrollbar to avoid jumps when toggling contents */
4148
overflow-y: scroll;
4249
}
43-
body { background-color: #F9F9F9; color: #222; font: 14px/1.4 Helvetica, Arial, sans-serif; padding-bottom: 45px; }
50+
body { background-color: #F9F9F9; color: var(--base-6); font: 14px/1.4 Helvetica, Arial, sans-serif; padding-bottom: 45px; }
4451

4552
a { cursor: pointer; text-decoration: none; }
4653
a:hover { text-decoration: underline; }
@@ -49,9 +56,9 @@ abbr[title] { border-bottom: none; cursor: help; text-decoration: none; }
4956
code, pre { font: 13px/1.5 Consolas, Monaco, Menlo, "Ubuntu Mono", "Liberation Mono", monospace; }
5057

5158
table, tr, th, td { background: #FFF; border-collapse: collapse; vertical-align: top; }
52-
table { background: #FFF; border: 1px solid #E0E0E0; box-shadow: 0px 0px 1px rgba(128, 128, 128, .2); margin: 1em 0; width: 100%; }
53-
table th, table td { border: solid #E0E0E0; border-width: 1px 0; padding: 8px 10px; }
54-
table th { background-color: #E0E0E0; font-weight: bold; text-align: left; }
59+
table { background: #FFF; border: var(--border); box-shadow: 0px 0px 1px rgba(128, 128, 128, .2); margin: 1em 0; width: 100%; }
60+
table th, table td { border: solid var(--base-2); border-width: 1px 0; padding: 8px 10px; }
61+
table th { background-color: var(--base-2); font-weight: bold; text-align: left; }
5562

5663
.m-t-5 { margin-top: 5px; }
5764
.hidden-xs-down { display: none; }
@@ -65,15 +72,15 @@ table th { background-color: #E0E0E0; font-weight: bold; text-align: left; }
6572
.text-small { font-size: 12px !important; }
6673
.text-muted { color: #999; }
6774
.text-bold { font-weight: bold; }
68-
.empty { border: 4px dashed #E0E0E0; color: #999; margin: 1em 0; padding: .5em 2em; }
75+
.empty { border: 4px dashed var(--base-2); color: #999; margin: 1em 0; padding: .5em 2em; }
6976

7077
.status-success { background: rgba(94, 151, 110, 0.3); }
7178
.status-warning { background: rgba(240, 181, 24, 0.3); }
7279
.status-error { background: rgba(176, 65, 62, 0.2); }
7380
.status-success td, .status-warning td, .status-error td { background: transparent; }
7481
tr.status-error td, tr.status-warning td { border-bottom: 1px solid #FAFAFA; border-top: 1px solid #FAFAFA; }
7582
.status-warning .colored { color: #A46A1F; }
76-
.status-error .colored { color: #B0413E; }
83+
.status-error .colored { color: var(--color-error); }
7784

7885
.sf-toggle { cursor: pointer; }
7986
.sf-toggle-content { -moz-transition: display .25s ease; -webkit-transition: display .25s ease; transition: display .25s ease; }
@@ -91,7 +98,7 @@ thead.sf-toggle-content.sf-toggle-visible, tbody.sf-toggle-content.sf-toggle-vis
9198
.tab-navigation li.active .badge { background-color: var(--base-5); color: var(--base-2); }
9299
.tab-content > *:first-child { margin-top: 0; }
93100
.tab-navigation li .badge.status-warning { background: var(--color-warning); color: #FFF; }
94-
.tab-navigation li .badge.status-error { background: var(--color-error); color: #FFF; }
101+
.tab-navigation li .badge.status-error { background: var(--background-error); color: #FFF; }
95102
.sf-tabs .tab:not(:first-child) { display: none; }
96103

97104
[data-filters] { position: relative; }
@@ -131,7 +138,7 @@ thead.sf-toggle-content.sf-toggle-visible, tbody.sf-toggle-content.sf-toggle-vis
131138
.container { max-width: 1024px; margin: 0 auto; padding: 0 15px; }
132139
.container::after { content: ""; display: table; clear: both; }
133140

134-
header { background-color: #222; color: rgba(255, 255, 255, 0.75); font-size: 13px; height: 33px; line-height: 33px; padding: 0; }
141+
header { background-color: var(--base-6); color: rgba(255, 255, 255, 0.75); font-size: 13px; height: 33px; line-height: 33px; padding: 0; }
135142
header .container { display: flex; justify-content: space-between; }
136143
.logo { flex: 1; font-size: 13px; font-weight: normal; margin: 0; padding: 0; }
137144
.logo svg { height: 18px; width: 18px; opacity: .8; vertical-align: -5px; }
@@ -142,7 +149,7 @@ header .container { display: flex; justify-content: space-between; }
142149
.help-link a:hover { color: #EEE; text-decoration: none; }
143150
.help-link a:hover svg { opacity: .9; }
144151

145-
.exception-summary { background: #B0413E; border-bottom: 2px solid rgba(0, 0, 0, 0.1); border-top: 1px solid rgba(0, 0, 0, .3); flex: 0 0 auto; margin-bottom: 15px; }
152+
.exception-summary { background: var(--background-error); border-bottom: 2px solid rgba(0, 0, 0, 0.1); border-top: 1px solid rgba(0, 0, 0, .3); flex: 0 0 auto; margin-bottom: 15px; }
146153
.exception-metadata { background: rgba(0, 0, 0, 0.1); padding: 7px 0; }
147154
.exception-metadata .container { display: flex; flex-direction: row; justify-content: space-between; }
148155
.exception-metadata h2, .exception-metadata h2 > a { color: rgba(255, 255, 255, 0.8); font-size: 13px; font-weight: 400; margin: 0; }
@@ -162,36 +169,36 @@ header .container { display: flex; justify-content: space-between; }
162169
.exception-illustration { flex-basis: 111px; flex-shrink: 0; height: 66px; margin-left: 15px; opacity: .7; }
163170

164171
.trace + .trace { margin-top: 30px; }
165-
.trace-head { background-color: #e0e0e0; padding: 10px; position: relative; }
166-
.trace-head .trace-class { color: #222; font-size: 18px; font-weight: bold; line-height: 1.3; margin: 0; position: relative; }
172+
.trace-head { background-color: var(--base-2); padding: 10px; position: relative; }
173+
.trace-head .trace-class { color: var(--base-6); font-size: 18px; font-weight: bold; line-height: 1.3; margin: 0; position: relative; }
167174
.trace-head .trace-namespace { color: #999; display: block; font-size: 13px; }
168175
.trace-head .icon { position: absolute; right: 0; top: 0; }
169176
.trace-head .icon svg { height: 24px; width: 24px; }
170177

171-
.trace-details { background: #FFF; border: 1px solid #E0E0E0; box-shadow: 0px 0px 1px rgba(128, 128, 128, .2); margin: 1em 0; table-layout: fixed; }
178+
.trace-details { background: var(--base-0); border: var(--border); box-shadow: 0px 0px 1px rgba(128, 128, 128, .2); margin: 1em 0; table-layout: fixed; }
172179

173180
.trace-message { font-size: 14px; font-weight: normal; margin: .5em 0 0; }
174181

175182
.trace-line { position: relative; padding-top: 8px; padding-bottom: 8px; }
176-
.trace-line + .trace-line { border-top: 1px solid #e0e0e0; }
177-
.trace-line:hover { background: #F5F5F5; }
178-
.trace-line a { color: #222; }
183+
.trace-line + .trace-line { border-top: var(--border); }
184+
.trace-line:hover { background: var(--base-1); }
185+
.trace-line a { color: var(--base-6); }
179186
.trace-line .icon { opacity: .4; position: absolute; left: 10px; top: 11px; }
180187
.trace-line .icon svg { height: 16px; width: 16px; }
181188
.trace-line-header { padding-left: 36px; padding-right: 10px; }
182189

183-
.trace-file-path, .trace-file-path a { color: #222; font-size: 13px; }
184-
.trace-class { color: #B0413E; }
190+
.trace-file-path, .trace-file-path a { color: var(--base-6); font-size: 13px; }
191+
.trace-class { color: var(--color-error); }
185192
.trace-type { padding: 0 2px; }
186-
.trace-method { color: #B0413E; font-weight: bold; }
193+
.trace-method { color: var(--color-error); font-weight: bold; }
187194
.trace-arguments { color: #777; font-weight: normal; padding-left: 2px; }
188195

189-
.trace-code { background: #FFF; font-size: 12px; margin: 10px 10px 2px 10px; padding: 10px; overflow-x: auto; white-space: nowrap; }
196+
.trace-code { background: var(--base-0); font-size: 12px; margin: 10px 10px 2px 10px; padding: 10px; overflow-x: auto; white-space: nowrap; }
190197
.trace-code ol { margin: 0; float: left; }
191198
.trace-code li { color: #969896; margin: 0; padding-left: 10px; float: left; width: 100%; }
192199
.trace-code li + li { margin-top: 5px; }
193-
.trace-code li.selected { background: #F7E5A1; margin-top: 2px; }
194-
.trace-code li code { color: #222; white-space: nowrap; }
200+
.trace-code li.selected { background: var(--trace-selected-background); margin-top: 2px; }
201+
.trace-code li code { color: var(--base-6); white-space: nowrap; }
195202

196203
.trace-as-text .stacktrace { line-height: 1.8; margin: 0 0 15px; white-space: pre-wrap; }
197204

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.css.twig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
}
1111

1212
.exception-summary {
13-
background: #FFF;
14-
border: 1px solid #E0E0E0;
13+
background: var(--base-0);
14+
border: var(--border);
1515
box-shadow: 0 0 1px rgba(128, 128, 128, .2);
1616
margin: 1em 0;
1717
padding: 10px;
@@ -21,7 +21,7 @@
2121
}
2222

2323
.exception-message {
24-
color: #B0413E;
24+
color: var(--color-error);
2525
}
2626

2727
.exception-metadata,

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/form.html.twig

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,11 @@
131131
.tree .tree-inner:hover {
132132
background: #dfdfdf;
133133
}
134+
.tree .tree-inner:hover span:not(.has-error) {
135+
color: var(--base-0);
136+
}
134137
.tree .tree-inner.active, .tree .tree-inner.active:hover {
135-
background: #E0E0E0;
138+
background: var(--tree-active-background);
136139
font-weight: bold;
137140
}
138141
.tree .tree-inner.active .toggle-icon, .tree .tree-inner:hover .toggle-icon, .tree .tree-inner.active:hover .toggle-icon {
@@ -153,25 +156,25 @@
153156
}
154157
.badge-error {
155158
float: right;
156-
background: #B0413E;
159+
background: var(--background-error);
157160
color: #FFF;
158161
padding: 1px 4px;
159162
font-size: 10px;
160163
font-weight: bold;
161164
vertical-align: middle;
162165
}
163166
.has-error {
164-
color: #B0413E;
167+
color: var(--color-error);
165168
}
166169
.errors h3 {
167-
color: #B0413E;
170+
color: var(--color-error);
168171
}
169172
.errors th {
170-
background: #B0413E;
173+
background: var(--background-error);
171174
color: #FFF;
172175
}
173176
.errors .toggle-icon {
174-
background-color: #B0413E;
177+
background-color: var(--background-error);
175178
}
176179
h3 a, h3 a:hover, h3 a:focus {
177180
color: inherit;
@@ -183,6 +186,20 @@
183186
h3.form-data-type + h3 {
184187
margin-top: 1em;
185188
}
189+
.theme-dark .toggle-icon {
190+
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAgBAMAAADpp+X/AAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAVUExURUdwTH+Ag0lNUZiYmGRmbP///zU5P2n9VV4AAAAFdFJOUwCv+yror0g1sQAAAE1JREFUGNNjSFM0YGBgEEpjSGEAAzcGBQiDiUEAwmBkMIAwmBmwgVAgQGWgA7h2uIFwK+CWwp1BpHtYA6DuATEYkBlY3IOmBq6dCPcAAKMtEEs3tfChAAAAAElFTkSuQmCC');
191+
}
192+
.theme-dark .toggle-icon.empty {
193+
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAASUExURUdwTDI3OzQ5PS4uLjU3PzU5P4keoyIAAAAFdFJOUwBApgtzrnKGEwAAADJJREFUCNdjCFU0YGBgEAplCGEAA1cGBQiDiUEAwmBkMIAwmBnIA3DtcAPhVsAthTkDACsZBBmrTTSxAAAAAElFTkSuQmCC');
194+
}
195+
.theme-dark .tree .tree-inner.active .toggle-icon, .theme-dark .tree .tree-inner:hover .toggle-icon, .theme-dark .tree .tree-inner.active:hover .toggle-icon {
196+
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAgBAMAAADpp+X/AAAAD1BMVEVHcEx/gIOYmJiZmZn///+IJ2wIAAAAA3RSTlMAryoIUq0uAAAAUElEQVQY02NgYFQ2NjYWYGBgMAYDBgZmCMOAQRjCMGRQhjCMoEqAipAYLkCAykBXA9cONxBuBdxShDOIc4+JM9Q9IIYxMgOLe9DUwLUT4R4AznguG0qfEa0AAAAASUVORK5CYII=');
197+
background-color: transparent;
198+
}
199+
.theme-dark .tree .tree-inner.active .toggle-icon.empty, .theme-dark .tree .tree-inner:hover .toggle-icon.empty, .theme-dark .tree .tree-inner.active:hover .toggle-icon.empty {
200+
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAgMAAABinRfyAAAACVBMVEVHcEwyNzuqqqrd9nIgAAAAAnRSTlMAQABPjKgAAAArSURBVAjXY2BctcqBgWvVqgUMWqtWrWDIWrVqJcMqICCGACsGawMbADIKANflJYEoGMqtAAAAAElFTkSuQmCC');
201+
background-color: transparent;
202+
}
186203
</style>
187204
{% endblock %}
188205

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/messenger.html.twig

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,12 @@
144144

145145
<div class="hidden" id="sf-trace-{{ discr }}-{{ loop.index0 }}">
146146
<div class="trace">
147-
{{ caller.file|file_excerpt(caller.line) }}
147+
{{ caller.file|file_excerpt(caller.line)|replace({
148+
'#DD0000': 'var(--highlight-string)',
149+
'#007700': 'var(--highlight-keyword)',
150+
'#0000BB': 'var(--highlight-default)',
151+
'#FF8000': 'var(--highlight-comment)'
152+
})|raw }}
148153
</div>
149154
</div>
150155
</td>

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/validator.html.twig

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,12 @@
5959

6060
<div class="sf-validator-compact hidden" id="sf-trace-{{ loop.index0 }}">
6161
<div class="trace">
62-
{{ caller.file|file_excerpt(caller.line) }}
62+
{{ caller.file|file_excerpt(caller.line)|replace({
63+
'#DD0000': 'var(--highlight-string)',
64+
'#007700': 'var(--highlight-keyword)',
65+
'#0000BB': 'var(--highlight-default)',
66+
'#FF8000': 'var(--highlight-comment)'
67+
})|raw }}
6368
</div>
6469
</div>
6570

0 commit comments

Comments
 (0)
0