From 565b100f9d97214043ae93c51d276951a65331e8 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Tue, 11 Aug 2009 09:45:18 -0700 Subject: Refactored the UI to be a right hand side vertical toolbar. DebugPanel subclass grew a subtitle method to display informative text under the title. --- debug_toolbar/media/debug_toolbar/toolbar.css | 91 +++++++++++------------ debug_toolbar/media/debug_toolbar/toolbar.min.css | 2 +- 2 files changed, 44 insertions(+), 49 deletions(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index 9ef6dc3..275a776 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -7,37 +7,39 @@ text-align: left; } #djDebug a { - color: #f7c757; + color: #fff; } #djDebug a:hover { - color: #aaa; + color: #900; } #djDebugToolbar { - background: #326342; - height: 30px; + background: #111; + width: 150px; z-index: 100000000; - border-bottom: 2px solid #234f32; position:absolute; top:0; - left:0; + bottom:0; right:0; + opacity:0.9; +} + +#djDebugToolbar small { + color:#999; } #djDebugToolbarHandle { - background: #326342; - height: 30px; - z-index: 100000000; - border-bottom: 2px solid #234f32; position:absolute; + background: #111; top:0; - left:0; + bottom:0; right:0; - width: 16px; + z-index: 100000000; } #djDebugToolbarHandle ul li { - padding: 3px 0px 0px 3px; + list-style-type:none; + padding: 3px; } #djDebugToolbarHandle ul li a { @@ -52,33 +54,27 @@ } #djDebugToolbar li { - border-left: 1px solid #487858; + border-bottom: 1px solid #222; color: #fff; - display: inline; + display: block; font-size: 11px; font-weight: bold; float: none; - height: 20px; margin: 0; padding: 0; - line-height: 30px; - padding: 8px 9px 9px; + padding: 8px; position: relative; width: auto; } #djDebugToolbar li:hover { - background: #487858; + background: #222; } #djDebugToolbar li:hover a { color: #fff; } -#djDebugToolbar li:last-child { - border-right: 1px solid #487858; -} - #djDebugToolbar #djDebugButton { color: #92ef3f; } @@ -92,33 +88,30 @@ } #djDebug .panelContent { - background: #2a5738; - border-bottom: 2px solid #234f32; - border-top: 2px solid #487858; + background: #222; display: none; position: absolute; margin: 0; padding: 10px; - top: 32px; + top: 0; width: auto; left: 0px; - right: 0px; - bottom: 5px; - color: black; + right: 150px; + bottom: 0; + color: #fff; z-index: 1000000; overflow: auto; } #djDebug .panelContent p a, #djDebug .panelContent dl a { - color: #40684c; + color: #000; } #djDebug .panelContent p a:hover, #djDebug .panelContent dl a:hover { - color: #92EF3F; + color: #900; } #djDebug .panelContent h3 { - border-bottom: 1px solid #40684c; - color: #92ef3f; + color: #fff; padding: 0 0 5px; } @@ -137,18 +130,20 @@ } #djDebug .panelContent table a { - color: #40684C; + color: #000; +} +#djDebug .panelContent table a:hover { + color: #900; } #djDebug .panelContent table th { - background-color: #9dcc49; + background-color: #333; font-weight: bold; - color: #000; + color: #fff; font-size: 11px; padding: 3px 7px 3px; text-align: left; cursor: pointer; - border-right: 1px solid #b9d977; } #djDebug .panelContent table td { padding: 5px 10px; @@ -177,19 +172,19 @@ #djDebug .highlight { color: #000; } #djDebug .highlight .err { color: #000; } /* Error */ #djDebug .highlight .g { color: #000; } /* Generic */ -#djDebug .highlight .k { color: #40684C; font-weight: bold } /* Keyword */ +#djDebug .highlight .k { color: #000; font-weight: bold } /* Keyword */ #djDebug .highlight .o { color: #000; } /* Operator */ #djDebug .highlight .n { color: #000; } /* Name */ -#djDebug .highlight .mi { color: #40684C; font-weight: bold } /* Literal.Number.Integer */ +#djDebug .highlight .mi { color: #000; font-weight: bold } /* Literal.Number.Integer */ #djDebug .highlight .l { color: #000; } /* Literal */ #djDebug .highlight .x { color: #000; } /* Other */ #djDebug .highlight .p { color: #000; } /* Punctuation */ -#djDebug .highlight .m { color: #40684C; font-weight: bold } /* Literal.Number */ -#djDebug .highlight .s { color: #0086d2 } /* Literal.String */ +#djDebug .highlight .m { color: #000; font-weight: bold } /* Literal.Number */ +#djDebug .highlight .s { color: #333 } /* Literal.String */ #djDebug .highlight .w { color: #888888 } /* Text.Whitespace */ -#djDebug .highlight .il { color: #40684C; font-weight: bold } /* Literal.Number.Integer.Long */ -#djDebug .highlight .na { color: #7D9029 } /* Name.Attribute */ -#djDebug .highlight .nt { color: #008000; font-weight: bold } /* Name.Tag */ -#djDebug .highlight .nv { color: #19177C } /* Name.Variable */ -#djDebug .highlight .s2 { color: #BA2121 } /* Literal.String.Double */ -#djDebug .highlight .cp { color: #BC7A00 } /* Comment.Preproc */ +#djDebug .highlight .il { color: #000; font-weight: bold } /* Literal.Number.Integer.Long */ +#djDebug .highlight .na { color: #333 } /* Name.Attribute */ +#djDebug .highlight .nt { color: #000; font-weight: bold } /* Name.Tag */ +#djDebug .highlight .nv { color: #333 } /* Name.Variable */ +#djDebug .highlight .s2 { color: #333 } /* Literal.String.Double */ +#djDebug .highlight .cp { color: #333 } /* Comment.Preproc */ diff --git a/debug_toolbar/media/debug_toolbar/toolbar.min.css b/debug_toolbar/media/debug_toolbar/toolbar.min.css index c172fbd..21262aa 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.min.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.min.css @@ -1 +1 @@ -#djDebug *{color:#000;float:none;margin:0;padding:0;position:static;text-align:left;}#djDebug a{color:#f7c757;}#djDebug a:hover{color:#aaa;}#djDebugToolbar{background:#326342;height:30px;z-index:100000000;border-bottom:2px solid #234f32;position:absolute;top:0;left:0;right:0;}#djDebugToolbarHandle{background:#326342;height:30px;z-index:100000000;border-bottom:2px solid #234f32;position:absolute;top:0;left:0;right:0;width:16px;}#djDebugToolbarHandle ul li{padding:3px 0 0 3px;}#djDebugToolbarHandle ul li a{font-size:16px;font-weight:bold;}#djDebugToolbar ul{margin:0;padding:0;list-style:none;}#djDebugToolbar li{border-left:1px solid #487858;color:#fff;display:inline;font-size:11px;font-weight:bold;float:none;height:20px;margin:0;padding:0;line-height:30px;padding:8px 9px 9px;position:relative;width:auto;}#djDebugToolbar li:hover{background:#487858;}#djDebugToolbar li:hover a{color:#fff;}#djDebugToolbar li:last-child{border-right:1px solid #487858;}#djDebugToolbar #djDebugButton{color:#92ef3f;}#djDebug pre{background-color:#fff;}#djDebug tr.djDebugOdd pre{background-color:#eee;}#djDebug .panelContent{background:#2a5738;border-bottom:2px solid #234f32;border-top:2px solid #487858;display:none;position:absolute;margin:0;padding:10px;top:32px;width:auto;left:0;right:0;bottom:5px;color:black;z-index:1000000;overflow:auto;}#djDebug .panelContent p a,#djDebug .panelContent dl a{color:#40684c;}#djDebug .panelContent p a:hover,#djDebug .panelContent dl a:hover{color:#92EF3F;}#djDebug .panelContent h3{border-bottom:1px solid #40684c;color:#92ef3f;padding:0 0 5px;}#djDebug .panelContent p{padding:0 5px;}#djDebug .panelContent p,#djDebug .panelContent table,#djDebug .panelContent ol,#djDebug .panelContent ul,#djDebug .panelContent dl{margin:5px 0 15px;background-color:#fff;}#djDebug .panelContent table{width:100%;clear:both;}#djDebug .panelContent table a{color:#40684C;}#djDebug .panelContent table th{background-color:#9dcc49;font-weight:bold;color:#000;font-size:11px;padding:3px 7px 3px;text-align:left;cursor:pointer;border-right:1px solid #b9d977;}#djDebug .panelContent table td{padding:5px 10px;font-size:11px;background:#fff;color:#000;vertical-align:top;}#djDebug .panelContent table tr.djDebugOdd td{background:#eee;}#djDebug .panelContent .close{float:right;font-weight:bold;}#djDebug .panelContent dt,#djDebug .panelContent dd{display:block;}#djDebug .panelContent dd{margin-left:10px;}#djDebug .highlight{color:#000;}#djDebug .highlight .err{color:#000;}#djDebug .highlight .g{color:#000;}#djDebug .highlight .k{color:#40684C;font-weight:bold;}#djDebug .highlight .o{color:#000;}#djDebug .highlight .n{color:#000;}#djDebug .highlight .mi{color:#40684C;font-weight:bold;}#djDebug .highlight .l{color:#000;}#djDebug .highlight .x{color:#000;}#djDebug .highlight .p{color:#000;}#djDebug .highlight .m{color:#40684C;font-weight:bold;}#djDebug .highlight .s{color:#0086d2;}#djDebug .highlight .w{color:#888;}#djDebug .highlight .il{color:#40684C;font-weight:bold;}#djDebug .highlight .na{color:#7D9029;}#djDebug .highlight .nt{color:#008000;font-weight:bold;}#djDebug .highlight .nv{color:#19177C;}#djDebug .highlight .s2{color:#BA2121;}#djDebug .highlight .cp{color:#BC7A00;} \ No newline at end of file +#djDebug *{color:#000;float:none;margin:0;padding:0;position:static;text-align:left;}#djDebug a{color:#fff;}#djDebug a:hover{color:#900;}#djDebugToolbar{background:#111;width:150px;z-index:100000000;position:absolute;top:0;bottom:0;right:0;opacity:.9;}#djDebugToolbar small{color:#999;}#djDebugToolbarHandle{position:absolute;background:#111;top:0;bottom:0;right:0;z-index:100000000;}#djDebugToolbarHandle ul li{list-style-type:none;padding:3px;}#djDebugToolbarHandle ul li a{font-size:16px;font-weight:bold;}#djDebugToolbar ul{margin:0;padding:0;list-style:none;}#djDebugToolbar li{border-bottom:1px solid #222;color:#fff;display:block;font-size:11px;font-weight:bold;float:none;margin:0;padding:0;padding:8px;position:relative;width:auto;}#djDebugToolbar li:hover{background:#222;}#djDebugToolbar li:hover a{color:#fff;}#djDebugToolbar #djDebugButton{color:#92ef3f;}#djDebug pre{background-color:#fff;}#djDebug tr.djDebugOdd pre{background-color:#eee;}#djDebug .panelContent{background:#222;display:none;position:absolute;margin:0;padding:10px;top:0;width:auto;left:0;right:150px;bottom:0;color:#fff;z-index:1000000;overflow:auto;}#djDebug .panelContent p a,#djDebug .panelContent dl a{color:#000;}#djDebug .panelContent p a:hover,#djDebug .panelContent dl a:hover{color:#900;}#djDebug .panelContent h3{color:#fff;padding:0 0 5px;}#djDebug .panelContent p{padding:0 5px;}#djDebug .panelContent p,#djDebug .panelContent table,#djDebug .panelContent ol,#djDebug .panelContent ul,#djDebug .panelContent dl{margin:5px 0 15px;background-color:#fff;}#djDebug .panelContent table{width:100%;clear:both;}#djDebug .panelContent table a{color:#000;}#djDebug .panelContent table a:hover{color:#900;}#djDebug .panelContent table th{background-color:#333;font-weight:bold;color:#fff;font-size:11px;padding:3px 7px 3px;text-align:left;cursor:pointer;}#djDebug .panelContent table td{padding:5px 10px;font-size:11px;background:#fff;color:#000;vertical-align:top;}#djDebug .panelContent table tr.djDebugOdd td{background:#eee;}#djDebug .panelContent .close{float:right;font-weight:bold;}#djDebug .panelContent dt,#djDebug .panelContent dd{display:block;}#djDebug .panelContent dd{margin-left:10px;}#djDebug .highlight{color:#000;}#djDebug .highlight .err{color:#000;}#djDebug .highlight .g{color:#000;}#djDebug .highlight .k{color:#000;font-weight:bold;}#djDebug .highlight .o{color:#000;}#djDebug .highlight .n{color:#000;}#djDebug .highlight .mi{color:#000;font-weight:bold;}#djDebug .highlight .l{color:#000;}#djDebug .highlight .x{color:#000;}#djDebug .highlight .p{color:#000;}#djDebug .highlight .m{color:#000;font-weight:bold;}#djDebug .highlight .s{color:#333;}#djDebug .highlight .w{color:#888;}#djDebug .highlight .il{color:#000;font-weight:bold;}#djDebug .highlight .na{color:#333;}#djDebug .highlight .nt{color:#000;font-weight:bold;}#djDebug .highlight .nv{color:#333;}#djDebug .highlight .s2{color:#333;}#djDebug .highlight .cp{color:#333;} \ No newline at end of file -- cgit v1.2.3 From c67c719047645381011f02c56daaa152efbf796c Mon Sep 17 00:00:00 2001 From: Idan Gazit Date: Wed, 12 Aug 2009 04:37:47 +0300 Subject: toolbar restyling, switched to non-minified css/js --- debug_toolbar/media/debug_toolbar/indicator.png | Bin 0 -> 278 bytes debug_toolbar/media/debug_toolbar/toolbar.css | 96 ++++++++++++++++++------ debug_toolbar/media/debug_toolbar/toolbar.js | 4 + 3 files changed, 77 insertions(+), 23 deletions(-) create mode 100644 debug_toolbar/media/debug_toolbar/indicator.png (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/indicator.png b/debug_toolbar/media/debug_toolbar/indicator.png new file mode 100644 index 0000000..a21fc6e Binary files /dev/null and b/debug_toolbar/media/debug_toolbar/indicator.png differ diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index 275a776..b6e3f5d 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -5,17 +5,13 @@ padding: 0; position: static; text-align: left; -} -#djDebug a { - color: #fff; -} -#djDebug a:hover { - color: #900; + font-family: Cambria, Georgia, serif; + font-size: 16px; } #djDebugToolbar { background: #111; - width: 150px; + width: 200px; z-index: 100000000; position:absolute; top:0; @@ -28,23 +24,38 @@ color:#999; } + + #djDebugToolbarHandle { position:absolute; background: #111; top:0; - bottom:0; right:0; + height: 25px; + width: 25px; z-index: 100000000; } #djDebugToolbarHandle ul li { list-style-type:none; - padding: 3px; + padding: 0; } #djDebugToolbarHandle ul li a { - font-size: 16px; - font-weight: bold; + display: block; + width: 100%; + font-size: 16px; + line-height: 25px; + font-weight: bold; + text-decoration: none; + color: #daf7ff; + text-align: center; +} + +#djDebugToolbarHandle ul li a:hover { + color: #111; + background-color: #9fbb54; + border: 1px solid #111; } #djDebugToolbar ul { @@ -57,24 +68,58 @@ border-bottom: 1px solid #222; color: #fff; display: block; - font-size: 11px; font-weight: bold; float: none; margin: 0; padding: 0; - padding: 8px; position: relative; width: auto; } -#djDebugToolbar li:hover { - background: #222; + + +#djDebugToolbar li>a, +#djDebugToolbar li>div.contentless { + font-weight: normal; + font-style: normal; + font-variant: small-caps; + text-decoration: none; + display: block; + font-size: 18px; + padding: 10px 10px 5px 25px; + color: #fff; } -#djDebugToolbar li:hover a { - color: #fff; +#djDebugToolbar li a:hover { + color: #111; + background-color: #c6d6da; + border-right: 10px solid #fff; } +#djDebugToolbar li.active { + background-image: url(indicator.png); + background-repeat: no-repeat; + background-position: left center; +} + +#djDebugToolbar li.active a:hover { + background-color: #111; + background-image: inherit; + background-position: inherit; + background-repeat: inherit; + color: #b36a60; + border: none; +} + +#djDebugToolbar li small { + font-size: 12px; + color: #999; + font-style: italic; + text-decoration: none; + font-variant: normal; +} + + #djDebugToolbar #djDebugButton { color: #92ef3f; } @@ -88,19 +133,24 @@ } #djDebug .panelContent { - background: #222; + background: #daf7ff; display: none; position: absolute; margin: 0; padding: 10px; - top: 0; + top: 15px; width: auto; - left: 0px; - right: 150px; - bottom: 0; - color: #fff; + max-width: 700px; + min-width: 500px; + right: 200px; + bottom: 15px; + color: #111; z-index: 1000000; overflow: auto; + border-left: 10px solid #c6d6da; + border-top: 10px solid #c6d6da; + border-bottom: 10px solid #c6d6da; + opacity: 0.9; } #djDebug .panelContent p a, #djDebug .panelContent dl a { diff --git a/debug_toolbar/media/debug_toolbar/toolbar.js b/debug_toolbar/media/debug_toolbar/toolbar.js index 40e1a58..cde67a6 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.js +++ b/debug_toolbar/media/debug_toolbar/toolbar.js @@ -14,10 +14,13 @@ jQuery(function($j) { current = $j('#djDebug #' + this.className); if (current.is(':visible')) { $j(document).trigger('close.djDebug'); + $j(this).parent().removeClass("active"); } else { $j('.panelContent').hide(); current.show(); $j.djDebug.open(); + $j('#djDebugToolbar li').removeClass("active"); + $j(this).parent().addClass("active"); } return false; }); @@ -77,6 +80,7 @@ jQuery(function($j) { }, hide_toolbar: function(setCookie) { $j('#djDebugToolbar').hide("fast"); + $j('#djDebugToolbar li').removeClass("active"); $j(document).trigger('close.djDebug'); $j('#djDebugToolbarHandle').show(); if (setCookie) { -- cgit v1.2.3 From 28ec3f9aa3674284eb060e91760fbc6e98076f3a Mon Sep 17 00:00:00 2001 From: Idan Gazit Date: Wed, 12 Aug 2009 06:36:36 +0300 Subject: Remove indicator if closed via panel close --- debug_toolbar/media/debug_toolbar/toolbar.js | 1 + 1 file changed, 1 insertion(+) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.js b/debug_toolbar/media/debug_toolbar/toolbar.js index cde67a6..355a66f 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.js +++ b/debug_toolbar/media/debug_toolbar/toolbar.js @@ -102,6 +102,7 @@ jQuery(function($j) { $j(document).bind('close.djDebug', function() { $j(document).unbind('keydown.djDebug'); $j('.panelContent').hide(); + $j('#djDebugToolbar li').removeClass("active"); }); }); jQuery(function() { -- cgit v1.2.3 From e38c45515ca458709b0a7e5bc75e3f640950dbb3 Mon Sep 17 00:00:00 2001 From: Idan Gazit Date: Wed, 12 Aug 2009 06:37:43 +0300 Subject: Cleaned up the panels --- debug_toolbar/media/debug_toolbar/close.png | Bin 0 -> 1130 bytes debug_toolbar/media/debug_toolbar/panel_bg.png | Bin 0 -> 110 bytes debug_toolbar/media/debug_toolbar/toolbar.css | 39 ++++++++++++++++++------- 3 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 debug_toolbar/media/debug_toolbar/close.png create mode 100644 debug_toolbar/media/debug_toolbar/panel_bg.png (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/close.png b/debug_toolbar/media/debug_toolbar/close.png new file mode 100644 index 0000000..c22e2e8 Binary files /dev/null and b/debug_toolbar/media/debug_toolbar/close.png differ diff --git a/debug_toolbar/media/debug_toolbar/panel_bg.png b/debug_toolbar/media/debug_toolbar/panel_bg.png new file mode 100644 index 0000000..73add17 Binary files /dev/null and b/debug_toolbar/media/debug_toolbar/panel_bg.png differ diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index b6e3f5d..4211099 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -133,11 +133,11 @@ } #djDebug .panelContent { - background: #daf7ff; + display: none; position: absolute; margin: 0; - padding: 10px; + padding: 10px 20px; top: 15px; width: auto; max-width: 700px; @@ -146,11 +146,18 @@ bottom: 15px; color: #111; z-index: 1000000; - overflow: auto; + /*overflow: auto;*/ border-left: 10px solid #c6d6da; border-top: 10px solid #c6d6da; border-bottom: 10px solid #c6d6da; - opacity: 0.9; + opacity: 1.0; + background: transparent url(panel_bg.png) repeat left top; +} + +#djDebug .panelContent .panelScroll { + position: relative; + overflow: auto; + height: 90%; } #djDebug .panelContent p a, #djDebug .panelContent dl a { @@ -161,8 +168,12 @@ } #djDebug .panelContent h3 { - color: #fff; - padding: 0 0 5px; + color: #111; + font-size: 20px; + line-height: 25px; + margin-top: 2px; + margin-bottom: 0.5em; + font-variant: small-caps; } #djDebug .panelContent p { @@ -177,6 +188,8 @@ #djDebug .panelContent table { width: 100%; clear: both; + border: 0; + padding: 0; } #djDebug .panelContent table a { @@ -190,25 +203,31 @@ background-color: #333; font-weight: bold; color: #fff; - font-size: 11px; padding: 3px 7px 3px; text-align: left; cursor: pointer; } #djDebug .panelContent table td { padding: 5px 10px; - font-size: 11px; + font-size: 14px; background: #fff; color: #000; vertical-align: top; + border: 0; } #djDebug .panelContent table tr.djDebugOdd td { background: #eee; } #djDebug .panelContent .close { - float: right; - font-weight: bold; + text-indent: -9999999px; + display: block; + position: absolute; + top: 5px; + left: -25px; + background: url(close.png) no-repeat center center; + height: 40px; + width: 40px; } #djDebug .panelContent dt, #djDebug .panelContent dd { -- cgit v1.2.3 From 463aa185a001f72b7c906209920cd70932123157 Mon Sep 17 00:00:00 2001 From: Idan Gazit Date: Wed, 12 Aug 2009 15:06:45 +0300 Subject: Added hover state for close button, scroll padding --- debug_toolbar/media/debug_toolbar/close_hover.png | Bin 0 -> 1158 bytes debug_toolbar/media/debug_toolbar/toolbar.css | 5 +++++ 2 files changed, 5 insertions(+) create mode 100644 debug_toolbar/media/debug_toolbar/close_hover.png (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/close_hover.png b/debug_toolbar/media/debug_toolbar/close_hover.png new file mode 100644 index 0000000..f868e80 Binary files /dev/null and b/debug_toolbar/media/debug_toolbar/close_hover.png differ diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index 4211099..7ac200c 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -158,6 +158,7 @@ position: relative; overflow: auto; height: 90%; + padding: 0px 10px 10px 0px; } #djDebug .panelContent p a, #djDebug .panelContent dl a { @@ -230,6 +231,10 @@ width: 40px; } +#djDebug .panelContent .close:hover { + background-image: url(close_hover.png); +} + #djDebug .panelContent dt, #djDebug .panelContent dd { display: block; } -- cgit v1.2.3 From 5f905eedd36213b88a3cb10dadaa6fd733229c3c Mon Sep 17 00:00:00 2001 From: Idan Gazit Date: Wed, 12 Aug 2009 15:19:10 +0300 Subject: Panel title larger, is monospaced --- debug_toolbar/media/debug_toolbar/toolbar.css | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index 7ac200c..de71ad2 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -170,13 +170,30 @@ #djDebug .panelContent h3 { color: #111; - font-size: 20px; + font-size: 24px; line-height: 25px; margin-top: 2px; margin-bottom: 0.5em; font-variant: small-caps; } + + +#djDebug .panelContent h4 { + font-weight: normal; +} + +#djDebug .panelContent code { + font-family: + Consolas, + Monaco, + "Bitstream Vera Sans Mono", + "Lucida Console", + monospace; + font-size: inherit; +} + + #djDebug .panelContent p { padding: 0 5px; } -- cgit v1.2.3 From f60a5e3b048728240bb4d85dd1fb5e2c9ea6fa2d Mon Sep 17 00:00:00 2001 From: Idan Gazit Date: Wed, 12 Aug 2009 17:04:54 +0300 Subject: panel width, content boxing, safe scrolling --- debug_toolbar/media/debug_toolbar/back.png | Bin 0 -> 1078 bytes debug_toolbar/media/debug_toolbar/back_hover.png | Bin 0 -> 1084 bytes debug_toolbar/media/debug_toolbar/toolbar.css | 63 +++++++++++++++++++---- 3 files changed, 54 insertions(+), 9 deletions(-) create mode 100644 debug_toolbar/media/debug_toolbar/back.png create mode 100644 debug_toolbar/media/debug_toolbar/back_hover.png (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/back.png b/debug_toolbar/media/debug_toolbar/back.png new file mode 100644 index 0000000..fa6a36b Binary files /dev/null and b/debug_toolbar/media/debug_toolbar/back.png differ diff --git a/debug_toolbar/media/debug_toolbar/back_hover.png b/debug_toolbar/media/debug_toolbar/back_hover.png new file mode 100644 index 0000000..774f97c Binary files /dev/null and b/debug_toolbar/media/debug_toolbar/back_hover.png differ diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index de71ad2..faf3b7a 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -137,10 +137,11 @@ display: none; position: absolute; margin: 0; + margin-left: 30px; padding: 10px 20px; top: 15px; width: auto; - max-width: 700px; + /*max-width: 800px;*/ min-width: 500px; right: 200px; bottom: 15px; @@ -154,18 +155,41 @@ background: transparent url(panel_bg.png) repeat left top; } -#djDebug .panelContent .panelScroll { - position: relative; +#djDebug .panelContent .panelScrollWrap { overflow: auto; height: 90%; - padding: 0px 10px 10px 0px; + width: 100%; +} + +#djDebug .panelContent .panelScrollContent { + width: auto; + margin-right: 10px; } -#djDebug .panelContent p a, #djDebug .panelContent dl a { +#djDebug .panelContent .boxed { + background-color: #fff; + padding: 5px; + border: 1px solid #c6d6da; +} + + + +#djDebug .panelContent p a, #djDebug .panelContent dt a { color: #000; + padding: 2px 4px; } -#djDebug .panelContent p a:hover, #djDebug .panelContent dl a:hover { - color: #900; +#djDebug .panelContent p a:hover, #djDebug .panelContent dt a:hover { + background-color: #ffc; +} + +#djDebug .panelContent p a, #djDebug .panelContent dd a { + color: #000; + background-color: #eee; + padding: 2px 4px; +} +#djDebug .panelContent p a:hover, #djDebug .panelContent dd a:hover { + color: #111; + background-color: #ffc; } #djDebug .panelContent h3 { @@ -181,6 +205,9 @@ #djDebug .panelContent h4 { font-weight: normal; + margin-top: 0.5em; + font-size: 20px; + line-height: 24px; } #djDebug .panelContent code { @@ -204,17 +231,21 @@ } #djDebug .panelContent table { - width: 100%; + /*width: 90%;*/ clear: both; border: 0; padding: 0; + margin: 0; + border-collapse: collapse; + border-spacing: 0; } #djDebug .panelContent table a { color: #000; + padding: 2px 4px; } #djDebug .panelContent table a:hover { - color: #900; + background-color: #ffc; } #djDebug .panelContent table th { @@ -252,10 +283,24 @@ background-image: url(close_hover.png); } +#djDebug .panelContent .close.back { + background-image: url(back.png); +} + +#djDebug .panelContent .close.back:hover { + background-image: url(back_hover.png); +} + + + #djDebug .panelContent dt, #djDebug .panelContent dd { display: block; } +#djDebug .panelContent dt { + margin-top: 0.75em; +} + #djDebug .panelContent dd { margin-left: 10px; } -- cgit v1.2.3 From 70c97b31a1b0ef4c8002460653df1f7b85fca525 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Tue, 18 Aug 2009 16:15:34 -0700 Subject: Standardized CSS to use tabs. --- debug_toolbar/media/debug_toolbar/toolbar.css | 202 +++++++++++++------------- 1 file changed, 101 insertions(+), 101 deletions(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index faf3b7a..e513b6c 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -1,44 +1,44 @@ #djDebug * { - color: #000; - float: none; - margin: 0; - padding: 0; - position: static; - text-align: left; + color: #000; + float: none; + margin: 0; + padding: 0; + position: static; + text-align: left; font-family: Cambria, Georgia, serif; font-size: 16px; } #djDebugToolbar { - background: #111; - width: 200px; - z-index: 100000000; - position:absolute; - top:0; - bottom:0; - right:0; + background: #111; + width: 200px; + z-index: 100000000; + position:absolute; + top:0; + bottom:0; + right:0; opacity:0.9; } #djDebugToolbar small { - color:#999; + color:#999; } #djDebugToolbarHandle { - position:absolute; - background: #111; - top:0; - right:0; - height: 25px; - width: 25px; - z-index: 100000000; + position:absolute; + background: #111; + top:0; + right:0; + height: 25px; + width: 25px; + z-index: 100000000; } #djDebugToolbarHandle ul li { - list-style-type:none; - padding: 0; + list-style-type:none; + padding: 0; } #djDebugToolbarHandle ul li a { @@ -59,21 +59,21 @@ } #djDebugToolbar ul { - margin: 0; - padding: 0; - list-style: none; + margin: 0; + padding: 0; + list-style: none; } #djDebugToolbar li { - border-bottom: 1px solid #222; - color: #fff; - display: block; - font-weight: bold; - float: none; - margin: 0; - padding: 0; - position: relative; - width: auto; + border-bottom: 1px solid #222; + color: #fff; + display: block; + font-weight: bold; + float: none; + margin: 0; + padding: 0; + position: relative; + width: auto; } @@ -121,33 +121,33 @@ #djDebugToolbar #djDebugButton { - color: #92ef3f; + color: #92ef3f; } #djDebug pre { - background-color: #ffffff; + background-color: #ffffff; } #djDebug tr.djDebugOdd pre { - background-color: #eeeeee; + background-color: #eeeeee; } #djDebug .panelContent { - - display: none; - position: absolute; - margin: 0; - margin-left: 30px; - padding: 10px 20px; - top: 15px; - width: auto; - /*max-width: 800px;*/ - min-width: 500px; - right: 200px; - bottom: 15px; - color: #111; - z-index: 1000000; - /*overflow: auto;*/ + + display: none; + position: absolute; + margin: 0; + margin-left: 30px; + padding: 10px 20px; + top: 15px; + width: auto; + /*max-width: 800px;*/ + min-width: 500px; + right: 200px; + bottom: 15px; + color: #111; + z-index: 1000000; + /*overflow: auto;*/ border-left: 10px solid #c6d6da; border-top: 10px solid #c6d6da; border-bottom: 10px solid #c6d6da; @@ -175,29 +175,29 @@ #djDebug .panelContent p a, #djDebug .panelContent dt a { - color: #000; - padding: 2px 4px; + color: #000; + padding: 2px 4px; } #djDebug .panelContent p a:hover, #djDebug .panelContent dt a:hover { background-color: #ffc; } #djDebug .panelContent p a, #djDebug .panelContent dd a { - color: #000; - background-color: #eee; - padding: 2px 4px; + color: #000; + background-color: #eee; + padding: 2px 4px; } #djDebug .panelContent p a:hover, #djDebug .panelContent dd a:hover { - color: #111; + color: #111; background-color: #ffc; } #djDebug .panelContent h3 { - color: #111; - font-size: 24px; - line-height: 25px; - margin-top: 2px; - margin-bottom: 0.5em; + color: #111; + font-size: 24px; + line-height: 25px; + margin-top: 2px; + margin-bottom: 0.5em; font-variant: small-caps; } @@ -214,66 +214,66 @@ font-family: Consolas, Monaco, - "Bitstream Vera Sans Mono", - "Lucida Console", - monospace; - font-size: inherit; + "Bitstream Vera Sans Mono", + "Lucida Console", + monospace; + font-size: inherit; } #djDebug .panelContent p { - padding: 0 5px; + padding: 0 5px; } #djDebug .panelContent p, #djDebug .panelContent table, #djDebug .panelContent ol, #djDebug .panelContent ul, #djDebug .panelContent dl { - margin: 5px 0 15px; - background-color: #fff; + margin: 5px 0 15px; + background-color: #fff; } #djDebug .panelContent table { - /*width: 90%;*/ - clear: both; - border: 0; - padding: 0; - margin: 0; - border-collapse: collapse; - border-spacing: 0; + /*width: 90%;*/ + clear: both; + border: 0; + padding: 0; + margin: 0; + border-collapse: collapse; + border-spacing: 0; } #djDebug .panelContent table a { - color: #000; - padding: 2px 4px; + color: #000; + padding: 2px 4px; } #djDebug .panelContent table a:hover { - background-color: #ffc; + background-color: #ffc; } #djDebug .panelContent table th { - background-color: #333; - font-weight: bold; - color: #fff; - padding: 3px 7px 3px; - text-align: left; - cursor: pointer; + background-color: #333; + font-weight: bold; + color: #fff; + padding: 3px 7px 3px; + text-align: left; + cursor: pointer; } #djDebug .panelContent table td { - padding: 5px 10px; - font-size: 14px; - background: #fff; - color: #000; - vertical-align: top; - border: 0; + padding: 5px 10px; + font-size: 14px; + background: #fff; + color: #000; + vertical-align: top; + border: 0; } #djDebug .panelContent table tr.djDebugOdd td { background: #eee; } #djDebug .panelContent .close { - text-indent: -9999999px; - display: block; - position: absolute; - top: 5px; - left: -25px; + text-indent: -9999999px; + display: block; + position: absolute; + top: 5px; + left: -25px; background: url(close.png) no-repeat center center; height: 40px; width: 40px; @@ -294,15 +294,15 @@ #djDebug .panelContent dt, #djDebug .panelContent dd { - display: block; + display: block; } #djDebug .panelContent dt { - margin-top: 0.75em; + margin-top: 0.75em; } #djDebug .panelContent dd { - margin-left: 10px; + margin-left: 10px; } #djDebug .highlight { color: #000; } -- cgit v1.2.3 From f2ad1c6d92a44aafb6ad991abbecb56771808178 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Tue, 18 Aug 2009 16:27:06 -0700 Subject: Adding debug toolbar reset CSS. --- debug_toolbar/media/debug_toolbar/toolbar.css | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index e513b6c..fa1d329 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -1,3 +1,20 @@ +/* Debug Toolbar CSS Reset, adapted from YUI CSS Reset */ +#djDebug {color:#000;background:#FFF;} +#djDebug div,#djDebug dl,#djDebug dt,#djDebug dd,#djDebug ul,#djDebug ol,#djDebug li,#djDebug h1,#djDebug h2,#djDebug h3,#djDebug h4,#djDebug h5,#djDebug h6,#djDebug pre,#djDebug code,#djDebug form,#djDebug fieldset,#djDebug legend,#djDebug input,#djDebug button,#djDebug textarea,#djDebug p,#djDebug blockquote,#djDebug th,#djDebug td{margin:0;padding:0;} +#djDebug table{border-collapse:collapse;border-spacing:0;} +#djDebug fieldset,#djDebug img{border:0;} +#djDebug address,#djDebug caption,#djDebug cite,#djDebug code,#djDebug dfn,#djDebug em,#djDebug strong,#djDebug th,#djDebug var,#djDebug optgroup{font-style:inherit;font-weight:inherit;} +#djDebug del,#djDebug ins{text-decoration:none;} +#djDebug li{list-style:none;} +#djDebug caption,#djDebug th{text-align:left;} +#djDebug h1,#djDebug h2,#djDebug h3,#djDebug h4,#djDebug h5,#djDebug h6{font-size:100%;font-weight:normal;} +#djDebug q:before,#djDebug q:after{content:'';} +#djDebug abbr,#djDebug acronym{border:0;font-variant:normal;} +#djDebug sup{vertical-align:baseline;} +#djDebug sub{vertical-align:baseline;} +#djDebug legend{color:#000;} +#djDebug input,#djDebug button,#djDebug textarea,#djDebug select,#djDebug optgroup,#djDebug option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;} +#djDebug input,#djDebug button,#djDebug textarea,#djDebug select{*font-size:100%;} #djDebug * { color: #000; float: none; -- cgit v1.2.3 From 58c6a530619617e20a1f0e4dbeb5e687153c89c3 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Tue, 18 Aug 2009 16:27:50 -0700 Subject: Removed extra line spaces. --- debug_toolbar/media/debug_toolbar/toolbar.css | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index fa1d329..a4ded24 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -41,8 +41,6 @@ color:#999; } - - #djDebugToolbarHandle { position:absolute; background: #111; @@ -93,8 +91,6 @@ width: auto; } - - #djDebugToolbar li>a, #djDebugToolbar li>div.contentless { font-weight: normal; @@ -136,7 +132,6 @@ font-variant: normal; } - #djDebugToolbar #djDebugButton { color: #92ef3f; } @@ -189,8 +184,6 @@ border: 1px solid #c6d6da; } - - #djDebug .panelContent p a, #djDebug .panelContent dt a { color: #000; padding: 2px 4px; @@ -218,8 +211,6 @@ font-variant: small-caps; } - - #djDebug .panelContent h4 { font-weight: normal; margin-top: 0.5em; @@ -237,7 +228,6 @@ font-size: inherit; } - #djDebug .panelContent p { padding: 0 5px; } @@ -308,8 +298,6 @@ background-image: url(back_hover.png); } - - #djDebug .panelContent dt, #djDebug .panelContent dd { display: block; } -- cgit v1.2.3 From 70c3ac3f98e9ff98d39c33f38fe6daa4437908e5 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Tue, 18 Aug 2009 16:47:05 -0700 Subject: Deserify font family. --- debug_toolbar/media/debug_toolbar/toolbar.css | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index a4ded24..2a60537 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -22,8 +22,7 @@ padding: 0; position: static; text-align: left; - font-family: Cambria, Georgia, serif; - font-size: 16px; + font-family:sans-serif; } #djDebugToolbar { @@ -219,12 +218,7 @@ } #djDebug .panelContent code { - font-family: - Consolas, - Monaco, - "Bitstream Vera Sans Mono", - "Lucida Console", - monospace; + font-family: Consolas, Monaco, "Bitstream Vera Sans Mono", "Lucida Console", monospace; font-size: inherit; } -- cgit v1.2.3 From 19ac04d32c1405cabe668464b8149b525d63f026 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Tue, 18 Aug 2009 16:53:50 -0700 Subject: A few font size adjustments and removing declarations that have no effect. --- debug_toolbar/media/debug_toolbar/toolbar.css | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index 2a60537..6c61ac0 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -97,7 +97,7 @@ font-variant: small-caps; text-decoration: none; display: block; - font-size: 18px; + font-size: 16px; padding: 10px 10px 5px 25px; color: #fff; } @@ -202,11 +202,7 @@ } #djDebug .panelContent h3 { - color: #111; font-size: 24px; - line-height: 25px; - margin-top: 2px; - margin-bottom: 0.5em; font-variant: small-caps; } -- cgit v1.2.3 From 94a64b13ec3770ae7e8e378ce2ddcc489766bd0a Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Tue, 18 Aug 2009 16:54:11 -0700 Subject: Pegged the panels to fill available space and moved close button. --- debug_toolbar/media/debug_toolbar/toolbar.css | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index 6c61ac0..676969c 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -148,14 +148,11 @@ display: none; position: absolute; margin: 0; - margin-left: 30px; padding: 10px 20px; - top: 15px; - width: auto; - /*max-width: 800px;*/ - min-width: 500px; + top: 2px; right: 200px; - bottom: 15px; + bottom: 2px; + left: 2px; color: #111; z-index: 1000000; /*overflow: auto;*/ @@ -269,11 +266,11 @@ text-indent: -9999999px; display: block; position: absolute; - top: 5px; - left: -25px; - background: url(close.png) no-repeat center center; + top: 0; + right: 10px; height: 40px; width: 40px; + background: url(close.png) no-repeat center center; } #djDebug .panelContent .close:hover { -- cgit v1.2.3 From 105152318f49c077c879a1b1ed9fc37e45b90c69 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Fri, 21 Aug 2009 08:06:39 -0700 Subject: Remove added border on hover which was causing flicker and scrollbars to appear. --- debug_toolbar/media/debug_toolbar/toolbar.css | 1 - 1 file changed, 1 deletion(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index 676969c..6156fb7 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -69,7 +69,6 @@ #djDebugToolbarHandle ul li a:hover { color: #111; background-color: #9fbb54; - border: 1px solid #111; } #djDebugToolbar ul { -- cgit v1.2.3 From 996eb33778536d4eff2607f23777e6f08720eb54 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Fri, 21 Aug 2009 14:33:03 -0700 Subject: Standardize spacing in CSS. --- debug_toolbar/media/debug_toolbar/toolbar.css | 331 +++++++++++++------------- 1 file changed, 166 insertions(+), 165 deletions(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index 6156fb7..b68078f 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -15,20 +15,21 @@ #djDebug legend{color:#000;} #djDebug input,#djDebug button,#djDebug textarea,#djDebug select,#djDebug optgroup,#djDebug option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;} #djDebug input,#djDebug button,#djDebug textarea,#djDebug select{*font-size:100%;} + #djDebug * { - color: #000; - float: none; - margin: 0; - padding: 0; - position: static; - text-align: left; + color:#000; + float:none; + margin:0; + padding:0; + position:static; + text-align:left; font-family:sans-serif; } #djDebugToolbar { - background: #111; - width: 200px; - z-index: 100000000; + background:#111; + width:200px; + z-index:100000000; position:absolute; top:0; bottom:0; @@ -42,276 +43,276 @@ #djDebugToolbarHandle { position:absolute; - background: #111; + background:#111; top:0; right:0; - height: 25px; - width: 25px; - z-index: 100000000; + height:25px; + width:25px; + z-index:100000000; } #djDebugToolbarHandle ul li { list-style-type:none; - padding: 0; + padding:0; } #djDebugToolbarHandle ul li a { - display: block; - width: 100%; - font-size: 16px; - line-height: 25px; - font-weight: bold; - text-decoration: none; - color: #daf7ff; - text-align: center; + display:block; + width:100%; + font-size:16px; + line-height:25px; + font-weight:bold; + text-decoration:none; + color:#daf7ff; + text-align:center; } #djDebugToolbarHandle ul li a:hover { - color: #111; - background-color: #9fbb54; + color:#111; + background-color:#9fbb54; } #djDebugToolbar ul { - margin: 0; - padding: 0; - list-style: none; + margin:0; + padding:0; + list-style:none; } #djDebugToolbar li { - border-bottom: 1px solid #222; - color: #fff; - display: block; - font-weight: bold; - float: none; - margin: 0; - padding: 0; - position: relative; - width: auto; + border-bottom:1px solid #222; + color:#fff; + display:block; + font-weight:bold; + float:none; + margin:0; + padding:0; + position:relative; + width:auto; } #djDebugToolbar li>a, #djDebugToolbar li>div.contentless { - font-weight: normal; - font-style: normal; - font-variant: small-caps; - text-decoration: none; - display: block; - font-size: 16px; - padding: 10px 10px 5px 25px; - color: #fff; + font-weight:normal; + font-style:normal; + font-variant:small-caps; + text-decoration:none; + display:block; + font-size:16px; + padding:10px 10px 5px 25px; + color:#fff; } #djDebugToolbar li a:hover { - color: #111; - background-color: #c6d6da; - border-right: 10px solid #fff; + color:#111; + background-color:#c6d6da; + border-right:10px solid #fff; } #djDebugToolbar li.active { - background-image: url(indicator.png); - background-repeat: no-repeat; - background-position: left center; + background-image:url(indicator.png); + background-repeat:no-repeat; + background-position:left center; } #djDebugToolbar li.active a:hover { - background-color: #111; - background-image: inherit; - background-position: inherit; - background-repeat: inherit; - color: #b36a60; - border: none; + background-color:#111; + background-image:inherit; + background-position:inherit; + background-repeat:inherit; + color:#b36a60; + border:none; } #djDebugToolbar li small { - font-size: 12px; - color: #999; - font-style: italic; - text-decoration: none; - font-variant: normal; + font-size:12px; + color:#999; + font-style:italic; + text-decoration:none; + font-variant:normal; } #djDebugToolbar #djDebugButton { - color: #92ef3f; + color:#92ef3f; } #djDebug pre { - background-color: #ffffff; + background-color:#ffffff; } #djDebug tr.djDebugOdd pre { - background-color: #eeeeee; + background-color:#eeeeee; } #djDebug .panelContent { - display: none; - position: absolute; - margin: 0; - padding: 10px 20px; - top: 2px; - right: 200px; - bottom: 2px; - left: 2px; - color: #111; - z-index: 1000000; - /*overflow: auto;*/ - border-left: 10px solid #c6d6da; - border-top: 10px solid #c6d6da; - border-bottom: 10px solid #c6d6da; - opacity: 1.0; - background: transparent url(panel_bg.png) repeat left top; + display:none; + position:absolute; + margin:0; + padding:10px 20px; + top:2px; + right:200px; + bottom:2px; + left:2px; + color:#111; + z-index:1000000; + /*overflow:auto;*/ + border-left:10px solid #c6d6da; + border-top:10px solid #c6d6da; + border-bottom:10px solid #c6d6da; + opacity:1.0; + background:transparent url(panel_bg.png) repeat left top; } #djDebug .panelContent .panelScrollWrap { - overflow: auto; - height: 90%; - width: 100%; + overflow:auto; + height:90%; + width:100%; } #djDebug .panelContent .panelScrollContent { - width: auto; - margin-right: 10px; + width:auto; + margin-right:10px; } #djDebug .panelContent .boxed { - background-color: #fff; - padding: 5px; - border: 1px solid #c6d6da; + background-color:#fff; + padding:5px; + border:1px solid #c6d6da; } #djDebug .panelContent p a, #djDebug .panelContent dt a { - color: #000; - padding: 2px 4px; + color:#000; + padding:2px 4px; } #djDebug .panelContent p a:hover, #djDebug .panelContent dt a:hover { - background-color: #ffc; + background-color:#ffc; } #djDebug .panelContent p a, #djDebug .panelContent dd a { - color: #000; - background-color: #eee; - padding: 2px 4px; + color:#000; + background-color:#eee; + padding:2px 4px; } #djDebug .panelContent p a:hover, #djDebug .panelContent dd a:hover { - color: #111; - background-color: #ffc; + color:#111; + background-color:#ffc; } #djDebug .panelContent h3 { - font-size: 24px; - font-variant: small-caps; + font-size:24px; + font-variant:small-caps; } #djDebug .panelContent h4 { - font-weight: normal; - margin-top: 0.5em; - font-size: 20px; - line-height: 24px; + font-weight:normal; + margin-top:0.5em; + font-size:20px; + line-height:24px; } #djDebug .panelContent code { - font-family: Consolas, Monaco, "Bitstream Vera Sans Mono", "Lucida Console", monospace; - font-size: inherit; + font-family:Consolas, Monaco, "Bitstream Vera Sans Mono", "Lucida Console", monospace; + font-size:inherit; } #djDebug .panelContent p { - padding: 0 5px; + padding:0 5px; } #djDebug .panelContent p, #djDebug .panelContent table, #djDebug .panelContent ol, #djDebug .panelContent ul, #djDebug .panelContent dl { - margin: 5px 0 15px; - background-color: #fff; + margin:5px 0 15px; + background-color:#fff; } #djDebug .panelContent table { - /*width: 90%;*/ - clear: both; - border: 0; - padding: 0; - margin: 0; - border-collapse: collapse; - border-spacing: 0; + /*width:90%;*/ + clear:both; + border:0; + padding:0; + margin:0; + border-collapse:collapse; + border-spacing:0; } #djDebug .panelContent table a { - color: #000; - padding: 2px 4px; + color:#000; + padding:2px 4px; } #djDebug .panelContent table a:hover { - background-color: #ffc; + background-color:#ffc; } #djDebug .panelContent table th { - background-color: #333; - font-weight: bold; - color: #fff; - padding: 3px 7px 3px; - text-align: left; - cursor: pointer; + background-color:#333; + font-weight:bold; + color:#fff; + padding:3px 7px 3px; + text-align:left; + cursor:pointer; } #djDebug .panelContent table td { - padding: 5px 10px; - font-size: 14px; - background: #fff; - color: #000; - vertical-align: top; - border: 0; + padding:5px 10px; + font-size:14px; + background:#fff; + color:#000; + vertical-align:top; + border:0; } #djDebug .panelContent table tr.djDebugOdd td { - background: #eee; + background:#eee; } #djDebug .panelContent .close { - text-indent: -9999999px; - display: block; - position: absolute; - top: 0; - right: 10px; - height: 40px; - width: 40px; - background: url(close.png) no-repeat center center; + text-indent:-9999999px; + display:block; + position:absolute; + top:0; + right:10px; + height:40px; + width:40px; + background:url(close.png) no-repeat center center; } #djDebug .panelContent .close:hover { - background-image: url(close_hover.png); + background-image:url(close_hover.png); } #djDebug .panelContent .close.back { - background-image: url(back.png); + background-image:url(back.png); } #djDebug .panelContent .close.back:hover { - background-image: url(back_hover.png); + background-image:url(back_hover.png); } #djDebug .panelContent dt, #djDebug .panelContent dd { - display: block; + display:block; } #djDebug .panelContent dt { - margin-top: 0.75em; + margin-top:0.75em; } #djDebug .panelContent dd { - margin-left: 10px; -} - -#djDebug .highlight { color: #000; } -#djDebug .highlight .err { color: #000; } /* Error */ -#djDebug .highlight .g { color: #000; } /* Generic */ -#djDebug .highlight .k { color: #000; font-weight: bold } /* Keyword */ -#djDebug .highlight .o { color: #000; } /* Operator */ -#djDebug .highlight .n { color: #000; } /* Name */ -#djDebug .highlight .mi { color: #000; font-weight: bold } /* Literal.Number.Integer */ -#djDebug .highlight .l { color: #000; } /* Literal */ -#djDebug .highlight .x { color: #000; } /* Other */ -#djDebug .highlight .p { color: #000; } /* Punctuation */ -#djDebug .highlight .m { color: #000; font-weight: bold } /* Literal.Number */ -#djDebug .highlight .s { color: #333 } /* Literal.String */ -#djDebug .highlight .w { color: #888888 } /* Text.Whitespace */ -#djDebug .highlight .il { color: #000; font-weight: bold } /* Literal.Number.Integer.Long */ -#djDebug .highlight .na { color: #333 } /* Name.Attribute */ -#djDebug .highlight .nt { color: #000; font-weight: bold } /* Name.Tag */ -#djDebug .highlight .nv { color: #333 } /* Name.Variable */ -#djDebug .highlight .s2 { color: #333 } /* Literal.String.Double */ -#djDebug .highlight .cp { color: #333 } /* Comment.Preproc */ + margin-left:10px; +} + +#djDebug .highlight { color:#000; } +#djDebug .highlight .err { color:#000; } /* Error */ +#djDebug .highlight .g { color:#000; } /* Generic */ +#djDebug .highlight .k { color:#000; font-weight: bold } /* Keyword */ +#djDebug .highlight .o { color:#000; } /* Operator */ +#djDebug .highlight .n { color:#000; } /* Name */ +#djDebug .highlight .mi { color:#000; font-weight: bold } /* Literal.Number.Integer */ +#djDebug .highlight .l { color:#000; } /* Literal */ +#djDebug .highlight .x { color:#000; } /* Other */ +#djDebug .highlight .p { color:#000; } /* Punctuation */ +#djDebug .highlight .m { color:#000; font-weight: bold } /* Literal.Number */ +#djDebug .highlight .s { color:#333 } /* Literal.String */ +#djDebug .highlight .w { color:#888888 } /* Text.Whitespace */ +#djDebug .highlight .il { color:#000; font-weight: bold } /* Literal.Number.Integer.Long */ +#djDebug .highlight .na { color:#333 } /* Name.Attribute */ +#djDebug .highlight .nt { color:#000; font-weight: bold } /* Name.Tag */ +#djDebug .highlight .nv { color:#333 } /* Name.Variable */ +#djDebug .highlight .s2 { color:#333 } /* Literal.String.Double */ +#djDebug .highlight .cp { color:#333 } /* Comment.Preproc */ -- cgit v1.2.3 From 5c9ebea7a2738517189ac1701f72b8942b590dc1 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Fri, 21 Aug 2009 14:56:30 -0700 Subject: Cleaning up and simplifying the closed handle HTML and CSS. --- debug_toolbar/media/debug_toolbar/toolbar.css | 55 +++++++++++---------------- 1 file changed, 22 insertions(+), 33 deletions(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index b68078f..029148c 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -41,37 +41,6 @@ color:#999; } -#djDebugToolbarHandle { - position:absolute; - background:#111; - top:0; - right:0; - height:25px; - width:25px; - z-index:100000000; -} - -#djDebugToolbarHandle ul li { - list-style-type:none; - padding:0; -} - -#djDebugToolbarHandle ul li a { - display:block; - width:100%; - font-size:16px; - line-height:25px; - font-weight:bold; - text-decoration:none; - color:#daf7ff; - text-align:center; -} - -#djDebugToolbarHandle ul li a:hover { - color:#111; - background-color:#9fbb54; -} - #djDebugToolbar ul { margin:0; padding:0; @@ -131,8 +100,28 @@ font-variant:normal; } -#djDebugToolbar #djDebugButton { - color:#92ef3f; +#djDebugToolbarHandle { + position:absolute; + background:#111; + top:0; + bottom:0; + right:0; + z-index:100000000; +} + +#djDebug a#djShowToolBarButton { + display:block; + height:100%; + padding:2px; + color:#fff; + font-size:10px; + font-weight:bold; + text-decoration:none; + text-align:center; +} + +#djDebug a#djShowToolBarButton:hover { + background-color:#f00; } #djDebug pre { -- cgit v1.2.3 From ecd7f2abe62996b19720e9ade61b45eafac590e8 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Mon, 24 Aug 2009 11:24:38 -0700 Subject: Make panel content stylings look like Django's debug template. --- debug_toolbar/media/debug_toolbar/toolbar.css | 98 ++++++++++++++------------- debug_toolbar/media/debug_toolbar/toolbar.js | 2 +- 2 files changed, 51 insertions(+), 49 deletions(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index 029148c..9da3f32 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -133,75 +133,78 @@ } #djDebug .panelContent { - display:none; position:absolute; margin:0; - padding:10px 20px; - top:2px; + top:0; right:200px; - bottom:2px; - left:2px; - color:#111; + bottom:0; + left:0; + background-color:#f6f6f6; + color:#666; z-index:1000000; - /*overflow:auto;*/ - border-left:10px solid #c6d6da; - border-top:10px solid #c6d6da; - border-bottom:10px solid #c6d6da; - opacity:1.0; - background:transparent url(panel_bg.png) repeat left top; -} - -#djDebug .panelContent .panelScrollWrap { overflow:auto; - height:90%; - width:100%; } -#djDebug .panelContent .panelScrollContent { - width:auto; - margin-right:10px; +#djDebug .panelContent > div { + border-bottom:1px solid #ddd; + padding:10px 20px; } -#djDebug .panelContent .boxed { - background-color:#fff; - padding:5px; - border:1px solid #c6d6da; +.djDebugPanelTitle { + background-color:#ffc; + color:#666; } - -#djDebug .panelContent p a, #djDebug .panelContent dt a { - color:#000; - padding:2px 4px; +#djDebug h3 { + font-size:24px; + font-weight:bold; + font-variant:small-caps; } -#djDebug .panelContent p a:hover, #djDebug .panelContent dt a:hover { - background-color:#ffc; + +#djDebug h4 { + font-size:20px; + font-weight:bold; } -#djDebug .panelContent p a, #djDebug .panelContent dd a { - color:#000; +#djDebug .panelContent { background-color:#eee; - padding:2px 4px; -} -#djDebug .panelContent p a:hover, #djDebug .panelContent dd a:hover { - color:#111; - background-color:#ffc; + color:#000; } -#djDebug .panelContent h3 { - font-size:24px; - font-variant:small-caps; +#djDebug .panelContent table { + border:1px solid #ccc; + border-collapse:collapse; + width:100%; + background-color:#fff; } - -#djDebug .panelContent h4 { +#djDebug .panelContent tbody td, +#djDebug .panelContent tbody th { + vertical-align:top; + padding:2px 3px; +} +#djDebug .panelContent thead th { + padding:1px 6px 1px 3px; + background:#fefefe; + text-align:left; font-weight:normal; - margin-top:0.5em; - font-size:20px; - line-height:24px; + font-size:11px; + border:1px solid #ddd; +} +#djDebug .panelContent tbody th { + width:12em; + text-align:right; + color:#666; + padding-right:.5em; } #djDebug .panelContent code { font-family:Consolas, Monaco, "Bitstream Vera Sans Mono", "Lucida Console", monospace; - font-size:inherit; + font-size:12px; +} +/* +#djDebug .panelContent p a:hover, #djDebug .panelContent dd a:hover { + color:#111; + background-color:#ffc; } #djDebug .panelContent p { @@ -212,9 +215,7 @@ margin:5px 0 15px; background-color:#fff; } - #djDebug .panelContent table { - /*width:90%;*/ clear:both; border:0; padding:0; @@ -250,6 +251,7 @@ #djDebug .panelContent table tr.djDebugOdd td { background:#eee; } +*/ #djDebug .panelContent .close { text-indent:-9999999px; diff --git a/debug_toolbar/media/debug_toolbar/toolbar.js b/debug_toolbar/media/debug_toolbar/toolbar.js index 355a66f..b20a487 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.js +++ b/debug_toolbar/media/debug_toolbar/toolbar.js @@ -31,7 +31,7 @@ jQuery(function($j) { $j('#djDebug a.remoteCall').click(function() { $j('#djDebugWindow').load(this.href, {}, function() { $j('#djDebugWindow a.back').click(function() { - $j(this).parent().hide(); + $j(this).parent().parent().hide(); return false; }); }); -- cgit v1.2.3 From 7fa494e0dc1aa519ab937625e2f6f940861717f2 Mon Sep 17 00:00:00 2001 From: Idan Gazit Date: Tue, 25 Aug 2009 01:04:12 +0300 Subject: Updated graphics for new colorscheme --- debug_toolbar/media/debug_toolbar/back.png | Bin 1078 -> 1039 bytes debug_toolbar/media/debug_toolbar/back_hover.png | Bin 1084 -> 1030 bytes debug_toolbar/media/debug_toolbar/close.png | Bin 1130 -> 1045 bytes debug_toolbar/media/debug_toolbar/close_hover.png | Bin 1158 -> 1155 bytes debug_toolbar/media/debug_toolbar/djdt_vertical.png | Bin 0 -> 2054 bytes debug_toolbar/media/debug_toolbar/indicator.png | Bin 278 -> 282 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 debug_toolbar/media/debug_toolbar/djdt_vertical.png (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/back.png b/debug_toolbar/media/debug_toolbar/back.png index fa6a36b..6ac8a52 100644 Binary files a/debug_toolbar/media/debug_toolbar/back.png and b/debug_toolbar/media/debug_toolbar/back.png differ diff --git a/debug_toolbar/media/debug_toolbar/back_hover.png b/debug_toolbar/media/debug_toolbar/back_hover.png index 774f97c..452b673 100644 Binary files a/debug_toolbar/media/debug_toolbar/back_hover.png and b/debug_toolbar/media/debug_toolbar/back_hover.png differ diff --git a/debug_toolbar/media/debug_toolbar/close.png b/debug_toolbar/media/debug_toolbar/close.png index c22e2e8..c0e8135 100644 Binary files a/debug_toolbar/media/debug_toolbar/close.png and b/debug_toolbar/media/debug_toolbar/close.png differ diff --git a/debug_toolbar/media/debug_toolbar/close_hover.png b/debug_toolbar/media/debug_toolbar/close_hover.png index f868e80..5b2c812 100644 Binary files a/debug_toolbar/media/debug_toolbar/close_hover.png and b/debug_toolbar/media/debug_toolbar/close_hover.png differ diff --git a/debug_toolbar/media/debug_toolbar/djdt_vertical.png b/debug_toolbar/media/debug_toolbar/djdt_vertical.png new file mode 100644 index 0000000..c204965 Binary files /dev/null and b/debug_toolbar/media/debug_toolbar/djdt_vertical.png differ diff --git a/debug_toolbar/media/debug_toolbar/indicator.png b/debug_toolbar/media/debug_toolbar/indicator.png index a21fc6e..dd2e0de 100644 Binary files a/debug_toolbar/media/debug_toolbar/indicator.png and b/debug_toolbar/media/debug_toolbar/indicator.png differ -- cgit v1.2.3 From 5c217d36a1ba1604dc5450351f4f090d71572d85 Mon Sep 17 00:00:00 2001 From: Idan Gazit Date: Tue, 25 Aug 2009 02:22:48 +0300 Subject: Fixed position toolbar, Smaller close handle, ported style changes from idan/ui-rf --- .../media/debug_toolbar/djdt_vertical.png | Bin 2054 -> 1349 bytes debug_toolbar/media/debug_toolbar/toolbar.css | 61 +++++++++++++-------- 2 files changed, 37 insertions(+), 24 deletions(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/djdt_vertical.png b/debug_toolbar/media/debug_toolbar/djdt_vertical.png index c204965..000c60f 100644 Binary files a/debug_toolbar/media/debug_toolbar/djdt_vertical.png and b/debug_toolbar/media/debug_toolbar/djdt_vertical.png differ diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index 9da3f32..ca3e309 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -30,7 +30,7 @@ background:#111; width:200px; z-index:100000000; - position:absolute; + position:fixed; top:0; bottom:0; right:0; @@ -63,7 +63,6 @@ #djDebugToolbar li>div.contentless { font-weight:normal; font-style:normal; - font-variant:small-caps; text-decoration:none; display:block; font-size:16px; @@ -73,55 +72,66 @@ #djDebugToolbar li a:hover { color:#111; - background-color:#c6d6da; - border-right:10px solid #fff; + background-color:#ffc; } #djDebugToolbar li.active { background-image:url(indicator.png); background-repeat:no-repeat; background-position:left center; + background-color: #333; + padding-left: 10px; + } #djDebugToolbar li.active a:hover { - background-color:#111; - background-image:inherit; - background-position:inherit; - background-repeat:inherit; color:#b36a60; - border:none; + background-color: transparent; } #djDebugToolbar li small { font-size:12px; color:#999; - font-style:italic; + font-style:normal; text-decoration:none; - font-variant:normal; + font-variant:small-caps; } #djDebugToolbarHandle { - position:absolute; - background:#111; - top:0; - bottom:0; + position:fixed; + background:#fff; + border:1px solid #111; + top:30px; right:0; z-index:100000000; + opacity: 0.75; } #djDebug a#djShowToolBarButton { display:block; - height:100%; - padding:2px; + height:75px; + width: 30px; + border-right: none; + border-bottom:4px solid #fff; + border-top:4px solid #fff; + border-left:4px solid #fff; color:#fff; font-size:10px; font-weight:bold; text-decoration:none; text-align:center; + text-indent:-999999px; + background:#000 url(djdt_vertical.png) no-repeat left center; + opacity:0.5; } #djDebug a#djShowToolBarButton:hover { - background-color:#f00; + background-color:#111; + padding-right:6px; + border-top-color:#ffc; + border-left-color:#ffc; + border-bottom-color:#ffc; + opacity:1.0; } #djDebug pre { @@ -134,7 +144,7 @@ #djDebug .panelContent { display:none; - position:absolute; + position:fixed; margin:0; top:0; right:200px; @@ -143,7 +153,6 @@ background-color:#f6f6f6; color:#666; z-index:1000000; - overflow:auto; } #djDebug .panelContent > div { @@ -155,10 +164,15 @@ background-color:#ffc; color:#666; } + +.djDebugPanelContent { + overflow:hidden; + height:90%; +} + #djDebug h3 { font-size:24px; font-weight:bold; - font-variant:small-caps; } #djDebug h4 { @@ -199,7 +213,6 @@ #djDebug .panelContent code { font-family:Consolas, Monaco, "Bitstream Vera Sans Mono", "Lucida Console", monospace; - font-size:12px; } /* #djDebug .panelContent p a:hover, #djDebug .panelContent dd a:hover { @@ -257,8 +270,8 @@ text-indent:-9999999px; display:block; position:absolute; - top:0; - right:10px; + top:4px; + right:15px; height:40px; width:40px; background:url(close.png) no-repeat center center; -- cgit v1.2.3 From fb49e448bfa89edcd2eee9518716cce867e2d7a9 Mon Sep 17 00:00:00 2001 From: Idan Gazit Date: Tue, 25 Aug 2009 02:34:11 +0300 Subject: toolbar handle padding made orange on hover --- debug_toolbar/media/debug_toolbar/toolbar.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index ca3e309..f58899a 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -128,9 +128,9 @@ #djDebug a#djShowToolBarButton:hover { background-color:#111; padding-right:6px; - border-top-color:#ffc; - border-left-color:#ffc; - border-bottom-color:#ffc; + border-top-color:#FFE761; + border-left-color:#FFE761; + border-bottom-color:#FFE761; opacity:1.0; } -- cgit v1.2.3 From b71ac81f13110e07e6f28cd4a01754833e3cfcbb Mon Sep 17 00:00:00 2001 From: Idan Gazit Date: Tue, 25 Aug 2009 14:45:28 +0300 Subject: Working panel structure with scroll, Wider handle tab for hover. --- debug_toolbar/media/debug_toolbar/indicator.png | Bin 282 -> 607 bytes debug_toolbar/media/debug_toolbar/toolbar.css | 38 ++++++++++++++++-------- 2 files changed, 26 insertions(+), 12 deletions(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/indicator.png b/debug_toolbar/media/debug_toolbar/indicator.png index dd2e0de..1a2c578 100644 Binary files a/debug_toolbar/media/debug_toolbar/indicator.png and b/debug_toolbar/media/debug_toolbar/indicator.png differ diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index f58899a..a2f4ef3 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -150,29 +150,47 @@ right:200px; bottom:0; left:0; - background-color:#f6f6f6; + background-color:#eee; color:#666; z-index:1000000; } #djDebug .panelContent > div { border-bottom:1px solid #ddd; - padding:10px 20px; } -.djDebugPanelTitle { +#djDebug .djDebugPanelTitle { + position: absolute; background-color:#ffc; color:#666; + padding-left: 20px; + top: 0; + right: 0; + left: 0; + height: 50px; +} + +#djDebug .djDebugPanelContent { + position: absolute; + top: 50px; + right: 0; + bottom: 0; + left: 0; + height: auto; + padding: 10px 20px; } -.djDebugPanelContent { - overflow:hidden; - height:90%; +#djDebug .djDebugPanelContent .boxed { + height: 100%; + overflow: auto; + display: block; + padding-right: 10px; } #djDebug h3 { font-size:24px; - font-weight:bold; + font-weight:normal; + line-height: 50px; } #djDebug h4 { @@ -180,16 +198,12 @@ font-weight:bold; } -#djDebug .panelContent { - background-color:#eee; - color:#000; -} - #djDebug .panelContent table { border:1px solid #ccc; border-collapse:collapse; width:100%; background-color:#fff; + display: block; } #djDebug .panelContent tbody td, #djDebug .panelContent tbody th { -- cgit v1.2.3 From 780c8f897d0412ea084d8482894e707fa294f2bc Mon Sep 17 00:00:00 2001 From: Idan Gazit Date: Tue, 25 Aug 2009 14:57:35 +0300 Subject: adhere to css spacing standard --- debug_toolbar/media/debug_toolbar/toolbar.css | 60 +++++++++++++-------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index a2f4ef3..f55a1d8 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -79,14 +79,14 @@ background-image:url(indicator.png); background-repeat:no-repeat; background-position:left center; - background-color: #333; - padding-left: 10px; + background-color:#333; + padding-left:10px; } #djDebugToolbar li.active a:hover { color:#b36a60; - background-color: transparent; + background-color:transparent; } #djDebugToolbar li small { @@ -104,14 +104,14 @@ top:30px; right:0; z-index:100000000; - opacity: 0.75; + opacity:0.75; } #djDebug a#djShowToolBarButton { display:block; height:75px; - width: 30px; - border-right: none; + width:30px; + border-right:none; border-bottom:4px solid #fff; border-top:4px solid #fff; border-left:4px solid #fff; @@ -160,37 +160,37 @@ } #djDebug .djDebugPanelTitle { - position: absolute; + position:absolute; background-color:#ffc; color:#666; - padding-left: 20px; - top: 0; - right: 0; - left: 0; - height: 50px; + padding-left:20px; + top:0; + right:0; + left:0; + height:50px; } #djDebug .djDebugPanelContent { - position: absolute; - top: 50px; - right: 0; - bottom: 0; - left: 0; - height: auto; - padding: 10px 20px; + position:absolute; + top:50px; + right:0; + bottom:0; + left:0; + height:auto; + padding:10px 20px; } #djDebug .djDebugPanelContent .boxed { - height: 100%; - overflow: auto; - display: block; - padding-right: 10px; + height:100%; + overflow:auto; + display:block; + padding-right:10px; } #djDebug h3 { font-size:24px; font-weight:normal; - line-height: 50px; + line-height:50px; } #djDebug h4 { @@ -203,7 +203,7 @@ border-collapse:collapse; width:100%; background-color:#fff; - display: block; + display:block; } #djDebug .panelContent tbody td, #djDebug .panelContent tbody th { @@ -318,19 +318,19 @@ #djDebug .highlight { color:#000; } #djDebug .highlight .err { color:#000; } /* Error */ #djDebug .highlight .g { color:#000; } /* Generic */ -#djDebug .highlight .k { color:#000; font-weight: bold } /* Keyword */ +#djDebug .highlight .k { color:#000; font-weight:bold } /* Keyword */ #djDebug .highlight .o { color:#000; } /* Operator */ #djDebug .highlight .n { color:#000; } /* Name */ -#djDebug .highlight .mi { color:#000; font-weight: bold } /* Literal.Number.Integer */ +#djDebug .highlight .mi { color:#000; font-weight:bold } /* Literal.Number.Integer */ #djDebug .highlight .l { color:#000; } /* Literal */ #djDebug .highlight .x { color:#000; } /* Other */ #djDebug .highlight .p { color:#000; } /* Punctuation */ -#djDebug .highlight .m { color:#000; font-weight: bold } /* Literal.Number */ +#djDebug .highlight .m { color:#000; font-weight:bold } /* Literal.Number */ #djDebug .highlight .s { color:#333 } /* Literal.String */ #djDebug .highlight .w { color:#888888 } /* Text.Whitespace */ -#djDebug .highlight .il { color:#000; font-weight: bold } /* Literal.Number.Integer.Long */ +#djDebug .highlight .il { color:#000; font-weight:bold } /* Literal.Number.Integer.Long */ #djDebug .highlight .na { color:#333 } /* Name.Attribute */ -#djDebug .highlight .nt { color:#000; font-weight: bold } /* Name.Tag */ +#djDebug .highlight .nt { color:#000; font-weight:bold } /* Name.Tag */ #djDebug .highlight .nv { color:#333 } /* Name.Variable */ #djDebug .highlight .s2 { color:#333 } /* Literal.String.Double */ #djDebug .highlight .cp { color:#333 } /* Comment.Preproc */ -- cgit v1.2.3 From f2437c9fa94df16964d97114ff943d4568c4ba15 Mon Sep 17 00:00:00 2001 From: Idan Gazit Date: Tue, 25 Aug 2009 15:53:00 +0300 Subject: Animated panels --- debug_toolbar/media/debug_toolbar/toolbar.css | 7 +++---- debug_toolbar/media/debug_toolbar/toolbar.js | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 8 deletions(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index f55a1d8..44a9074 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -80,8 +80,7 @@ background-repeat:no-repeat; background-position:left center; background-color:#333; - padding-left:10px; - + padding-left:10px; } #djDebugToolbar li.active a:hover { @@ -147,9 +146,9 @@ position:fixed; margin:0; top:0; - right:200px; + right:150px; bottom:0; - left:0; + left:50px; background-color:#eee; color:#666; z-index:1000000; diff --git a/debug_toolbar/media/debug_toolbar/toolbar.js b/debug_toolbar/media/debug_toolbar/toolbar.js index b20a487..f1e6a94 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.js +++ b/debug_toolbar/media/debug_toolbar/toolbar.js @@ -12,12 +12,16 @@ jQuery(function($j) { return false; } current = $j('#djDebug #' + this.className); + $j(document).trigger('close.djDebug'); if (current.is(':visible')) { - $j(document).trigger('close.djDebug'); $j(this).parent().removeClass("active"); } else { $j('.panelContent').hide(); - current.show(); + current.animate({ + right:"200px", + left:"0px", + opacity:"show" + },200); $j.djDebug.open(); $j('#djDebugToolbar li').removeClass("active"); $j(this).parent().addClass("active"); @@ -79,9 +83,9 @@ jQuery(function($j) { return false; }, hide_toolbar: function(setCookie) { + $j(document).trigger('close.djDebug'); $j('#djDebugToolbar').hide("fast"); $j('#djDebugToolbar li').removeClass("active"); - $j(document).trigger('close.djDebug'); $j('#djDebugToolbarHandle').show(); if (setCookie) { $j.cookie(COOKIE_NAME, 'hide', { @@ -101,7 +105,11 @@ jQuery(function($j) { }); $j(document).bind('close.djDebug', function() { $j(document).unbind('keydown.djDebug'); - $j('.panelContent').hide(); + $j('.panelContent').animate({ + right:"150px", + left:"50px", + opacity:"hide" + }, 150); $j('#djDebugToolbar li').removeClass("active"); }); }); -- cgit v1.2.3 From 760653360fa9d3bd09047dcbea7785717e54a83b Mon Sep 17 00:00:00 2001 From: Idan Gazit Date: Tue, 25 Aug 2009 17:25:36 +0300 Subject: Removed tons of invalid ".boxed" classes, renamed boxed -> scroll --- debug_toolbar/media/debug_toolbar/toolbar.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index 44a9074..bf4648a 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -179,7 +179,7 @@ padding:10px 20px; } -#djDebug .djDebugPanelContent .boxed { +#djDebug .djDebugPanelContent .scroll { height:100%; overflow:auto; display:block; -- cgit v1.2.3 From 0e65f95980e8cd2e84055ddbe52c3c40010353e2 Mon Sep 17 00:00:00 2001 From: Idan Gazit Date: Tue, 25 Aug 2009 19:14:31 +0300 Subject: Added toggle arrows, grey boxes for template links --- debug_toolbar/media/debug_toolbar/toolbar.css | 31 +++++++++++++++++++++++++-- debug_toolbar/media/debug_toolbar/toolbar.js | 8 ++++++- 2 files changed, 36 insertions(+), 3 deletions(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index bf4648a..64a1a3c 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -176,14 +176,14 @@ bottom:0; left:0; height:auto; - padding:10px 20px; + padding:0px 20px; } #djDebug .djDebugPanelContent .scroll { height:100%; overflow:auto; display:block; - padding-right:10px; + padding:10px; } #djDebug h3 { @@ -195,6 +195,8 @@ #djDebug h4 { font-size:20px; font-weight:bold; + margin-bottom:0.8em; + margin-top:0.4em; } #djDebug .panelContent table { @@ -314,6 +316,31 @@ margin-left:10px; } +#djDebug a.toggleTemplate { + padding:4px; + background-color:#bbb; + -moz-border-radius:3px; + -webkit-border-radius:3px; +} + +#djDebug a.toggleTemplate:hover { + padding:4px; + background-color:#444; + color:#ffe761; + -moz-border-radius:3px; + -webkit-border-radius:3px; +} + + +#djDebug a.djTemplateShowContext, #djDebug a.djTemplateShowContext span.toggleArrow { + color:#999; +} + +#djDebug a.djTemplateShowContext:hover, #djDebug a.djTemplateShowContext:hover span.toggleArrow { + color:#000; + cursor:pointer; +} + #djDebug .highlight { color:#000; } #djDebug .highlight .err { color:#000; } /* Error */ #djDebug .highlight .g { color:#000; } /* Generic */ diff --git a/debug_toolbar/media/debug_toolbar/toolbar.js b/debug_toolbar/media/debug_toolbar/toolbar.js index f1e6a94..e47adfa 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.js +++ b/debug_toolbar/media/debug_toolbar/toolbar.js @@ -43,6 +43,7 @@ jQuery(function($j) { return false; }); $j('#djDebugTemplatePanel a.djTemplateShowContext').click(function() { + $j.djDebug.toggle_arrow($j(this).children('.toggleArrow')) $j.djDebug.toggle_content($j(this).parent().next()); return false; }); @@ -101,7 +102,12 @@ jQuery(function($j) { path: '/', expires: -1 }); - } + }, + toggle_arrow: function(elem) { + var uarr = String.fromCharCode(0x25b6); + var darr = String.fromCharCode(0x25bc); + elem.html(elem.html() == uarr ? darr : uarr); + } }); $j(document).bind('close.djDebug', function() { $j(document).unbind('keydown.djDebug'); -- cgit v1.2.3 From 0b2e7031d9d89571055df5bad3d6cf0586a9ef61 Mon Sep 17 00:00:00 2001 From: Idan Gazit Date: Wed, 26 Aug 2009 01:45:13 +0300 Subject: more thorough reset, added #djDebug to all rules to increase their specificity. --- debug_toolbar/media/debug_toolbar/toolbar.css | 71 +++++++++++++-------------- 1 file changed, 33 insertions(+), 38 deletions(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index 64a1a3c..b645d19 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -1,32 +1,27 @@ -/* Debug Toolbar CSS Reset, adapted from YUI CSS Reset */ +/* Debug Toolbar CSS Reset, adapted from Eric Meyer's CSS Reset */ #djDebug {color:#000;background:#FFF;} -#djDebug div,#djDebug dl,#djDebug dt,#djDebug dd,#djDebug ul,#djDebug ol,#djDebug li,#djDebug h1,#djDebug h2,#djDebug h3,#djDebug h4,#djDebug h5,#djDebug h6,#djDebug pre,#djDebug code,#djDebug form,#djDebug fieldset,#djDebug legend,#djDebug input,#djDebug button,#djDebug textarea,#djDebug p,#djDebug blockquote,#djDebug th,#djDebug td{margin:0;padding:0;} -#djDebug table{border-collapse:collapse;border-spacing:0;} -#djDebug fieldset,#djDebug img{border:0;} -#djDebug address,#djDebug caption,#djDebug cite,#djDebug code,#djDebug dfn,#djDebug em,#djDebug strong,#djDebug th,#djDebug var,#djDebug optgroup{font-style:inherit;font-weight:inherit;} -#djDebug del,#djDebug ins{text-decoration:none;} -#djDebug li{list-style:none;} -#djDebug caption,#djDebug th{text-align:left;} -#djDebug h1,#djDebug h2,#djDebug h3,#djDebug h4,#djDebug h5,#djDebug h6{font-size:100%;font-weight:normal;} -#djDebug q:before,#djDebug q:after{content:'';} -#djDebug abbr,#djDebug acronym{border:0;font-variant:normal;} -#djDebug sup{vertical-align:baseline;} -#djDebug sub{vertical-align:baseline;} -#djDebug legend{color:#000;} -#djDebug input,#djDebug button,#djDebug textarea,#djDebug select,#djDebug optgroup,#djDebug option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;} -#djDebug input,#djDebug button,#djDebug textarea,#djDebug select{*font-size:100%;} - -#djDebug * { - color:#000; - float:none; - margin:0; - padding:0; - position:static; - text-align:left; - font-family:sans-serif; -} - -#djDebugToolbar { +#djDebug, #djDebug div, #djDebug span, #djDebug applet, #djDebug object, #djDebug iframe, +#djDebug h1, #djDebug h2, #djDebug h3, #djDebug h4, #djDebug h5, #djDebug h6, #djDebug p, blockquote, #djDebug pre, +#djDebug a, #djDebug abbr, #djDebug acronym, #djDebug address, #djDebug big, #djDebug cite, #djDebug code, +#djDebug del, #djDebug dfn, #djDebug em, #djDebug font, #djDebug img, #djDebug ins, #djDebug kbd, #djDebug q, #djDebug s, #djDebug samp, +#djDebug small, #djDebug strike, #djDebug strong, #djDebug sub, #djDebug sup, #djDebug tt, #djDebug var, +#djDebug b, #djDebug u, #djDebug i, #djDebug center, +#djDebug dl, #djDebug dt, #djDebug dd, #djDebug ol, #djDebug ul, #djDebug li, +#djDebug fieldset, #djDebug form, #djDebug label, #djDebug legend, +#djDebug table, #djDebug caption, #djDebug tbody, #djDebug tfoot, #djDebug thead, #djDebug tr, #djDebug th, #djDebug td { + margin: 0; + padding: 0; + border: 0; + outline: 0; + font-size: 16px%; + line-height: 1.5em; + color: #000; + vertical-align: baseline; + background: transparent; + font-family: sans-serif; +} + +#djDebug #djDebugToolbar { background:#111; width:200px; z-index:100000000; @@ -37,17 +32,17 @@ opacity:0.9; } -#djDebugToolbar small { +#djDebug #djDebugToolbar small { color:#999; } -#djDebugToolbar ul { +#djDebug #djDebugToolbar ul { margin:0; padding:0; list-style:none; } -#djDebugToolbar li { +#djDebug #djDebugToolbar li { border-bottom:1px solid #222; color:#fff; display:block; @@ -59,8 +54,8 @@ width:auto; } -#djDebugToolbar li>a, -#djDebugToolbar li>div.contentless { +#djDebug #djDebugToolbar li>a, +#djDebug #djDebugToolbar li>div.contentless { font-weight:normal; font-style:normal; text-decoration:none; @@ -70,12 +65,12 @@ color:#fff; } -#djDebugToolbar li a:hover { +#djDebug #djDebugToolbar li a:hover { color:#111; background-color:#ffc; } -#djDebugToolbar li.active { +#djDebug #djDebugToolbar li.active { background-image:url(indicator.png); background-repeat:no-repeat; background-position:left center; @@ -83,12 +78,12 @@ padding-left:10px; } -#djDebugToolbar li.active a:hover { +#djDebug #djDebugToolbar li.active a:hover { color:#b36a60; background-color:transparent; } -#djDebugToolbar li small { +#djDebug #djDebugToolbar li small { font-size:12px; color:#999; font-style:normal; @@ -96,7 +91,7 @@ font-variant:small-caps; } -#djDebugToolbarHandle { +#djDebug #djDebugToolbarHandle { position:fixed; background:#fff; border:1px solid #111; -- cgit v1.2.3 From 2256052ce57ae0496943597d0c1c082d2bbf09f1 Mon Sep 17 00:00:00 2001 From: Idan Gazit Date: Wed, 26 Aug 2009 02:03:59 +0300 Subject: Whoops, forgot a % in the css. --- debug_toolbar/media/debug_toolbar/toolbar.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index b645d19..90fe09c 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -13,7 +13,7 @@ padding: 0; border: 0; outline: 0; - font-size: 16px%; + font-size: 16px; line-height: 1.5em; color: #000; vertical-align: baseline; -- cgit v1.2.3 From 1a7e708a7e6227eea92f8c89fccc87e368c395eb Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Thu, 27 Aug 2009 14:24:01 -0700 Subject: Decrease base font size. It's increased where it needs to be elsewhere. --- debug_toolbar/media/debug_toolbar/toolbar.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index 90fe09c..7e3b59f 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -13,7 +13,7 @@ padding: 0; border: 0; outline: 0; - font-size: 16px; + font-size: 12px; line-height: 1.5em; color: #000; vertical-align: baseline; -- cgit v1.2.3 From bb16c58175cd89e78bc5cfba1272802d1099f8e6 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Thu, 27 Aug 2009 14:25:43 -0700 Subject: CSS adjusted to keep consistent alignment on left. --- debug_toolbar/media/debug_toolbar/toolbar.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index 7e3b59f..dfdb742 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -171,14 +171,14 @@ bottom:0; left:0; height:auto; - padding:0px 20px; + padding:0 0 0 20px; } #djDebug .djDebugPanelContent .scroll { height:100%; overflow:auto; display:block; - padding:10px; + padding:0 10px 0 0; } #djDebug h3 { -- cgit v1.2.3 From 23a8871b5e0fb170e33c49547746d0fa225c9f64 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Thu, 27 Aug 2009 14:26:33 -0700 Subject: CSS adjusted to consistency of header and table spacing across panels. --- debug_toolbar/media/debug_toolbar/toolbar.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index dfdb742..91b105a 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -190,8 +190,7 @@ #djDebug h4 { font-size:20px; font-weight:bold; - margin-bottom:0.8em; - margin-top:0.4em; + margin-top:0.8em; } #djDebug .panelContent table { @@ -200,6 +199,7 @@ width:100%; background-color:#fff; display:block; + margin-top:0.8em; } #djDebug .panelContent tbody td, #djDebug .panelContent tbody th { -- cgit v1.2.3 From 039601b7ec282eaee96c495b383713370d07c157 Mon Sep 17 00:00:00 2001 From: Idan Gazit Date: Fri, 28 Aug 2009 02:39:44 +0300 Subject: panel animation, we hardly knew thee (removed animation) --- debug_toolbar/media/debug_toolbar/toolbar.css | 4 ++-- debug_toolbar/media/debug_toolbar/toolbar.js | 17 +++++------------ 2 files changed, 7 insertions(+), 14 deletions(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index 91b105a..b12d86a 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -141,9 +141,9 @@ position:fixed; margin:0; top:0; - right:150px; + right:200px; bottom:0; - left:50px; + left:0px; background-color:#eee; color:#666; z-index:1000000; diff --git a/debug_toolbar/media/debug_toolbar/toolbar.js b/debug_toolbar/media/debug_toolbar/toolbar.js index e47adfa..7b6d534 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.js +++ b/debug_toolbar/media/debug_toolbar/toolbar.js @@ -12,16 +12,13 @@ jQuery(function($j) { return false; } current = $j('#djDebug #' + this.className); - $j(document).trigger('close.djDebug'); if (current.is(':visible')) { + $j(document).trigger('close.djDebug'); $j(this).parent().removeClass("active"); } else { - $j('.panelContent').hide(); - current.animate({ - right:"200px", - left:"0px", - opacity:"show" - },200); + //$j('.panelContent').hide(); + $j(document).trigger('close.djDebug'); + current.show(); $j.djDebug.open(); $j('#djDebugToolbar li').removeClass("active"); $j(this).parent().addClass("active"); @@ -111,11 +108,7 @@ jQuery(function($j) { }); $j(document).bind('close.djDebug', function() { $j(document).unbind('keydown.djDebug'); - $j('.panelContent').animate({ - right:"150px", - left:"50px", - opacity:"hide" - }, 150); + $j('.panelContent').hide() $j('#djDebugToolbar li').removeClass("active"); }); }); -- cgit v1.2.3 From 0e5e71db6e1de7210aa9a546698942bfcdc98c73 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Fri, 28 Aug 2009 08:50:00 -0700 Subject: Updated CSS to use the same huge z-index everywhere. --- debug_toolbar/media/debug_toolbar/toolbar.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index 91b105a..ad23f22 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -146,7 +146,7 @@ left:50px; background-color:#eee; color:#666; - z-index:1000000; + z-index:100000000; } #djDebug .panelContent > div { -- cgit v1.2.3 From f97ff555a4d8f22dae83bcfd0c2dcf6e846962c9 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Fri, 28 Aug 2009 09:21:39 -0700 Subject: Refactored SQL panel to use datetime objects and added a visual display of both duration and sequence to the SQL template. --- debug_toolbar/media/debug_toolbar/toolbar.css | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.css b/debug_toolbar/media/debug_toolbar/toolbar.css index ad23f22..c1fd4b0 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.css @@ -336,6 +336,27 @@ cursor:pointer; } +#djDebug .djDebugSqlWrap { + position:relative; +} + +#djDebug .djDebugSql { + z-index:100000002; +} + +#djDebug span.djDebugLineChart { + border-top:3px solid #777; + position:absolute; + bottom:0; + top:0; + left:0; + display:block; + z-index:1000000001; +} +#djDebug span.djDebugLineChartWarning { + border-top-color:#900; +} + #djDebug .highlight { color:#000; } #djDebug .highlight .err { color:#000; } /* Error */ #djDebug .highlight .g { color:#000; } /* Generic */ -- cgit v1.2.3 From 96966b8e86ca8a4a12359312d5ab7351d3788dfd Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Fri, 28 Aug 2009 12:07:26 -0700 Subject: Made ESC work on various toolbar states. When toolbar is minimized, ESC key isn't bound. Otherwise ESC will fall through until one of the following happens: If a sub panel is opened, hide it ; if a panel is open, close it ; if the toolbar is open, minimize it. --- debug_toolbar/media/debug_toolbar/toolbar.js | 50 +++++++++++++++++++--------- 1 file changed, 34 insertions(+), 16 deletions(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.js b/debug_toolbar/media/debug_toolbar/toolbar.js index 7b6d534..ccd0185 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.js +++ b/debug_toolbar/media/debug_toolbar/toolbar.js @@ -16,8 +16,7 @@ jQuery(function($j) { $j(document).trigger('close.djDebug'); $j(this).parent().removeClass("active"); } else { - //$j('.panelContent').hide(); - $j(document).trigger('close.djDebug'); + $j('.panelContent').hide(); // Hide any that are already open current.show(); $j.djDebug.open(); $j('#djDebugToolbar li').removeClass("active"); @@ -63,11 +62,7 @@ jQuery(function($j) { } }, open: function() { - $j(document).bind('keydown.djDebug', function(e) { - if (e.keyCode == 27) { - $j.djDebug.close(); - } - }); + // TODO: Decide if we should remove this }, toggle_content: function(elem) { if (elem.is(':visible')) { @@ -81,9 +76,13 @@ jQuery(function($j) { return false; }, hide_toolbar: function(setCookie) { - $j(document).trigger('close.djDebug'); - $j('#djDebugToolbar').hide("fast"); + // close any sub panels + $j('#djDebugWindow').hide(); + // close all panels + $j('.panelContent').hide(); $j('#djDebugToolbar li').removeClass("active"); + // finally close toolbar + $j('#djDebugToolbar').hide("fast"); $j('#djDebugToolbarHandle').show(); if (setCookie) { $j.cookie(COOKIE_NAME, 'hide', { @@ -93,6 +92,12 @@ jQuery(function($j) { } }, show_toolbar: function() { + // Set up keybindings + $j(document).bind('keydown.djDebug', function(e) { + if (e.keyCode == 27) { + $j.djDebug.close(); + } + }); $j('#djDebugToolbarHandle').hide(); $j('#djDebugToolbar').show("fast"); $j.cookie(COOKIE_NAME, null, { @@ -101,15 +106,28 @@ jQuery(function($j) { }); }, toggle_arrow: function(elem) { - var uarr = String.fromCharCode(0x25b6); - var darr = String.fromCharCode(0x25bc); - elem.html(elem.html() == uarr ? darr : uarr); - } + var uarr = String.fromCharCode(0x25b6); + var darr = String.fromCharCode(0x25bc); + elem.html(elem.html() == uarr ? darr : uarr); + } }); $j(document).bind('close.djDebug', function() { - $j(document).unbind('keydown.djDebug'); - $j('.panelContent').hide() - $j('#djDebugToolbar li').removeClass("active"); + // If a sub-panel is open, close that + if ($j('#djDebugWindow').is(':visible')) { + $j('#djDebugWindow').hide(); + return; + } + // If a panel is open, close that + if ($j('.panelContent').is(':visible')) { + $j('.panelContent').hide(); + return; + } + // Otherwise, just minimize the toolbar + if ($j('#djDebugToolbar').is(':visible')) { + $j.djDebug.hide_toolbar(true); + $j(document).unbind('keydown.djDebug'); + return; + } }); }); jQuery(function() { -- cgit v1.2.3 From f25ec5bb9998f26c75fccf85c880c23502c9e165 Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Fri, 28 Aug 2009 14:49:10 -0700 Subject: Fixed so key bindings are setup on init, regardless of toolbar cookie. --- debug_toolbar/media/debug_toolbar/toolbar.js | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.js b/debug_toolbar/media/debug_toolbar/toolbar.js index ccd0185..8155e2f 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.js +++ b/debug_toolbar/media/debug_toolbar/toolbar.js @@ -14,13 +14,13 @@ jQuery(function($j) { current = $j('#djDebug #' + this.className); if (current.is(':visible')) { $j(document).trigger('close.djDebug'); - $j(this).parent().removeClass("active"); + $j(this).parent().removeClass('active'); } else { $j('.panelContent').hide(); // Hide any that are already open current.show(); $j.djDebug.open(); - $j('#djDebugToolbar li').removeClass("active"); - $j(this).parent().addClass("active"); + $j('#djDebugToolbar li').removeClass('active'); + $j(this).parent().addClass('active'); } return false; }); @@ -58,7 +58,7 @@ jQuery(function($j) { if ($j.cookie(COOKIE_NAME)) { $j.djDebug.hide_toolbar(false); } else { - $j('#djDebugToolbar').show(); + $j.djDebug.show_toolbar(false); } }, open: function() { @@ -80,10 +80,12 @@ jQuery(function($j) { $j('#djDebugWindow').hide(); // close all panels $j('.panelContent').hide(); - $j('#djDebugToolbar li').removeClass("active"); + $j('#djDebugToolbar li').removeClass('active'); // finally close toolbar - $j('#djDebugToolbar').hide("fast"); + $j('#djDebugToolbar').hide('fast'); $j('#djDebugToolbarHandle').show(); + // Unbind keydown + $j(document).unbind('keydown.djDebug'); if (setCookie) { $j.cookie(COOKIE_NAME, 'hide', { path: '/', @@ -91,7 +93,7 @@ jQuery(function($j) { }); } }, - show_toolbar: function() { + show_toolbar: function(animate) { // Set up keybindings $j(document).bind('keydown.djDebug', function(e) { if (e.keyCode == 27) { @@ -99,7 +101,11 @@ jQuery(function($j) { } }); $j('#djDebugToolbarHandle').hide(); - $j('#djDebugToolbar').show("fast"); + if (animate) { + $j('#djDebugToolbar').show('fast'); + } else { + $j('#djDebugToolbar').show(); + } $j.cookie(COOKIE_NAME, null, { path: '/', expires: -1 @@ -125,7 +131,6 @@ jQuery(function($j) { // Otherwise, just minimize the toolbar if ($j('#djDebugToolbar').is(':visible')) { $j.djDebug.hide_toolbar(true); - $j(document).unbind('keydown.djDebug'); return; } }); -- cgit v1.2.3 From 608e3ce3e79e3c2d073cf72d1071b71b324485ee Mon Sep 17 00:00:00 2001 From: Rob Hudson Date: Tue, 8 Sep 2009 15:58:43 -0700 Subject: Updated toolbar to use minified versions of js and css. --- debug_toolbar/media/debug_toolbar/toolbar.min.css | 2 +- debug_toolbar/media/debug_toolbar/toolbar.min.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debug_toolbar/media') diff --git a/debug_toolbar/media/debug_toolbar/toolbar.min.css b/debug_toolbar/media/debug_toolbar/toolbar.min.css index 21262aa..3de6dac 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.min.css +++ b/debug_toolbar/media/debug_toolbar/toolbar.min.css @@ -1 +1 @@ -#djDebug *{color:#000;float:none;margin:0;padding:0;position:static;text-align:left;}#djDebug a{color:#fff;}#djDebug a:hover{color:#900;}#djDebugToolbar{background:#111;width:150px;z-index:100000000;position:absolute;top:0;bottom:0;right:0;opacity:.9;}#djDebugToolbar small{color:#999;}#djDebugToolbarHandle{position:absolute;background:#111;top:0;bottom:0;right:0;z-index:100000000;}#djDebugToolbarHandle ul li{list-style-type:none;padding:3px;}#djDebugToolbarHandle ul li a{font-size:16px;font-weight:bold;}#djDebugToolbar ul{margin:0;padding:0;list-style:none;}#djDebugToolbar li{border-bottom:1px solid #222;color:#fff;display:block;font-size:11px;font-weight:bold;float:none;margin:0;padding:0;padding:8px;position:relative;width:auto;}#djDebugToolbar li:hover{background:#222;}#djDebugToolbar li:hover a{color:#fff;}#djDebugToolbar #djDebugButton{color:#92ef3f;}#djDebug pre{background-color:#fff;}#djDebug tr.djDebugOdd pre{background-color:#eee;}#djDebug .panelContent{background:#222;display:none;position:absolute;margin:0;padding:10px;top:0;width:auto;left:0;right:150px;bottom:0;color:#fff;z-index:1000000;overflow:auto;}#djDebug .panelContent p a,#djDebug .panelContent dl a{color:#000;}#djDebug .panelContent p a:hover,#djDebug .panelContent dl a:hover{color:#900;}#djDebug .panelContent h3{color:#fff;padding:0 0 5px;}#djDebug .panelContent p{padding:0 5px;}#djDebug .panelContent p,#djDebug .panelContent table,#djDebug .panelContent ol,#djDebug .panelContent ul,#djDebug .panelContent dl{margin:5px 0 15px;background-color:#fff;}#djDebug .panelContent table{width:100%;clear:both;}#djDebug .panelContent table a{color:#000;}#djDebug .panelContent table a:hover{color:#900;}#djDebug .panelContent table th{background-color:#333;font-weight:bold;color:#fff;font-size:11px;padding:3px 7px 3px;text-align:left;cursor:pointer;}#djDebug .panelContent table td{padding:5px 10px;font-size:11px;background:#fff;color:#000;vertical-align:top;}#djDebug .panelContent table tr.djDebugOdd td{background:#eee;}#djDebug .panelContent .close{float:right;font-weight:bold;}#djDebug .panelContent dt,#djDebug .panelContent dd{display:block;}#djDebug .panelContent dd{margin-left:10px;}#djDebug .highlight{color:#000;}#djDebug .highlight .err{color:#000;}#djDebug .highlight .g{color:#000;}#djDebug .highlight .k{color:#000;font-weight:bold;}#djDebug .highlight .o{color:#000;}#djDebug .highlight .n{color:#000;}#djDebug .highlight .mi{color:#000;font-weight:bold;}#djDebug .highlight .l{color:#000;}#djDebug .highlight .x{color:#000;}#djDebug .highlight .p{color:#000;}#djDebug .highlight .m{color:#000;font-weight:bold;}#djDebug .highlight .s{color:#333;}#djDebug .highlight .w{color:#888;}#djDebug .highlight .il{color:#000;font-weight:bold;}#djDebug .highlight .na{color:#333;}#djDebug .highlight .nt{color:#000;font-weight:bold;}#djDebug .highlight .nv{color:#333;}#djDebug .highlight .s2{color:#333;}#djDebug .highlight .cp{color:#333;} \ No newline at end of file +#djDebug{color:#000;background:#FFF;}#djDebug,#djDebug div,#djDebug span,#djDebug applet,#djDebug object,#djDebug iframe,#djDebug h1,#djDebug h2,#djDebug h3,#djDebug h4,#djDebug h5,#djDebug h6,#djDebug p,blockquote,#djDebug pre,#djDebug a,#djDebug abbr,#djDebug acronym,#djDebug address,#djDebug big,#djDebug cite,#djDebug code,#djDebug del,#djDebug dfn,#djDebug em,#djDebug font,#djDebug img,#djDebug ins,#djDebug kbd,#djDebug q,#djDebug s,#djDebug samp,#djDebug small,#djDebug strike,#djDebug strong,#djDebug sub,#djDebug sup,#djDebug tt,#djDebug var,#djDebug b,#djDebug u,#djDebug i,#djDebug center,#djDebug dl,#djDebug dt,#djDebug dd,#djDebug ol,#djDebug ul,#djDebug li,#djDebug fieldset,#djDebug form,#djDebug label,#djDebug legend,#djDebug table,#djDebug caption,#djDebug tbody,#djDebug tfoot,#djDebug thead,#djDebug tr,#djDebug th,#djDebug td{margin:0;padding:0;border:0;outline:0;font-size:12px;line-height:1.5em;color:#000;vertical-align:baseline;background:transparent;font-family:sans-serif;}#djDebug #djDebugToolbar{background:#111;width:200px;z-index:100000000;position:fixed;top:0;bottom:0;right:0;opacity:.9;}#djDebug #djDebugToolbar small{color:#999;}#djDebug #djDebugToolbar ul{margin:0;padding:0;list-style:none;}#djDebug #djDebugToolbar li{border-bottom:1px solid #222;color:#fff;display:block;font-weight:bold;float:none;margin:0;padding:0;position:relative;width:auto;}#djDebug #djDebugToolbar li>a,#djDebug #djDebugToolbar li>div.contentless{font-weight:normal;font-style:normal;text-decoration:none;display:block;font-size:16px;padding:10px 10px 5px 25px;color:#fff;}#djDebug #djDebugToolbar li a:hover{color:#111;background-color:#ffc;}#djDebug #djDebugToolbar li.active{background-image:url(indicator.png);background-repeat:no-repeat;background-position:left center;background-color:#333;padding-left:10px;}#djDebug #djDebugToolbar li.active a:hover{color:#b36a60;background-color:transparent;}#djDebug #djDebugToolbar li small{font-size:12px;color:#999;font-style:normal;text-decoration:none;font-variant:small-caps;}#djDebug #djDebugToolbarHandle{position:fixed;background:#fff;border:1px solid #111;top:30px;right:0;z-index:100000000;opacity:.75;}#djDebug a#djShowToolBarButton{display:block;height:75px;width:30px;border-right:none;border-bottom:4px solid #fff;border-top:4px solid #fff;border-left:4px solid #fff;color:#fff;font-size:10px;font-weight:bold;text-decoration:none;text-align:center;text-indent:-999999px;background:#000 url(djdt_vertical.png) no-repeat left center;opacity:.5;}#djDebug a#djShowToolBarButton:hover{background-color:#111;padding-right:6px;border-top-color:#FFE761;border-left-color:#FFE761;border-bottom-color:#FFE761;opacity:1.0;}#djDebug pre{background-color:#fff;}#djDebug tr.djDebugOdd pre{background-color:#eee;}#djDebug .panelContent{display:none;position:fixed;margin:0;top:0;right:200px;bottom:0;left:0;background-color:#eee;color:#666;z-index:100000000;}#djDebug .panelContent>div{border-bottom:1px solid #ddd;}#djDebug .djDebugPanelTitle{position:absolute;background-color:#ffc;color:#666;padding-left:20px;top:0;right:0;left:0;height:50px;}#djDebug .djDebugPanelContent{position:absolute;top:50px;right:0;bottom:0;left:0;height:auto;padding:0 0 0 20px;}#djDebug .djDebugPanelContent .scroll{height:100%;overflow:auto;display:block;padding:0 10px 0 0;}#djDebug h3{font-size:24px;font-weight:normal;line-height:50px;}#djDebug h4{font-size:20px;font-weight:bold;margin-top:.8em;}#djDebug .panelContent table{border:1px solid #ccc;border-collapse:collapse;width:100%;background-color:#fff;display:block;margin-top:.8em;}#djDebug .panelContent tbody td,#djDebug .panelContent tbody th{vertical-align:top;padding:2px 3px;}#djDebug .panelContent thead th{padding:1px 6px 1px 3px;background:#fefefe;text-align:left;font-weight:normal;font-size:11px;border:1px solid #ddd;}#djDebug .panelContent tbody th{width:12em;text-align:right;color:#666;padding-right:.5em;}#djDebug .panelContent code{font-family:Consolas,Monaco,"Bitstream Vera Sans Mono","Lucida Console",monospace;}#djDebug .panelContent .close{text-indent:-9999999px;display:block;position:absolute;top:4px;right:15px;height:40px;width:40px;background:url(close.png) no-repeat center center;}#djDebug .panelContent .close:hover{background-image:url(close_hover.png);}#djDebug .panelContent .close.back{background-image:url(back.png);}#djDebug .panelContent .close.back:hover{background-image:url(back_hover.png);}#djDebug .panelContent dt,#djDebug .panelContent dd{display:block;}#djDebug .panelContent dt{margin-top:.75em;}#djDebug .panelContent dd{margin-left:10px;}#djDebug a.toggleTemplate{padding:4px;background-color:#bbb;-moz-border-radius:3px;-webkit-border-radius:3px;}#djDebug a.toggleTemplate:hover{padding:4px;background-color:#444;color:#ffe761;-moz-border-radius:3px;-webkit-border-radius:3px;}#djDebug a.djTemplateShowContext,#djDebug a.djTemplateShowContext span.toggleArrow{color:#999;}#djDebug a.djTemplateShowContext:hover,#djDebug a.djTemplateShowContext:hover span.toggleArrow{color:#000;cursor:pointer;}#djDebug .djDebugSqlWrap{position:relative;}#djDebug .djDebugSql{z-index:100000002;}#djDebug span.djDebugLineChart{border-top:3px solid #777;position:absolute;bottom:0;top:0;left:0;display:block;z-index:1000000001;}#djDebug span.djDebugLineChartWarning{border-top-color:#900;}#djDebug .highlight{color:#000;}#djDebug .highlight .err{color:#000;}#djDebug .highlight .g{color:#000;}#djDebug .highlight .k{color:#000;font-weight:bold;}#djDebug .highlight .o{color:#000;}#djDebug .highlight .n{color:#000;}#djDebug .highlight .mi{color:#000;font-weight:bold;}#djDebug .highlight .l{color:#000;}#djDebug .highlight .x{color:#000;}#djDebug .highlight .p{color:#000;}#djDebug .highlight .m{color:#000;font-weight:bold;}#djDebug .highlight .s{color:#333;}#djDebug .highlight .w{color:#888;}#djDebug .highlight .il{color:#000;font-weight:bold;}#djDebug .highlight .na{color:#333;}#djDebug .highlight .nt{color:#000;font-weight:bold;}#djDebug .highlight .nv{color:#333;}#djDebug .highlight .s2{color:#333;}#djDebug .highlight .cp{color:#333;} \ No newline at end of file diff --git a/debug_toolbar/media/debug_toolbar/toolbar.min.js b/debug_toolbar/media/debug_toolbar/toolbar.min.js index 7f8658f..4df4d68 100644 --- a/debug_toolbar/media/debug_toolbar/toolbar.min.js +++ b/debug_toolbar/media/debug_toolbar/toolbar.min.js @@ -1 +1 @@ -jQuery.noConflict();jQuery(function(b){var a="dj_debug_panel";b.djDebug=function(d,c){b.djDebug.init()};b.extend(b.djDebug,{init:function(){var c=null;b("#djDebugPanelList li a").click(function(){if(!this.className){return false}c=b("#djDebug #"+this.className);if(c.is(":visible")){b(document).trigger("close.djDebug")}else{b(".panelContent").hide();c.show();b.djDebug.open()}return false});b("#djDebug a.close").click(function(){b(document).trigger("close.djDebug");return false});b("#djDebug a.remoteCall").click(function(){b("#djDebugWindow").load(this.href,{},function(){b("#djDebugWindow a.back").click(function(){b(this).parent().hide();return false})});b("#djDebugWindow").show();return false});b("#djDebugTemplatePanel a.djTemplateShowContext").click(function(){b.djDebug.toggle_content(b(this).parent().next());return false});b("#djDebugSQLPanel a.djSQLShowStacktrace").click(function(){b.djDebug.toggle_content(b(this).parent().next());return false});b("#djHideToolBarButton").click(function(){b.djDebug.hide_toolbar(true);return false});b("#djShowToolBarButton").click(function(){b.djDebug.show_toolbar();return false});if(b.cookie(a)){b.djDebug.hide_toolbar(false)}else{b("#djDebugToolbar").show()}},open:function(){b(document).bind("keydown.djDebug",function(c){if(c.keyCode==27){b.djDebug.close()}})},toggle_content:function(c){if(c.is(":visible")){c.hide()}else{c.show()}},close:function(){b(document).trigger("close.djDebug");return false},hide_toolbar:function(c){b("#djDebugToolbar").hide("fast");b(document).trigger("close.djDebug");b("#djDebugToolbarHandle").show();if(c){b.cookie(a,"hide",{path:"/",expires:10})}},show_toolbar:function(){b("#djDebugToolbarHandle").hide();b("#djDebugToolbar").show("fast");b.cookie(a,null,{path:"/",expires:-1})}});b(document).bind("close.djDebug",function(){b(document).unbind("keydown.djDebug");b(".panelContent").hide()})});jQuery(function(){jQuery.djDebug()});jQuery.cookie=function(b,j,m){if(typeof j!="undefined"){m=m||{};if(j===null){j="";m.expires=-1}var e="";if(m.expires&&(typeof m.expires=="number"||m.expires.toUTCString)){var f;if(typeof m.expires=="number"){f=new Date();f.setTime(f.getTime()+(m.expires*24*60*60*1000))}else{f=m.expires}e="; expires="+f.toUTCString()}var l=m.path?"; path="+(m.path):"";var g=m.domain?"; domain="+(m.domain):"";var a=m.secure?"; secure":"";document.cookie=[b,"=",encodeURIComponent(j),e,l,g,a].join("")}else{var d=null;if(document.cookie&&document.cookie!=""){var k=document.cookie.split(";");for(var h=0;h