Skip to content

Commit e6052cf

Browse files
kenjiskenjis
authored
Merge pull request #8595 from ddevsr/debug-bar-scroll-top
fix: [DebugBar] scroll to top
2 parents 9342e38 + 0fc5485 commit e6052cf

File tree

3 files changed

+50
-38
lines changed

3 files changed

+50
-38
lines changed

‎admin/css/debug-toolbar/toolbar.scss

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
@import '_mixins';
1414
@import '_settings';
1515

16-
1716
// DEBUG ICON
1817
// ========================================================================== */
1918

@@ -36,6 +35,8 @@
3635
clear: both;
3736
text-align: center;
3837

38+
cursor: pointer;
39+
3940
a svg {
4041
margin: 8px;
4142
max-width: 20px;
@@ -56,6 +57,10 @@
5657
// DEBUG BAR
5758
// ========================================================================== */
5859

60+
.debug-bar-vars {
61+
cursor: pointer;
62+
}
63+
5964
#debug-bar {
6065
// Position
6166
bottom: 0;
@@ -227,21 +232,21 @@
227232
// The toolbar preferences
228233
#toolbar-position,
229234
#toolbar-theme {
230-
a {
231-
padding: 0 6px;
232-
display: inline-flex;
233-
vertical-align: top;
235+
padding: 0 6px;
236+
display: inline-flex;
237+
vertical-align: top;
238+
cursor: pointer;
234239

235-
&:hover {
236-
text-decoration: none;
237-
}
240+
&:hover {
241+
text-decoration: none;
238242
}
239243
}
240244

241245
// The "Open/Close" toggle
242246
#debug-bar-link {
243247
display: flex;
244248
padding: 6px;
249+
cursor: pointer;
245250
}
246251

247252
// The toolbar menus
@@ -518,43 +523,43 @@
518523
.debug-bar-dtableRow {
519524
display: table-row;
520525
}
521-
526+
522527
.debug-bar-dinlineBlock {
523528
display: inline-block;
524529
}
525-
530+
526531
.debug-bar-pointer {
527532
cursor: pointer;
528533
}
529-
534+
530535
.debug-bar-mleft4 {
531536
margin-left: 4px;
532537
}
533-
538+
534539
.debug-bar-level-0 {
535540
--level: 0;
536541
}
537-
542+
538543
.debug-bar-level-1 {
539544
--level: 1;
540545
}
541-
546+
542547
.debug-bar-level-2 {
543548
--level: 2;
544549
}
545-
550+
546551
.debug-bar-level-3 {
547552
--level: 3;
548553
}
549-
554+
550555
.debug-bar-level-4 {
551556
--level: 4;
552557
}
553-
558+
554559
.debug-bar-level-5 {
555560
--level: 5;
556561
}
557-
562+
558563
.debug-bar-level-6 {
559564
--level: 6;
560565
}

‎system/Debug/Toolbar/Views/toolbar.css

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
padding: 0px;
1818
clear: both;
1919
text-align: center;
20+
cursor: pointer;
2021
}
2122
#debug-icon a svg {
2223
margin: 8px;
@@ -31,6 +32,10 @@
3132
display: none;
3233
}
3334

35+
.debug-bar-vars {
36+
cursor: pointer;
37+
}
38+
3439
#debug-bar {
3540
bottom: 0;
3641
left: 0;
@@ -156,19 +161,21 @@
156161
bottom: auto;
157162
top: 36px;
158163
}
159-
#debug-bar #toolbar-position a,
160-
#debug-bar #toolbar-theme a {
164+
#debug-bar #toolbar-position,
165+
#debug-bar #toolbar-theme {
161166
padding: 0 6px;
162167
display: inline-flex;
163168
vertical-align: top;
169+
cursor: pointer;
164170
}
165-
#debug-bar #toolbar-position a:hover,
166-
#debug-bar #toolbar-theme a:hover {
171+
#debug-bar #toolbar-position:hover,
172+
#debug-bar #toolbar-theme:hover {
167173
text-decoration: none;
168174
}
169175
#debug-bar #debug-bar-link {
170176
display: flex;
171177
padding: 6px;
178+
cursor: pointer;
172179
}
173180
#debug-bar .ci-label {
174181
display: inline-flex;

‎system/Debug/Toolbar/Views/toolbar.tpl.php

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,21 @@
2727
<?= file_get_contents(__DIR__ . '/toolbar.js') ?>
2828
</script>
2929
<div id="debug-icon" class="debug-bar-ndisplay">
30-
<a id="debug-icon-link" href="#">
30+
<a id="debug-icon-link">
3131
<svg xmlns="http://www.w3.org/2000/svg" version="1.0" viewBox="0 0 155 200"><defs/><path fill="#dd4814" d="M73.7 3.7c2.2 7.9-.7 18.5-7.8 29-1.8 2.6-10.7 12.2-19.7 21.3-23.9 24-33.6 37.1-40.3 54.4-7.9 20.6-7.8 40.8.5 58.2C12.8 180 27.6 193 42.5 198l6 2-3-2.2c-21-15.2-22.9-38.7-4.8-58.8 2.5-2.7 4.8-5 5.1-5 .4 0 .7 2.7.7 6.1 0 5.7.2 6.2 3.7 9.5 3 2.7 4.6 3.4 7.8 3.4 5.6 0 9.9-2.4 11.6-6.5 2.9-6.9 1.6-12-5-20.5-10.5-13.4-11.7-23.3-4.3-34.7l3.1-4.8.7 4.7c1.3 8.2 5.8 12.9 25 25.8 20.9 14.1 30.6 26.1 32.8 40.5 1.1 7.2-.1 16.1-3.1 21.8-2.7 5.3-11.2 14.3-16.5 17.4-2.4 1.4-4.3 2.6-4.3 2.8 0 .2 2.4-.4 5.3-1.4 24.1-8.3 42.7-27.1 48.2-48.6 1.9-7.6 1.9-20.2-.1-28.5-3.5-15.2-14.6-30.5-29.9-41.2l-7-4.9-.6 3.3c-.8 4.8-2.6 7.6-5.9 9.3-4.5 2.3-10.3 1.9-13.8-1-6.7-5.7-7.8-14.6-3.7-30.5 3-11.6 3.2-20.6.5-29.1C88.3 18 80.6 6.3 74.8 2.2 73.1.9 73 1 73.7 3.7z"/></svg>
3232
</a>
3333
</div>
3434
<div id="debug-bar">
3535
<div class="toolbar">
36-
<span id="toolbar-position"><a href="#">&#8597;</a></span>
37-
<span id="toolbar-theme"><a href="#">&#128261;</a></span>
36+
<span id="toolbar-position">&#8597;</span>
37+
<span id="toolbar-theme">&#128261;</span>
3838
<span id="hot-reload-btn" class="ci-label">
39-
<a id="debug-hot-reload" href="#" title="Toggle Hot Reload">
39+
<a id="debug-hot-reload" title="Toggle Hot Reload">
4040
<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAACXBIWXMAAAsTAAALEwEAmpwYAAABNklEQVR4nN2US04CQRCGv/DaiBxEvYWuBRPDKSCIXsCdcg0ULqTI8xIGN7JwTCU/ScV5tTO64Us6maSq/7+nuqvgkLgHopTl+QAWwBToAg3+wMTzM7YBrihp4jkCToEB8OJyRkCFAB5yDDxVoAd8OpNMOkrcAeMAgz3nzsQ0EqkDayXZqXy5Qugrdy2tGNdKeNWv40xCqGpvJK0YEwXt8ooylMZzUnCh4EkJgzNpmFaMrYLNEgbH0thmGVhSUVrSeE8KLv+7RBMFb0oY3EnDeihGN+WZhmJ7ZlnPtKHB5RvtNwy0d5XWaGgqRmp7a/9QLjRevoDLvOSRM+nnlKumk++0xwZlLhVnEulOhnohTS37vnU1t5M/ho7rPR03/LKW1bxNQep6ETZb5mpGW2/Ak2KpF3oYfAPX9Xpc671kqwAAAABJRU5ErkJggg==" />
4141
</a>
4242
</span>
4343
<span class="ci-label">
44-
<a href="#" data-tab="ci-timeline">
44+
<a data-tab="ci-timeline">
4545
<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAD7SURBVEhLY6ArSEtLK09NTbWHcvGC9PR0BaDaQiAdUl9fzwQVxg+AFvwHamqHcnGCpKQkeaDa9yD1UD09UCn8AKaBWJySkmIApFehi0ONwwRQBceBLurAh4FqFoHUAtkrgPgREN+ByYEw1DhMANVEMIhAYQ5U1wtU/wmILwLZRlAp/IBYC8gGw88CaFj3A/FnIL4ETDXGUCnyANSC/UC6HIpnQMXAqQXIvo0khxNDjcMEQEmU9AzDuNI7Lgw1DhOAJIEuhQcRKMcC+e+QNHdDpcgD6BaAANSSQqBcENFlDi6AzQKqgkFlwWhxjVI8o2OgmkFaXI8CTMDAAAAxd1O4FzLMaAAAAABJRU5ErkJggg==">
4646
<span class="hide-sm"><?= $totalTime ?> ms &nbsp; <?= $totalMemory ?> MB</span>
4747
</a>
@@ -50,7 +50,7 @@
5050
<?php foreach ($collectors as $c) : ?>
5151
<?php if (! $c['isEmpty'] && ($c['hasTabContent'] || $c['hasLabel'])) : ?>
5252
<span class="ci-label">
53-
<a href="#" data-tab="ci-<?= $c['titleSafe'] ?>">
53+
<a data-tab="ci-<?= $c['titleSafe'] ?>">
5454
<img src="<?= $c['icon'] ?>">
5555
<span class="hide-sm">
5656
<?= $c['title'] ?>
@@ -64,23 +64,23 @@
6464
<?php endforeach ?>
6565

6666
<span class="ci-label">
67-
<a href="#" data-tab="ci-vars">
67+
<a data-tab="ci-vars">
6868
<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACLSURBVEhLYxgFJIHU1NSraWlp/6H4T0pKSjRUijoAyXAwBlrYDpViAFpmARQrJwZDtWACoCROC4D8CnR5XBiqBRMADfyNprgRKkUdAApzoCUdUNwE5MtApYYIALp6NBWBMVQLJgAaOJqK8AOgq+mSio6DggjEBtLUT0UwQ5HZIADkj6aiUTAggIEBANAEDa/lkCRlAAAAAElFTkSuQmCC">
6969
<span class="hide-sm">Vars</span>
7070
</a>
7171
</span>
7272

7373
<h1>
7474
<span class="ci-label">
75-
<a href="#" data-tab="ci-config">
75+
<a data-tab="ci-config">
7676
<svg xmlns="http://www.w3.org/2000/svg" version="1.0" viewBox="0 0 155 200"><defs/><path fill="#dd4814" d="M73.7 3.7c2.2 7.9-.7 18.5-7.8 29-1.8 2.6-10.7 12.2-19.7 21.3-23.9 24-33.6 37.1-40.3 54.4-7.9 20.6-7.8 40.8.5 58.2C12.8 180 27.6 193 42.5 198l6 2-3-2.2c-21-15.2-22.9-38.7-4.8-58.8 2.5-2.7 4.8-5 5.1-5 .4 0 .7 2.7.7 6.1 0 5.7.2 6.2 3.7 9.5 3 2.7 4.6 3.4 7.8 3.4 5.6 0 9.9-2.4 11.6-6.5 2.9-6.9 1.6-12-5-20.5-10.5-13.4-11.7-23.3-4.3-34.7l3.1-4.8.7 4.7c1.3 8.2 5.8 12.9 25 25.8 20.9 14.1 30.6 26.1 32.8 40.5 1.1 7.2-.1 16.1-3.1 21.8-2.7 5.3-11.2 14.3-16.5 17.4-2.4 1.4-4.3 2.6-4.3 2.8 0 .2 2.4-.4 5.3-1.4 24.1-8.3 42.7-27.1 48.2-48.6 1.9-7.6 1.9-20.2-.1-28.5-3.5-15.2-14.6-30.5-29.9-41.2l-7-4.9-.6 3.3c-.8 4.8-2.6 7.6-5.9 9.3-4.5 2.3-10.3 1.9-13.8-1-6.7-5.7-7.8-14.6-3.7-30.5 3-11.6 3.2-20.6.5-29.1C88.3 18 80.6 6.3 74.8 2.2 73.1.9 73 1 73.7 3.7z"/></svg>
7777
<?= $CI_VERSION ?>
7878
</a>
7979
</span>
8080
</h1>
8181

8282
<!-- Open/Close Toggle -->
83-
<a id="debug-bar-link" href="#" title="Open/Close">
83+
<a id="debug-bar-link" role="button" title="Open/Close">
8484
<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEPSURBVEhL7ZVLDoJAEEThRuoGDwSEG+jCuFU34s3AK3APP1VDDSGMqI1xx0s6M/2rnlHEaMZElmWrPM+vsDvsYbQ7+us0TReSC2EBrEHxCevRYuppYLXkQpC8sVCuGfTvqSE3hFdFwUGuGfRvqSE35NUAfKZrbQNQm2jrMA+gOK+M+FmhDsRL5voHMA8gFGecq0JOXLWlQg7E7AMIxZnjOiZOEJ82gFCcedUE4gS56QP8yf8ywItz7e+RituKlkkDBoIOH4Nd4HZD4NsGYJ/Abn1xEVOcuZ8f0zc/tHiYmzTAwscBvDIK/veyQ9K/rnewjdF26q0kF1IUxZIFPAVW98x/a+qp8L2M/+HMhETRE6S8TxpZ7KGXAAAAAElFTkSuQmCC">
8585
</a>
8686
</div>
@@ -124,7 +124,7 @@
124124
<?php if (isset($vars['varData'])) : ?>
125125
<?php foreach ($vars['varData'] as $heading => $items) : ?>
126126

127-
<a href="#" data-toggle="datatable" data-table="<?= strtolower(str_replace(' ', '-', $heading)) ?>">
127+
<a class="debug-bar-vars" data-toggle="datatable" data-table="<?= strtolower(str_replace(' ', '-', $heading)) ?>">
128128
<h2><?= $heading ?></h2>
129129
</a>
130130

@@ -148,7 +148,7 @@
148148
<?php endif ?>
149149

150150
<!-- Session -->
151-
<a href="#" data-toggle="datatable" data-table="session">
151+
<a class="debug-bar-vars" data-toggle="datatable" data-table="session">
152152
<h2>Session User Data</h2>
153153
</a>
154154

@@ -174,7 +174,7 @@
174174
<h2>Request <span>( <?= $vars['request'] ?> )</span></h2>
175175

176176
<?php if (isset($vars['get']) && $get = $vars['get']) : ?>
177-
<a href="#" data-toggle="datatable" data-table="get">
177+
<a class="debug-bar-vars" data-toggle="datatable" data-table="get">
178178
<h3>$_GET</h3>
179179
</a>
180180

@@ -191,7 +191,7 @@
191191
<?php endif ?>
192192

193193
<?php if (isset($vars['post']) && $post = $vars['post']) : ?>
194-
<a href="#" data-toggle="datatable" data-table="post">
194+
<a class="debug-bar-vars" data-toggle="datatable" data-table="post">
195195
<h3>$_POST</h3>
196196
</a>
197197

@@ -208,7 +208,7 @@
208208
<?php endif ?>
209209

210210
<?php if (isset($vars['headers']) && $headers = $vars['headers']) : ?>
211-
<a href="#" data-toggle="datatable" data-table="request_headers">
211+
<a class="debug-bar-vars" data-toggle="datatable" data-table="request_headers">
212212
<h3>Headers</h3>
213213
</a>
214214

@@ -225,7 +225,7 @@
225225
<?php endif ?>
226226

227227
<?php if (isset($vars['cookies']) && $cookies = $vars['cookies']) : ?>
228-
<a href="#" data-toggle="datatable" data-table="cookie">
228+
<a class="debug-bar-vars" data-toggle="datatable" data-table="cookie">
229229
<h3>Cookies</h3>
230230
</a>
231231

@@ -246,7 +246,7 @@
246246
</h2>
247247

248248
<?php if (isset($vars['response']['headers']) && $headers = $vars['response']['headers']) : ?>
249-
<a href="#" data-toggle="datatable" data-table="response_headers">
249+
<a class="debug-bar-vars" data-toggle="datatable" data-table="response_headers">
250250
<h3>Headers</h3>
251251
</a>
252252

0 commit comments

Comments
 (0)