From 42eefbd34c1e1601d597e83f836306c8ec1e77f9 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Tue, 4 Jun 2019 17:24:56 -0600 Subject: [PATCH] Reworked debugger assets a little --- system/assets/debugger.css | 70 ------------------------- system/assets/debugger/clockwork.css | 31 +++++++++++ system/assets/debugger/clockwork.js | 6 +++ system/assets/debugger/phpdebugbar.css | 70 +++++++++++++++++++++++++ system/assets/grav.png | Bin 4166 -> 1612 bytes system/src/Grav/Common/Debugger.php | 41 ++++++++++----- 6 files changed, 134 insertions(+), 84 deletions(-) delete mode 100644 system/assets/debugger.css create mode 100644 system/assets/debugger/clockwork.css create mode 100644 system/assets/debugger/clockwork.js create mode 100644 system/assets/debugger/phpdebugbar.css diff --git a/system/assets/debugger.css b/system/assets/debugger.css deleted file mode 100644 index 475dca9b8..000000000 --- a/system/assets/debugger.css +++ /dev/null @@ -1,70 +0,0 @@ -div.phpdebugbar { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -} - -.phpdebugbar pre { - padding: 1rem; -} - -.phpdebugbar div.phpdebugbar-header > div > * { - padding: 5px 15px; -} - -.phpdebugbar div.phpdebugbar-header > div.phpdebugbar-header-right > * { - padding: 5px 8px; -} - -.phpdebugbar div.phpdebugbar-header, .phpdebugbar a.phpdebugbar-restore-btn { - background-image: url(grav.png); -} - -.phpdebugbar a.phpdebugbar-restore-btn { - width: 13px; -} - -.phpdebugbar a.phpdebugbar-tab.phpdebugbar-active { - background: #3DB9EC; - color: #fff; - margin-top: -1px; - padding-top: 6px; -} - -.phpdebugbar .phpdebugbar-widgets-toolbar { - border-top: 1px solid #ddd; - padding-left: 5px; - padding-right: 2px; - padding-top: 2px; - background-color: #fafafa !important; - width: auto !important; - left: 0; - right: 0; -} - -.phpdebugbar .phpdebugbar-widgets-toolbar input { - background: transparent !important; -} - -.phpdebugbar .phpdebugbar-widgets-toolbar .phpdebugbar-widgets-filter { - -} - - -.phpdebugbar input[type=text] { - padding: 0; - display: inline; -} - -.phpdebugbar dl.phpdebugbar-widgets-varlist, ul.phpdebugbar-widgets-timeline li span.phpdebugbar-widgets-label { - font-family: "DejaVu Sans Mono", Menlo, Monaco, Consolas, Courier, monospace; - font-size: 12px; -} - -ul.phpdebugbar-widgets-timeline li span.phpdebugbar-widgets-label { - text-shadow: -1px -1px 0 #fff, 1px -1px 0 #fff, -1px 1px 0 #fff, 1px 1px 0 #fff; - top: 0; -} - -.phpdebugbar pre, .phpdebugbar code { - margin: 0; - font-size: 14px; -} diff --git a/system/assets/debugger/clockwork.css b/system/assets/debugger/clockwork.css new file mode 100644 index 000000000..0c837fe77 --- /dev/null +++ b/system/assets/debugger/clockwork.css @@ -0,0 +1,31 @@ +.clockwork-badge { + position: fixed; + bottom: 0; + left: 0; + padding: 2px 4px; + background-color: #ccc; + border: 1px solid #bbb; + display: flex; + align-items: center; +} + +.clockwork-badge:hover:after { + content: 'Clockwork Debugger Enabled...This should only be used in development environments'; +} + +.clockwork-badge:after { + margin-left: 10px; + font-family: "Monaco", "Consolas", "Lucida Console", monospace; + font-size: 12px; + line-height: 1.5; + color: #c00; +} + +.clockwork-badge i { + display: block; + float: left; + height: 22px; + width: 22px; + background-size: contain; + background-image: url(data:image/png;base64,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); +} diff --git a/system/assets/debugger/clockwork.js b/system/assets/debugger/clockwork.js new file mode 100644 index 000000000..b989b155e --- /dev/null +++ b/system/assets/debugger/clockwork.js @@ -0,0 +1,6 @@ +document.addEventListener("DOMContentLoaded", function(){ + var el = document.createElement('div'); + el.appendChild(document.createElement('i')); + el.className = 'clockwork-badge'; + document.body.appendChild(el); +}); diff --git a/system/assets/debugger/phpdebugbar.css b/system/assets/debugger/phpdebugbar.css new file mode 100644 index 000000000..93e2d2c3e --- /dev/null +++ b/system/assets/debugger/phpdebugbar.css @@ -0,0 +1,70 @@ +div.phpdebugbar { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; +} + +.phpdebugbar pre { + padding: 1rem; +} + +.phpdebugbar div.phpdebugbar-header > div > * { + padding: 5px 15px; +} + +.phpdebugbar div.phpdebugbar-header > div.phpdebugbar-header-right > * { + padding: 5px 8px; +} + +.phpdebugbar div.phpdebugbar-header, .phpdebugbar a.phpdebugbar-restore-btn { + background-image: url(data:image/png;base64,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); +} + +.phpdebugbar a.phpdebugbar-restore-btn { + width: 13px; +} + +.phpdebugbar a.phpdebugbar-tab.phpdebugbar-active { + background: #3DB9EC; + color: #fff; + margin-top: -1px; + padding-top: 6px; +} + +.phpdebugbar .phpdebugbar-widgets-toolbar { + border-top: 1px solid #ddd; + padding-left: 5px; + padding-right: 2px; + padding-top: 2px; + background-color: #fafafa !important; + width: auto !important; + left: 0; + right: 0; +} + +.phpdebugbar .phpdebugbar-widgets-toolbar input { + background: transparent !important; +} + +.phpdebugbar .phpdebugbar-widgets-toolbar .phpdebugbar-widgets-filter { + +} + + +.phpdebugbar input[type=text] { + padding: 0; + display: inline; +} + +.phpdebugbar dl.phpdebugbar-widgets-varlist, ul.phpdebugbar-widgets-timeline li span.phpdebugbar-widgets-label { + font-family: "DejaVu Sans Mono", Menlo, Monaco, Consolas, Courier, monospace; + font-size: 12px; +} + +ul.phpdebugbar-widgets-timeline li span.phpdebugbar-widgets-label { + text-shadow: -1px -1px 0 #fff, 1px -1px 0 #fff, -1px 1px 0 #fff, 1px 1px 0 #fff; + top: 0; +} + +.phpdebugbar pre, .phpdebugbar code { + margin: 0; + font-size: 14px; +} diff --git a/system/assets/grav.png b/system/assets/grav.png index 9ae6d97db20c96402fbd914f7867139cc9364093..67a98b9df1f19546bd7540b58d37f65dccea55af 100644 GIT binary patch literal 1612 zcmchX{XY{30LC|FquE;76k&`z?9}G!BU&<{8EYi(o0qhUIIKvV9ivQU!001zuyQ|M8i9f8Z zxtZnnGd^xY?M?A@+vNWs6BCoo7PVRp0)f`n)}T=6^71kYg~H)*DwRs9REou7kx1m^ z`#TQVZ7wrU^r0RHtgnOZ;B{4@NGrvd1V$jdtxg;c@$Xw#x6fD*oGtj%_RV3zmT5R? z;k3O7{~BA({g!*Ly!>7+%hpfE-QaJGJ&*Jnvn2E?&!@8t(gYLwHTJ<6AjI|!H8f4< zx`%?bqgwvT`04Pibn)KPw#LrVe}r=PNX#T{jTC{&2q-*@O3T5B(0{)_kuSee(d!_L zdPYQ!`$R3J!ppQ*>F?L62rKRltIUW71kdTxJ<#WI$K>!ZO<;r;w39q>VctzC(TwY% zsUSJS{k6Aje>UI(zw(pOPxNpvZhi$s*S9^0&U+2+#A~qJ$?6Tzd2H7p>*RfXeo}%8 zk7TWW0v=*l3~8ZKKjzPQ4%72ndQ}jE?$Dk>H639R=?^#_X`XsX@zi|K&&aq@ICnyL zY;`?ldbf(aUjRPMkfB@`_T-kT^bRE;J;H-owZ8h4gj&O$vMF@b5x;VHm*=yxue{U6 zIUx9_l4Ws2i9$R;0yB|M=ljulhT7RHy9!Raf$HbIAV`1of=I+BbiTj(+0aP;3Y*@- z%O=h1o~yWa0oBQot~O(9g89jyo*6TAe#3_`N`veT5qxIgx?C&U%zCsv7Nd^+B0`2_s$5LRU{?{pl^#Yt{}A$yzK3skeb;h5t%aC`*p?xd8Pzu=o;lVkXbLE; zQ%W|hIk$f|1#;mU17P!Wzus$&8NI-lFVX4~HQJqZ_Qjd9VKHxaetgj9hx+`4=7M3? z+M>$RPmS0UZDM#jHNkkIM&FV~}}@;Jpno1M|Rd35{lG#7fB^5_5| z-~eVR(tiJ7>&ey9ux_aR>b#d7=9^=^mbQUuXtANcjKh~7OahZ|X+S0l(V#iod_aFS zZw>pY2>q%Af^nB5SpX*^@iY#hsg>=K8i87fDa;2v-*98T2zi9PRzz*=H%OghhP-r8 zW@$6DFSaLjzI0}qWmc6$H#W^*fNEqBG2CIyTI~qiF)i5}th(ElVRB^S1xD!z%FFMn z5a@34o(?q;f!b zmAh^Y5cWF;Y3|jZ?TDLK7~A41RZovJX?}-+za)NfW5^F|7p}~_p7QpTJ+kK9<#uSw zEhk0S_0Y+&y)ivR&j1a}ZgY8#aH2A7Evc&uZ{K%f;|L9C^)PM_PZ}ZxVaW}T!U!sJc;MxJ literal 4166 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 I4P?xJ0I0&g$N&HU diff --git a/system/src/Grav/Common/Debugger.php b/system/src/Grav/Common/Debugger.php index f231c04f9..9eedc5b34 100644 --- a/system/src/Grav/Common/Debugger.php +++ b/system/src/Grav/Common/Debugger.php @@ -355,7 +355,8 @@ class Debugger */ public function addAssets() { - if ($this->enabled && $this->debugbar) { + if ($this->enabled) { + // Only add assets if Page is HTML $page = $this->grav['page']; @@ -366,23 +367,35 @@ class Debugger /** @var Assets $assets */ $assets = $this->grav['assets']; - // Add jquery library - $assets->add('jquery', 101); - - $this->renderer = $this->debugbar->getJavascriptRenderer(); - $this->renderer->setIncludeVendors(false); - - // Get the required CSS files - list($css_files, $js_files) = $this->renderer->getAssets(null, JavascriptRenderer::RELATIVE_URL); - foreach ((array)$css_files as $css) { - $assets->addCss($css); + // Clockwork specific assets + if ($this->clockwork) { + $assets->addCss('/system/assets/debugger/clockwork.css', ['loading' => 'inline']); + $assets->addJs('/system/assets/debugger/clockwork.js', ['loading' => 'inline']); } - $assets->addCss('/system/assets/debugger.css'); - foreach ((array)$js_files as $js) { - $assets->addJs($js); + // Debugbar specific assets + if ($this->debugbar) { + + // Add jquery library + $assets->add('jquery', 101); + + $this->renderer = $this->debugbar->getJavascriptRenderer(); + $this->renderer->setIncludeVendors(false); + + list($css_files, $js_files) = $this->renderer->getAssets(null, JavascriptRenderer::RELATIVE_URL); + + foreach ((array)$css_files as $css) { + $assets->addCss($css); + } + + $assets->addCss('/system/assets/debugger/phpdebugbar.css', ['loading' => 'inline']); + + foreach ((array)$js_files as $js) { + $assets->addJs($js); + } } + } return $this;