Skip to content

Commit 1338ad6

Browse files
Merge branch '5.4' into 6.2
* 5.4: Do not check errored definitions’ type [HttpKernel] Fix restoring surrogate content from cache [HttpClient] Fix getting through proxies via CONNECT Remove legacy filters remnants
2 parents 24b6f43 + 42dbb75 commit 1338ad6

File tree

2 files changed

+4
-42
lines changed

2 files changed

+4
-42
lines changed

Resources/views/Collector/translation.html.twig

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,30 +155,28 @@
155155
</div>
156156
</div>
157157

158-
<script>Sfjs.createFilters();</script>
159-
160158
{% endblock messages %}
161159
{% endif %}
162160

163161
{% endblock %}
164162

165163
{% macro render_table(messages, is_fallback) %}
166-
<table data-filters>
164+
<table>
167165
<thead>
168166
<tr>
169-
<th data-filter="locale">Locale</th>
167+
<th>Locale</th>
170168
{% if is_fallback %}
171169
<th>Fallback locale</th>
172170
{% endif %}
173-
<th data-filter="domain">Domain</th>
171+
<th>Domain</th>
174172
<th>Times used</th>
175173
<th>Message ID</th>
176174
<th>Message Preview</th>
177175
</tr>
178176
</thead>
179177
<tbody>
180178
{% for message in messages %}
181-
<tr data-filter-locale="{{ message.locale }}" data-filter-domain="{{ message.domain }}">
179+
<tr>
182180
<td class="font-normal text-small nowrap">{{ message.locale }}</td>
183181
{% if is_fallback %}
184182
<td class="font-normal text-small nowrap">{{ message.fallbackLocale|default('-') }}</td>

Resources/views/Profiler/profiler.css.twig

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1637,42 +1637,6 @@ tr.status-warning td {
16371637
display: block;
16381638
}
16391639

1640-
{# Filters
1641-
========================================================================= #}
1642-
[data-filters] { position: relative; }
1643-
[data-filtered] { cursor: pointer; }
1644-
[data-filtered]:after { content: '\00a0\25BE'; }
1645-
[data-filtered]:hover .filter-list li { display: inline-flex; }
1646-
[class*="filter-hidden-"] { display: none; }
1647-
.filter-list { position: absolute; border: var(--border); box-shadow: var(--shadow); margin: 0; padding: 0; display: flex; flex-direction: column; }
1648-
.filter-list :after { content: ''; }
1649-
.filter-list li {
1650-
background: var(--tab-disabled-background);
1651-
border-bottom: var(--border);
1652-
color: var(--tab-disabled-color);
1653-
display: none;
1654-
list-style: none;
1655-
margin: 0;
1656-
padding: 5px 10px;
1657-
text-align: left;
1658-
font-weight: normal;
1659-
}
1660-
.filter-list li.active {
1661-
background: var(--tab-background);
1662-
color: var(--tab-color);
1663-
}
1664-
.filter-list li.last-active {
1665-
background: var(--tab-active-background);
1666-
color: var(--tab-active-color);
1667-
}
1668-
1669-
.filter-list-level li { cursor: s-resize; }
1670-
.filter-list-level li.active { cursor: n-resize; }
1671-
.filter-list-level li.last-active { cursor: default; }
1672-
.filter-list-level li.last-active:before { content: '\2714\00a0'; }
1673-
.filter-list-choice li:before { content: '\2714\00a0'; color: transparent; }
1674-
.filter-list-choice li.active:before { color: unset; }
1675-
16761640
{# Twig panel
16771641
========================================================================= #}
16781642
#twig-dump pre {

0 commit comments

Comments
 (0)