From 83676943716fac60b2950178be4ab1d807450069 Mon Sep 17 00:00:00 2001 From: hhamon Date: Mon, 28 Feb 2011 17:58:52 +0100 Subject: [PATCH] [WebProfilerBundle] simplified new web profiler layout --- .../Resources/public/css/base.css | 144 ---- .../Resources/public/css/button.css | 128 ---- .../Resources/public/css/common.css | 143 ---- .../Resources/public/css/forms.css | 37 - .../Resources/public/css/header.css | 17 - .../Resources/public/css/layout.css | 24 - .../Resources/public/css/menu.css | 81 --- .../Resources/public/css/profiler.css | 654 +++++++++++++----- .../Resources/public/css/reset.css | 135 ---- .../public/images/profiler/bg_submenu.gif | Bin 0 -> 176 bytes .../views/Collector/exception.html.twig | 4 +- .../views/Collector/logger.html.twig | 4 +- .../Resources/views/Profiler/base.html.twig | 12 +- .../Resources/views/Profiler/layout.html.twig | 58 +- 14 files changed, 476 insertions(+), 965 deletions(-) delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/base.css delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/button.css delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/common.css delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/forms.css delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/header.css delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/layout.css delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/menu.css delete mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/reset.css create mode 100644 src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/bg_submenu.gif diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/base.css b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/base.css deleted file mode 100644 index 61abedcaf7..0000000000 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/base.css +++ /dev/null @@ -1,144 +0,0 @@ - -html, -body -{ - width:100%; - min-height:100%; - _height:100%; - margin:0; - padding:0; -} -body -{ - font: 1em "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;; - text-align:left; - background-color:#efefef; -} -body -{ - /* Pour faire des hovers autre que sur des a */ - /*behavior: url(/htc/csshover.htc);*/ - /* Ca fonctionne avec ie6 et ce n'est pas accessible */ -} -p -{ - font-size:14px; - line-height:20px; - color:#868686; - padding-bottom:20px -} - -strong -{ - color:#313131; -} - -a -{ - color:#6c6159; -} -a img -{ - border:none; -} -a:hover -{ - text-decoration:underline; -} - -/** - * Fixe le problème de padding - * et de border sur les boutons - * dans firefox - */ -button::-moz-focus-inner -{ - padding: 0; - border: none; -} -/** - * Fixe le problème de padding - * proportionel au contenu des boutons - * dans Internet explorer - */ -button -{ - overflow: visible; - width: auto; -} -/* - Corrige le bug d'affichage de bordure et de - décalage du contenu sous IE en mode XP -*/ -button -{ - background-color: transparent; -} - -table, -th, -td, -tr -{ - border-collapse:collapse; - border:1px solid #d0dbb3; -} -table -{ - width:100%; - margin:10px 0 60px; -} -table th -{ - font-weight:bold; - background-color:#f1f7e2; -} -table th, -table td -{ - font-size:12px; - padding:8px 10px; -} -fieldset -{ - border:none; -} -.clear -{ - clear:both; - height:0px; - font-size:0; - line-height:0; -} -strong -{ - font-weight:bold; -} -em -{ - font-style:italic; -} -/* ------- DEBUT - Clear ------- */ - -.clear_fix:after -{ - content:"\0020"; - display:block; - height:0; - clear:both; - visibility:hidden; -} -.clear_fix -{ - display:inline-block; -} -/* \*/ * html .clear_fix -{ - height:1%; -} -.clear_fix -{ - display:block; -} - -/* ------- FIN - Clear ------- */ diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/button.css b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/button.css deleted file mode 100644 index 492470c1a7..0000000000 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/button.css +++ /dev/null @@ -1,128 +0,0 @@ -/* - Corrige le bug d'affichage de bordure et de - décalage du contenu sous IE en mode XP -*/ -button -{ - background-color: transparent; -} - -/** -* début des styles commun à tous les boutons -*/ -.shadow_extensible_button, -.extensible_button, -.non_extensible_button -{ - -webkit-appearance: button-bevel; - float: left; - text-align: left; - display: block; - padding: 0; - margin: 0; - border: 0px solid #000000; - text-decoration: none; - cursor: pointer; - background-color: transparent; - white-space: nowrap; -} -.shadow_extensible_button:hover, -.extensible_button:hover, -.non_extensible_button:hover -{ - text-decoration: none; -} - -button span -{ - position: relative; -} - -button span span, -button span span span -{ - position: static; -} - -/** -* fin des styles commun à tous les boutons -*/ - -/** -* début des styles pour le bouton non extensible 01 -*/ -.non_extensible_button_01, -.non_extensible_button_02 -{ - display: inline-block; - text-align: center; - vertical-align: middle; - border: 0; - background: none; -} - -.non_extensible_button_01 span -{ - text-decoration: none; - display: block; - height: 28px; - float: left; - padding: 0 0 0 8px; - background: transparent url("/bundles/webprofiler/images/profiler/border_l.png") no-repeat top left; -} - -.non_extensible_button_01 span span -{ - padding: 0 8px 0 0; - background: transparent url("/bundles/webprofiler/images/profiler/border_r.png") right top no-repeat; -} - -.non_extensible_button_01 span span span -{ - padding: 0px 7px; - font: bold 11px Arial, Helvetica, sans-serif; - color: #6b6b6b; - line-height: 28px; /* Alignement vertical du texte */ - background: transparent url("/bundles/webprofiler/images/profiler/btn_bg.png") repeat-x top left; -} -/* -* fin des styles pour le bouton non extensible 01 -**/ - - -/** -* début des styles pour le bouton non extensible 02 -*/ - -.non_extensible_button_02 -{ - float:none; -} - -.non_extensible_button_02 span -{ - display: block; - height: 38px; - float: left; - padding: 0 0 0 8px; - background: transparent url("/bundles/webprofiler/images/profiler/border_l.png") left top no-repeat; -} - -.non_extensible_button_02 span span -{ - padding: 0 8px 0 0; - background: transparent url("/bundles/webprofiler/images/profiler/border_r.png") right top no-repeat; -} - -.non_extensible_button_02 span span span -{ - padding: 0px 16px; - font: bold 12px/38px Arial, Helvetica, sans-serif; - text-shadow:1px 1px 1px #415a08; - text-decoration:none; - color: #FFFFFF; - background: transparent url("/bundles/webprofiler/images/profiler/btn_bg.png") repeat-x top left; -} -/* -* fin des styles pour le bouton non extensible 02 -**/ diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/common.css b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/common.css deleted file mode 100644 index e3fec8da1e..0000000000 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/common.css +++ /dev/null @@ -1,143 +0,0 @@ -h2, -h3 -{ - font-weight:bold; -} - - -h1 -{ - font-family:Georgia, "Times New Roman", Times, serif; - color:#404040; -} - -li -{ - padding-bottom:10px; - -} - -.list_02 -{ - padding-bottom:14px; -} - -.list_02 li -{ - font-size:14px; - color:#868686; - padding-bottom:20px; - list-style-type:decimal; - margin-left:24px; -} - -.box_screen, -.resume -{ - -moz-border-radius:16px; - -webkit-border-radius:16px; - border-radius:16px; - margin-bottom:20px; -} -.box_screen -{ - background-color:#FFFFFF; - border:1px solid #dfdfdf; - padding:50px; -} -.count -{ - display:inline-block; - background-color:#aacd4e; - -moz-border-radius:6px; - -webkit-border-radius:6px; - border-radius:6px; - padding:4px; - color:white; - margin-right:2px; -} - -.list_01 li -{ - padding-bottom:10px; - font-size:13px; -} - -.list_01 li a, -.list_01 li a:hover -{ - background:transparent url(/images/common/picto/blue_arrow.png) no-repeat right 6px; - padding-right:10px; - display:inline-block; - color:#0088CC; - text-decoration:none; -} - -.list_01 li a:hover -{ - text-decoration:underline; -} - -.must_highlight -{ - font-weight:normal; - color:#868686; - text-decoration:underline; -} -.box_code -{ - border:1px solid #D3D3D3; - padding:10px; - min-height:240px; - _height:240px; - overflow:auto; - margin:10px 0 20px; -} -/* -- Debut Profiler -- */ -.symfony_profiler -{ - font-family:Arial, Helvetica, sans-serif; -} -.resume -{ - background-color:#f6f6f6; - border:1px solid #dfdfdf; - padding:16px 28px; -} - -.resume p -{ - color:#313131; - font-size:12px; -} -.resume .date -{ - display:block; -} -.symfony_profiler .box_screen -{ - padding:0; -} -table th.value -{ - width:450px; - background-color:#dfeeb8; -} -.symfony_profiler h2 -{ - font-size:16px; - color:#313131; - font-weight:bold; - padding-bottom:2px; -} -.box_columns_profiler p -{ - color:#868686; - font-size:14px; - padding-bottom:20px; -} -.symfony_profiler .box_screen -{ - padding: 0; -} -/* -- FIN Profiler -- */ diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/forms.css b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/forms.css deleted file mode 100644 index 1dca429b98..0000000000 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/forms.css +++ /dev/null @@ -1,37 +0,0 @@ -.box_search -{ - padding-top:20px; -} -.error_succes strong, -.error_succes, -p.error_succes -{ - color:#759E1A; -} -.box_search .non_extensible_button -{ - float:none; -} - -.box_search label -{ - line-height:28px; - vertical-align:middle; -} - -.box_search .medium_txt -{ - width:188px; - margin-right:10px; - font-size:12px; -} - - -.medium_txt -{ - border:1px solid #dadada; - background:#FFFFFF url("/bundles/webprofiler/images/profiler/input_bg.gif") repeat-x left top; - padding:5px 6px; - color:#565656; -} -/* FIN style formulaire textarea page exception*/ \ No newline at end of file diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/header.css b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/header.css deleted file mode 100644 index 55415c606e..0000000000 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/header.css +++ /dev/null @@ -1,17 +0,0 @@ -.header -{ - padding:30px 30px 20px 30px; -} - -/* -- Debut Profiler -- */ -.symfony_profiler .header h1, -.header_logo -{ - float:left; -} -.box_search -{ - float:right; -} - -/* -- FIN Profiler -- */ \ No newline at end of file diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/layout.css b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/layout.css deleted file mode 100644 index 0d0d3de3d9..0000000000 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/layout.css +++ /dev/null @@ -1,24 +0,0 @@ -#content -{ - width:970px; - margin:0 auto; -} - -.column_01, -.column_02 -{ - float:left -} - -/* -- Debut Profiler -- */ - -.box_columns_profiler .column_01 -{ - width:250px; -} -.box_columns_profiler .column_02 -{ - width:620px; - padding:40px 0 40px 50px; -} -/* -- FIN Profiler -- */ \ No newline at end of file diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/menu.css b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/menu.css deleted file mode 100644 index f8a1663ab8..0000000000 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/menu.css +++ /dev/null @@ -1,81 +0,0 @@ -.menu_profiler -{ - border-right:1px solid #dfdfdf; -} -.menu_profiler li -{ - border-bottom:1px solid #dfdfdf; - position:relative; - padding-bottom:0; - display:block; -} -.menu_profiler li a, -.menu_profiler li a .picto -{ - display:block; - font-size:13px; - background-color:#f6f6f6; - text-transform:uppercase; - cursor:pointer; -} -.menu_profiler li a, -.menu_profiler li a:hover -{ - color:#404040; - text-decoration:none; - display:block; - background-image:none; -} -.menu_profiler li.selected a, -.menu_profiler li a:hover -{ - background:#d1d1d1 url(/images/common/backgrounds/bg_submenu.gif) repeat-x 0 0; -} - -.menu_profiler a .picto -{ - display:block; - padding:20px 20px 16px 65px; - min-height:24px; - _height:24px; -} -.menu_profiler .request a, -.menu_profiler .request .picto -{ - -moz-border-radius:16px 0 0 0; - -webkit-border-radius:16px 0 0 0; - border-radius:16px 0 0 0; -} -.menu_profiler .request .picto -{ - background:transparent url("/bundles/webprofiler/images/profiler/request.png") no-repeat 14px 14px; -} -.menu_profiler .exception .picto -{ - background:transparent url("/bundles/webprofiler/images/profiler/exception.png") no-repeat 14px 14px; -} -.menu_profiler .events .picto -{ - background:transparent url("/bundles/webprofiler/images/profiler/events.png") no-repeat 22px 14px; -} -.menu_profiler .logger .picto -{ - background:transparent url("/bundles/webprofiler/images/profiler/logger.png") no-repeat 22px 14px; -} -.menu_profiler .db .picto -{ - background:transparent url("/bundles/webprofiler/images/profiler/db.png") no-repeat 22px 14px; -} -.menu_profiler .security .picto -{ - background:transparent url("/bundles/webprofiler/images/profiler/security.png") no-repeat 22px 14px; -} -.more_information -{ - float:right; - position:relative; - top:-4px; - display:block; - width:70px; - text-align:right; -} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css index 39bc8cf006..5350ffd37a 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/profiler.css @@ -1,175 +1,262 @@ /* -Copyright (c) 2010, Yahoo! Inc. All rights reserved. +Copyright (c) 2008, Yahoo! Inc. All rights reserved. Code licensed under the BSD License: -http://developer.yahoo.com/yui/license.html -version: 3.1.2 -build: 56 +http://developer.yahoo.net/yui/license.txt +version: 2.6.0 */ -/* -html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:text-top;}sub{vertical-align:text-bottom;}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit;}input,textarea,select{*font-size:100%;}legend{color:#000;} - -.clearfix:after { - content: "\0020"; - display: block; - height: 0; - clear: both; - visibility: hidden; - overflow: hidden; +html +{ + color:#000; } -.clearfix {display: inline-block;} -* html .clearfix {height: 1%;} -.clearfix {display: block;} - -html, body { - margin: 0; - min-height: 100%; - padding: 0; - width: 100%; +body, +div, +dl, +dt, +dd, +ul, +ol, +li, +h1, +h2, +h3, +h4, +h5, +h6, +pre, +code, +form, +fieldset, +legend, +input, +textarea, +p, +blockquote, +th, +td +{ + margin:0; + padding:0; } -*/ -html { - background: #fff; +table +{ + border-collapse:collapse; + border-spacing:0; +} +fieldset, +img +{ + border:0; +} +address, +caption, +cite, +code, +dfn, +em, +strong, +th, +var +{ + font-style:normal; + font-weight:normal; } -body { - background-color: #efefef; - font: 1em "Lucida Sans Unicode","Lucida Grande",Verdana,Arial,Helvetica,sans-serif; - text-align: left; - color: #000; +li +{ + list-style:none; } -h1 { - float: left; - color: #404040; - font-family: Georgia,"Times New Roman",Times,serif; - font-size: 100%; - font-weight: normal; +caption, +th +{ + text-align:left; } -#content { - font-family: Arial,Helvetica,sans-serif; - margin: 0 auto; - width: 970px; +h1, +h2, +h3, +h4, +h5, +h6 +{ + font-size:100%; + font-weight:normal; } -#content .clear_fix { - display: block; +q:before, +q:after { + content:''; } -.header { - padding: 30px 30px 20px; +abbr, +acronym +{ + border:0; + font-variant:normal; +} +/* to preserve line-height and selector appearance */ +sup +{ + vertical-align:text-top; +} +sub +{ + vertical-align:text-bottom; +} +input, +textarea, +select +{ + font-family:inherit; + font-size:inherit; + font-weight:inherit; } -.search { - padding-top: 20px; - float: right; +/*to enable resizing for IE*/ + +input, +textarea, +select +{ + *font-size:100%; } -.search label { - line-height: 28px; - vertical-align: middle; +/*because legend doesn't inherit in IE */ +legend +{ + color:#000; } -.search input { - font-size: 12px; - margin-right: 10px; - width: 188px; - background: url("/bundles/webprofiler/images/profiler/input_bg.gif") repeat-x scroll left top #fff; - border: 1px solid #dadada; - color: #565656; - padding: 5px 6px; +del, +ins +{ + text-decoration:none; } -.search button { - overflow: visible; - width: auto; - float: none; - background: none repeat scroll 0 0 transparent; - border: 0 none; - display: inline-block; - text-align: center; - vertical-align: middle; - cursor: pointer; - margin: 0; - padding: 0; - text-decoration: none; - white-space: nowrap; +html, +body +{ + width:100%; + min-height:100%; + _height:100%; + margin:0; + padding:0; +} +body +{ + font: 1em "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;; + text-align:left; + background-color:#efefef; } -.search button span { - position: relative; - background: url("/bundles/webprofiler/images/profiler/border_l.png") no-repeat scroll left top transparent; - display: block; - float: left; - height: 28px; - padding: 0 0 0 8px; - text-decoration: none; +p +{ + font-size:14px; + line-height:20px; + color:#868686; + padding-bottom:20px } -.search button span span { - background: url("/bundles/webprofiler/images/profiler/border_r.png") no-repeat scroll right top transparent; - padding: 0 8px 0 0; +strong +{ + color:#313131; + font-weight:bold; } -.search button span span span { - background: url("/bundles/webprofiler/images/profiler/btn_bg.png") repeat-x scroll left top transparent; - color: #6B6B6B; - font: bold 11px/28px Arial,Helvetica,sans-serif; - padding: 0 7px; +em +{ + font-style:italic; } -.resume { - margin: 0; - background-color: #f6f6f6; - border: 1px solid #dfdfdf; - padding: 16px 28px; - -moz-border-radius: 16px 16px 16px 16px; - border-radius:16px; - margin-bottom: 20px; +a +{ + color:#6c6159; } -/* -strong { - font-weight: bold; +a img +{ + border:none; } -em { - font-style: italic; +a:hover +{ + text-decoration:underline; } -a { - color: #222; +button::-moz-focus-inner +{ + padding: 0; + border: none; } -abbr { - border-bottom: 1px dotted #000000; - cursor: help; +button +{ + overflow: visible; + width: auto; } -h1 { - font-size: 190%; - letter-spacing: -0.03em; +button +{ + background-color: transparent; + font-weight:bold; } -h1 img { - margin: 0 5px 0 0; - height: 32px; +table, +th, +td, +tr +{ + border-collapse:collapse; + border:1px solid #d0dbb3; +} +table +{ + width:100%; + margin:10px 0 60px; } -h2 { - font-size: 180%; - letter-spacing: -0.02em; - padding: 10px 0; +table th +{ + font-weight:bold; + background-color:#f1f7e2; } -h3 { - font-size: 160%; - letter-spacing: -0.02em; - padding: 10px 0; +table th, table td +{ + font-size:12px; + padding:8px 10px; } -img { - vertical-align: middle; +fieldset +{ + border:none; +} + +.clear +{ + clear:both; + height:0px; + font-size:0; + line-height:0; +} + +.clear_fix:after +{ + content:"\0020"; + display:block; + height:0; + clear:both; + visibility:hidden; +} + +* html .clear_fix +{ + height:1%; +} + +.clear_fix +{ + display:block; } #content @@ -178,125 +265,231 @@ img { margin:0 auto; } -.header { - padding: 10px; - background: #333; - color: #fff; +.header +{ + padding:30px 30px 20px 30px; } -.header div { - margin-left: 45px; +.header h1 +{ + float:left; } -.header a { - color: #fff; +.search +{ + float:right; } -.menu, td.menu { - width: 240px; +.menu_profiler +{ + border-right:1px solid #dfdfdf; } -.content { - padding: 15px 15px 15px 35px; +.menu_profiler li +{ + border-bottom:1px solid #dfdfdf; + position:relative; + padding-bottom:0; + display:block; } -.search, .import { - background: #efefef; - color: #333; +.menu_profiler li a, +.menu_profiler li a .picto +{ + display:block; + font-size:13px; + background-color:#f6f6f6; + text-transform:uppercase; + cursor:pointer; } -.search h3, .import h3 { - padding: 4px 10px; - background-image: -moz-linear-gradient(-90deg, #ededed, #a3a2a2); - background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ededed), to(#a3a2a2)); - font-size: 115%; +.menu_profiler li a, +.menu_profiler li a:hover +{ + color:#404040; + text-decoration:none; + display:block; + background-image:none; } -.search form, .import form { - padding: 10px; +.menu_profiler li.selected a, +.menu_profiler li a:hover +{ + background:#d1d1d1 url("/bundles/webprofiler/images/profiler/bg_submenu.gif") repeat-x 0 0; } -.search input, .import input { - float: left; - margin-bottom: 7px; +.menu_profiler a .picto +{ + display:block; + padding:20px 20px 16px 65px; + min-height:24px; + _height:24px; } -.search input.submit, .import input.submit { - float: right; +.menu_profiler .request a, +.menu_profiler .request .picto +{ + -moz-border-radius:16px 0 0 0; + -webkit-border-radius:16px 0 0 0; + border-radius:16px 0 0 0; } -.search label { - float: left; - width: 50px; +.menu_profiler .request .picto +{ + background:transparent url("/bundles/webprofiler/images/profiler/request.png") no-repeat 14px 14px; } -th, td { - padding: 5px; - border: 1px solid #b4b4b4; +.menu_profiler .exception .picto +{ + background:transparent url("/bundles/webprofiler/images/profiler/exception.png") no-repeat 14px 14px; } -th { - font-weight: bold; - background: #edf3fe; +.menu_profiler .events .picto +{ + background:transparent url("/bundles/webprofiler/images/profiler/events.png") no-repeat 22px 14px; } -pre { - overflow: auto; +.menu_profiler .logger .picto +{ + background:transparent url("/bundles/webprofiler/images/profiler/logger.png") no-repeat 22px 14px; } -table { - width: 100%; +.menu_profiler .db .picto +{ + background:transparent url("/bundles/webprofiler/images/profiler/db.png") no-repeat 22px 14px; } -.menu ul { - background: #dde4eb; - font-size: 130%; - padding: 15px 0; +.menu_profiler .security .picto +{ + background:transparent url("/bundles/webprofiler/images/profiler/security.png") no-repeat 22px 14px; } -.menu li { - padding: 5px 10px; +.menu_profiler .picto span.count +{ + float:right; + position:relative; + top:-4px; + display:block; + width:70px; + text-align:right; } -.menu li.selected { - background: #0065bd; - color: #fff; - background-image: -moz-linear-gradient(-90deg, #5fa3e0, #0065bd); - background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#5fa3e0), to(#0065bd)); +.navigation, .collector_content +{ + float:left } -.menu li a { - color: #000; - text-decoration: none; +.navigation +{ + width:250px; } -.menu li.selected a { - color: #fff; +.collector_content +{ + width:620px; + padding:40px 0 40px 50px; } -.count { - font-family: monospace; - font-weight: bold; - padding: 4px; - margin-left: 5px; - margin-top: 5px; - font-size: 80%; - float: right; - background-color: #9cc2e8; - color: #fff; - -moz-border-radius: 7px; -webkit-border-radius: 7px; border-radius: 7px; +h1 +{ + font-family:Georgia, "Times New Roman", Times, serif; + color:#404040; +} + +h2, h3 +{ + font-weight:bold; +} + +li +{ + padding-bottom:10px; + +} + +.main, .resume +{ + -moz-border-radius:16px; + -webkit-border-radius:16px; + border-radius:16px; + margin-bottom:20px; +} + +.menu_profiler .picto span.count span +{ + display:inline-block; + background-color:#aacd4e; + -moz-border-radius:6px; + -webkit-border-radius:6px; + border-radius:6px; + padding:4px; + color:white; + margin-right:2px; +} + +#content +{ + font-family:Arial, Helvetica, sans-serif; +} + +.resume +{ + background-color:#f6f6f6; + border:1px solid #dfdfdf; + padding:16px 28px; +} + +.resume p +{ + color:#313131; + font-size:12px; +} + +.resume .date +{ + display:block; +} + +table th.value +{ + width:450px; + background-color:#dfeeb8; +} + +#content h2 +{ + font-size:16px; + color:#313131; + font-weight:bold; + padding-bottom:2px; +} + +#content .main +{ + padding: 0; + background-color:#FFFFFF; + border:1px solid #dfdfdf; +} + +#content .main p +{ + color:#868686; + font-size:14px; + padding-bottom:20px; } .sf-toolbarreset { border-top: 0; + padding: 0; } ul.alt li { padding: 5px 7px; + font-size: 13px; } ul.alt li.even { - background: #edf3fe; + background: #f1f7e2; } ul.alt li.error { @@ -310,4 +503,81 @@ td.main, td.menu { border: 0; vertical-align: top; } -*/ \ No newline at end of file + +.search +{ + padding-top:20px; +} + +.search label +{ + line-height:28px; + vertical-align:middle; +} + +.search input +{ + width:188px; + margin-right:10px; + font-size:12px; + border:1px solid #dadada; + background:#FFFFFF url("/bundles/webprofiler/images/profiler/input_bg.gif") repeat-x left top; + padding:5px 6px; + color:#565656; +} + +.search button +{ + -webkit-appearance: button-bevel; + float: none; + display: block; + padding: 0; + margin: 0; + border: 0px solid #000000; + text-decoration: none; + cursor: pointer; + background-color: transparent; + white-space: nowrap; + display: inline-block; + text-align: center; + vertical-align: middle; + border: 0; + background: none; +} + +.search button:hover +{ + text-decoration: none; +} + +.search button span span, +.search button span span span +{ + position: static; +} + +.search button span +{ + position: relative; + text-decoration: none; + display: block; + height: 28px; + float: left; + padding: 0 0 0 8px; + background: transparent url("/bundles/webprofiler/images/profiler/border_l.png") no-repeat top left; +} + +.search button span span +{ + padding: 0 8px 0 0; + background: transparent url("/bundles/webprofiler/images/profiler/border_r.png") right top no-repeat; +} + +.search button span span span +{ + padding: 0px 7px; + font: bold 11px Arial, Helvetica, sans-serif; + color: #6b6b6b; + line-height: 28px; + background: transparent url("/bundles/webprofiler/images/profiler/btn_bg.png") repeat-x top left; +} \ No newline at end of file diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/reset.css b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/reset.css deleted file mode 100644 index 8ba653ef4a..0000000000 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/css/reset.css +++ /dev/null @@ -1,135 +0,0 @@ -/* -Copyright (c) 2008, Yahoo! Inc. All rights reserved. -Code licensed under the BSD License: -http://developer.yahoo.net/yui/license.txt -version: 2.6.0 -*/ - -html -{ - color:#000; -} -body, -div, -dl, -dt, -dd, -ul, -ol, -li, -h1, -h2, -h3, -h4, -h5, -h6, -pre, -code, -form, -fieldset, -legend, -input, -textarea, -p, -blockquote, -th, -td -{ - margin:0; - padding:0; -} -table -{ - border-collapse:collapse; - border-spacing:0; -} -fieldset, -img -{ - border:0; -} -address, -caption, -cite, -code, -dfn, -em, -strong, -th, -var -{ - font-style:normal; - font-weight:normal; -} - -li -{ - list-style:none; -} - -caption, -th -{ - text-align:left; -} - -h1, -h2, -h3, -h4, -h5, -h6 -{ - font-size:100%; - font-weight:normal; -} - -q:before, -q:after { - content:''; -} - -abbr, -acronym -{ - border:0; - font-variant:normal; -} -/* to preserve line-height and selector appearance */ -sup -{ - vertical-align:text-top; -} -sub -{ - vertical-align:text-bottom; -} -input, -textarea, -select -{ - font-family:inherit; - font-size:inherit; - font-weight:inherit; -} - -/*to enable resizing for IE*/ - -input, -textarea, -select -{ - *font-size:100%; -} - -/*because legend doesn't inherit in IE */ -legend -{ - color:#000; -} - -del, -ins -{ - text-decoration:none; -} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/bg_submenu.gif b/src/Symfony/Bundle/WebProfilerBundle/Resources/public/images/profiler/bg_submenu.gif new file mode 100644 index 0000000000000000000000000000000000000000..fc77660ee663d1a415dcbf56540d290146865653 GIT binary patch literal 176 zcmZ?wbhEHbWMr^rIKsg2_U+qOuU=ihe*M9N2Y2t@y?XWP#fum3-@kw3#*OFCpFeu^ z=+>=UckbMI^5n_GhYz1Vefs9jo0l(NK701;@#DvrFJHcQ@80d(w_m(?ap}^fn>TM> zyLRo$l`F4bzh-~|#h)x-rVfY%+3CQlt03UvHC0ri+_YIWM?gIG{F9I~O&QXu42FIQ Z( Exception - + {% if collector.hasexception %} - 1 + 1 {% endif %} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig index 63082d07ae..27784202d0 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/logger.html.twig @@ -10,8 +10,8 @@ {% block menu %} Logs - - {{ collector.counterrors }} + + {{ collector.counterrors }} {% endblock %} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.html.twig index 251ae7d567..ad169ae512 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base.html.twig @@ -3,18 +3,8 @@ {% block title 'Profiler' %} - - - - - - - - - - {# #} - + {% block head '' %} diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig index 809b6e4a36..ba4c713c0e 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig @@ -4,25 +4,25 @@ {% render 'WebProfilerBundle:Profiler:toolbar' with { 'token': token, 'position': 'normal' } %} -
+

- + Symfony profiler

-
+
- + -
-
+
-
+
-
+
{% if templates is defined %}
    @@ -68,50 +68,10 @@
-
+
{% block panel '' %}
- - {#
-

- - Symfony Profiler -

-
- {{ profiler.url }} by {{ profiler.ip }} at {{ profiler.time|date('r') }} -
-
- - {% render 'WebProfilerBundle:Profiler:toolbar' with { 'token': token, 'position': 'normal' } %} - - - -
- {% if templates is defined %} -
    - {% for name, template in templates %} - {% set menu %}{{ template.renderBlock('menu', { 'collector': profiler.get(name)}) }}{% endset %} - {% if menu != '' %} -
  • - {{ menu|raw }} -
    • - {% endif %} - {% endfor %} -
- {% endif %} - - {% render 'WebProfilerBundle:Profiler:searchBar' with { 'token': token } %} - - {% include 'WebProfilerBundle:Profiler:admin.html.twig' with { 'token': token } only %} - 		-
- {% block panel '' %} -
-
- #} {% endblock %}