From e0aab4075f555e8d1fd9b895e7c00af45ef205ab Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 12 Nov 2012 18:08:52 +0100 Subject: [PATCH 1/4] renamed sf-exceptionreset to sf-reset --- .../Resources/public/css/exception.css | 102 +++++++++--------- .../Resources/public/css/exception_layout.css | 2 +- .../views/Exception/exception.html.twig | 2 +- .../views/Profiler/profiler_style.html.twig | 4 +- .../views/Profiler/toolbar_redirect.html.twig | 2 +- .../HttpKernel/Debug/ExceptionHandler.php | 50 ++++----- 6 files changed, 81 insertions(+), 81 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css index 22c9387ef5..1479cc6e41 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css @@ -5,72 +5,72 @@ http://developer.yahoo.com/yui/license.html version: 3.1.2 build: 56 */ -.sf-exceptionreset html{color:#000;background:#FFF;}.sf-exceptionreset body,.sf-exceptionreset div,.sf-exceptionreset dl,.sf-exceptionreset dt,.sf-exceptionreset dd,.sf-exceptionreset ul,.sf-exceptionreset ol,.sf-exceptionreset li,.sf-exceptionreset h1,.sf-exceptionreset h2,.sf-exceptionreset h3,.sf-exceptionreset h4,.sf-exceptionreset h5,.sf-exceptionreset h6,.sf-exceptionreset pre,.sf-exceptionreset code,.sf-exceptionreset form,.sf-exceptionreset fieldset,.sf-exceptionreset legend,.sf-exceptionreset input,.sf-exceptionreset textarea,.sf-exceptionreset p,.sf-exceptionreset blockquote,.sf-exceptionreset th,.sf-exceptionreset td{margin:0;padding:0;}.sf-exceptionreset table{border-collapse:collapse;border-spacing:0;}.sf-exceptionreset fieldset,.sf-exceptionreset img{border:0;}.sf-exceptionreset address,.sf-exceptionreset caption,.sf-exceptionreset cite,.sf-exceptionreset code,.sf-exceptionreset dfn,.sf-exceptionreset em,.sf-exceptionreset strong,.sf-exceptionreset th,.sf-exceptionreset var{font-style:normal;font-weight:normal;}.sf-exceptionreset li{list-style:none;}.sf-exceptionreset caption,.sf-exceptionreset th{text-align:left;}.sf-exceptionreset h1,.sf-exceptionreset h2,.sf-exceptionreset h3,.sf-exceptionreset h4,.sf-exceptionreset h5,.sf-exceptionreset h6{font-size:100%;font-weight:normal;}.sf-exceptionreset q:before,.sf-exceptionreset q:after{content:'';}.sf-exceptionreset abbr,.sf-exceptionreset acronym{border:0;font-variant:normal;}.sf-exceptionreset sup{vertical-align:text-top;}.sf-exceptionreset sub{vertical-align:text-bottom;}.sf-exceptionreset input,.sf-exceptionreset textarea,.sf-exceptionreset select{font-family:inherit;font-size:inherit;font-weight:inherit;}.sf-exceptionreset input,.sf-exceptionreset textarea,.sf-exceptionreset select{*font-size:100%;}.sf-exceptionreset legend{color:#000;} +.sf-reset html{color:#000;background:#FFF;}.sf-reset body,.sf-reset div,.sf-reset dl,.sf-reset dt,.sf-reset dd,.sf-reset ul,.sf-reset ol,.sf-reset li,.sf-reset h1,.sf-reset h2,.sf-reset h3,.sf-reset h4,.sf-reset h5,.sf-reset h6,.sf-reset pre,.sf-reset code,.sf-reset form,.sf-reset fieldset,.sf-reset legend,.sf-reset input,.sf-reset textarea,.sf-reset p,.sf-reset blockquote,.sf-reset th,.sf-reset td{margin:0;padding:0;}.sf-reset table{border-collapse:collapse;border-spacing:0;}.sf-reset fieldset,.sf-reset img{border:0;}.sf-reset address,.sf-reset caption,.sf-reset cite,.sf-reset code,.sf-reset dfn,.sf-reset em,.sf-reset strong,.sf-reset th,.sf-reset var{font-style:normal;font-weight:normal;}.sf-reset li{list-style:none;}.sf-reset caption,.sf-reset th{text-align:left;}.sf-reset h1,.sf-reset h2,.sf-reset h3,.sf-reset h4,.sf-reset h5,.sf-reset h6{font-size:100%;font-weight:normal;}.sf-reset q:before,.sf-reset q:after{content:'';}.sf-reset abbr,.sf-reset acronym{border:0;font-variant:normal;}.sf-reset sup{vertical-align:text-top;}.sf-reset sub{vertical-align:text-bottom;}.sf-reset input,.sf-reset textarea,.sf-reset select{font-family:inherit;font-size:inherit;font-weight:inherit;}.sf-reset input,.sf-reset textarea,.sf-reset select{*font-size:100%;}.sf-reset legend{color:#000;} -.sf-exceptionreset html, -.sf-exceptionreset body { +.sf-reset html, +.sf-reset body { width: 100%; min-height: 100%; _height: 100%; margin: 0; padding: 0; } -.sf-exceptionreset body { +.sf-reset body { font: 1em "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif; text-align: left; background-color: #efefef; } -.sf-exceptionreset abbr { +.sf-reset abbr { border-bottom: 1px dotted #000; cursor: help; } -.sf-exceptionreset p { +.sf-reset p { font-size: 14px; line-height: 20px; color: #868686; padding-bottom: 20px; } -.sf-exceptionreset strong { +.sf-reset strong { color: #313131; font-weight: bold; } -.sf-exceptionreset a { +.sf-reset a { color: #6c6159; } -.sf-exceptionreset a img { +.sf-reset a img { border: none; } -.sf-exceptionreset a:hover { +.sf-reset a:hover { text-decoration: underline; } -.sf-exceptionreset em { +.sf-reset em { font-style: italic; } -.sf-exceptionreset h2, -.sf-exceptionreset h3 { +.sf-reset h2, +.sf-reset h3 { font-weight: bold; } -.sf-exceptionreset h1 { +.sf-reset h1 { font-family: Georgia, "Times New Roman", Times, serif; font-size: 20px; color: #313131; word-break: break-all; } -.sf-exceptionreset li { +.sf-reset li { padding-bottom: 10px; } -.sf-exceptionreset .traces { +.sf-reset .traces { padding-bottom: 14px; } -.sf-exceptionreset .traces li { +.sf-reset .traces li { font-size: 12px; color: #868686; padding: 5px 4px; @@ -78,113 +78,113 @@ build: 56 margin-left: 20px; white-space: break-word; } -.sf-exceptionreset #logs .traces li.error { +.sf-reset #logs .traces li.error { font-style: normal; color: #AA3333; background: #f9ecec; } -.sf-exceptionreset #logs .traces li.warning { +.sf-reset #logs .traces li.warning { font-style: normal; background: #ffcc00; } /* fix for Opera not liking empty
  • */ -.sf-exceptionreset .traces li:after { +.sf-reset .traces li:after { content: "\00A0"; } -.sf-exceptionreset .trace { +.sf-reset .trace { border: 1px solid #D3D3D3; padding: 10px; overflow: auto; margin: 10px 0 20px; } -.sf-exceptionreset .block, -.sf-exceptionreset .block_exception { +.sf-reset .block, +.sf-reset .block_exception { -moz-border-radius: 16px; -webkit-border-radius: 16px; border-radius: 16px; margin-bottom: 20px; } -.sf-exceptionreset .block { +.sf-reset .block { background-color: #FFFFFF; border: 1px solid #dfdfdf; padding: 40px 50px; } -.sf-exceptionreset .block_exception { +.sf-reset .block_exception { background-color: #f6f6f6; border: 1px solid #dfdfdf; padding: 30px 28px; } -.sf-exceptionreset .block_exception div { +.sf-reset .block_exception div { color: #313131; font-size: 10px; } -.sf-exceptionreset .block_exception_detected .illustration_exception, -.sf-exceptionreset .block_exception_detected .text_exception { +.sf-reset .block_exception_detected .illustration_exception, +.sf-reset .block_exception_detected .text_exception { float: left; } -.sf-exceptionreset .block_exception_detected .illustration_exception { +.sf-reset .block_exception_detected .illustration_exception { width: 152px; } -.sf-exceptionreset .block_exception_detected .text_exception { +.sf-reset .block_exception_detected .text_exception { width: 670px; padding: 30px 44px 24px 46px; position: relative; } -.sf-exceptionreset .text_exception .open_quote, -.sf-exceptionreset .text_exception .close_quote { +.sf-reset .text_exception .open_quote, +.sf-reset .text_exception .close_quote { position: absolute; } -.sf-exceptionreset .open_quote { +.sf-reset .open_quote { top: 0; left: 0; } -.sf-exceptionreset .close_quote { +.sf-reset .close_quote { bottom: 0; right: 50px; } -.sf-exceptionreset .block_exception p { +.sf-reset .block_exception p { font-family: Arial, Helvetica, sans-serif; } -.sf-exceptionreset .block_exception p a, -.sf-exceptionreset .block_exception p a:hover { +.sf-reset .block_exception p a, +.sf-reset .block_exception p a:hover { color: #565656; } -.sf-exceptionreset h2 { +.sf-reset h2 { font-size: 16px; font-family: Arial, Helvetica, sans-serif; padding-bottom: 16px; } -.sf-exceptionreset li a { +.sf-reset li a { background: none; color: #868686; text-decoration: none; } -.sf-exceptionreset li a:hover { +.sf-reset li a:hover { background: none; color: #313131; text-decoration: underline; } -.sf-exceptionreset .logs h2 { +.sf-reset .logs h2 { float: left; width: 654px; } -.sf-exceptionreset .error_count { +.sf-reset .error_count { float: right; width: 170px; text-align: right; } -.sf-exceptionreset .error_count span { +.sf-reset .error_count span { display: inline-block; background-color: #aacd4e; -moz-border-radius: 6px; @@ -197,36 +197,36 @@ build: 56 font-weight: bold; } -.sf-exceptionreset .toggle { +.sf-reset .toggle { vertical-align: middle; } -.sf-exceptionreset .linked ul, -.sf-exceptionreset .linked li { +.sf-reset .linked ul, +.sf-reset .linked li { display: inline; } -.sf-exceptionreset #output_content { +.sf-reset #output_content { color: #000; font-size: 12px; } -.sf-exceptionreset ol { +.sf-reset ol { padding: 10px 0; } -.sf-exceptionreset ol li { +.sf-reset ol li { list-style: decimal; margin-left: 20px; padding: 2px; padding-bottom: 20px; } -.sf-exceptionreset ol ol li { +.sf-reset ol ol li { list-style-position: inside; margin-left: 0; white-space: nowrap; font-size: 12px; padding-bottom: 0; } -.sf-exceptionreset li .selected { +.sf-reset li .selected { background-color: #ffd; } diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception_layout.css b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception_layout.css index f7b76186d5..f545b5c53b 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception_layout.css +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception_layout.css @@ -7,7 +7,7 @@ body { color: #333; } -.sf-exceptionreset, .sf-exceptionreset .block, .sf-exceptionreset #message { +.sf-reset, .sf-reset .block, .sf-reset #message { margin: auto; } diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig index a3d953a60d..d1ee35e1e0 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig @@ -1,4 +1,4 @@ -
    +
    diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler_style.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler_style.html.twig index 906d487d1e..df1fa18619 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler_style.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler_style.html.twig @@ -287,13 +287,13 @@ table th.value { padding: 0; } -.sf-exceptionreset .block_exception_detected .text_exception { +.sf-reset .block_exception_detected .text_exception { left: 10px; right: 10px; width: 95%; } -.sf-exceptionreset .block_exception_detected .illustration_exception { +.sf-reset .block_exception_detected .illustration_exception { display: none; } diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_redirect.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_redirect.html.twig index 9156125217..5cbcc37ffc 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_redirect.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_redirect.html.twig @@ -3,7 +3,7 @@ {% block title 'Redirection Intercepted' %} {% block body %} -
    +

    This request redirects to {{ location }}.

    diff --git a/src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php b/src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php index 37f588eabf..88ef3d7615 100644 --- a/src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php +++ b/src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php @@ -150,7 +150,7 @@ EOF } return << +

    $title

    $content
    @@ -167,24 +167,24 @@ EOF; public function getStylesheet(FlattenException $exception) { return << From 983b2b5e2a24bff4556632f2d545bd3e7530bbe9 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 12 Nov 2012 18:15:25 +0100 Subject: [PATCH 2/4] uniformized styles --- .../Resources/public/css/exception.css | 24 ------ .../Resources/public/css/exception_layout.css | 21 ----- .../views/Profiler/profiler_style.html.twig | 78 ------------------- 3 files changed, 123 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css index 1479cc6e41..fafca7cdaf 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css @@ -6,7 +6,6 @@ version: 3.1.2 build: 56 */ .sf-reset html{color:#000;background:#FFF;}.sf-reset body,.sf-reset div,.sf-reset dl,.sf-reset dt,.sf-reset dd,.sf-reset ul,.sf-reset ol,.sf-reset li,.sf-reset h1,.sf-reset h2,.sf-reset h3,.sf-reset h4,.sf-reset h5,.sf-reset h6,.sf-reset pre,.sf-reset code,.sf-reset form,.sf-reset fieldset,.sf-reset legend,.sf-reset input,.sf-reset textarea,.sf-reset p,.sf-reset blockquote,.sf-reset th,.sf-reset td{margin:0;padding:0;}.sf-reset table{border-collapse:collapse;border-spacing:0;}.sf-reset fieldset,.sf-reset img{border:0;}.sf-reset address,.sf-reset caption,.sf-reset cite,.sf-reset code,.sf-reset dfn,.sf-reset em,.sf-reset strong,.sf-reset th,.sf-reset var{font-style:normal;font-weight:normal;}.sf-reset li{list-style:none;}.sf-reset caption,.sf-reset th{text-align:left;}.sf-reset h1,.sf-reset h2,.sf-reset h3,.sf-reset h4,.sf-reset h5,.sf-reset h6{font-size:100%;font-weight:normal;}.sf-reset q:before,.sf-reset q:after{content:'';}.sf-reset abbr,.sf-reset acronym{border:0;font-variant:normal;}.sf-reset sup{vertical-align:text-top;}.sf-reset sub{vertical-align:text-bottom;}.sf-reset input,.sf-reset textarea,.sf-reset select{font-family:inherit;font-size:inherit;font-weight:inherit;}.sf-reset input,.sf-reset textarea,.sf-reset select{*font-size:100%;}.sf-reset legend{color:#000;} - .sf-reset html, .sf-reset body { width: 100%; @@ -20,24 +19,20 @@ build: 56 text-align: left; background-color: #efefef; } - .sf-reset abbr { border-bottom: 1px dotted #000; cursor: help; } - .sf-reset p { font-size: 14px; line-height: 20px; color: #868686; padding-bottom: 20px; } - .sf-reset strong { color: #313131; font-weight: bold; } - .sf-reset a { color: #6c6159; } @@ -47,11 +42,9 @@ build: 56 .sf-reset a:hover { text-decoration: underline; } - .sf-reset em { font-style: italic; } - .sf-reset h2, .sf-reset h3 { font-weight: bold; @@ -62,11 +55,9 @@ build: 56 color: #313131; word-break: break-all; } - .sf-reset li { padding-bottom: 10px; } - .sf-reset .traces { padding-bottom: 14px; } @@ -91,14 +82,12 @@ build: 56 .sf-reset .traces li:after { content: "\00A0"; } - .sf-reset .trace { border: 1px solid #D3D3D3; padding: 10px; overflow: auto; margin: 10px 0 20px; } - .sf-reset .block, .sf-reset .block_exception { -moz-border-radius: 16px; @@ -120,7 +109,6 @@ build: 56 color: #313131; font-size: 10px; } - .sf-reset .block_exception_detected .illustration_exception, .sf-reset .block_exception_detected .text_exception { float: left; @@ -133,7 +121,6 @@ build: 56 padding: 30px 44px 24px 46px; position: relative; } - .sf-reset .text_exception .open_quote, .sf-reset .text_exception .close_quote { position: absolute; @@ -146,7 +133,6 @@ build: 56 bottom: 0; right: 50px; } - .sf-reset .block_exception p { font-family: Arial, Helvetica, sans-serif; } @@ -154,36 +140,30 @@ build: 56 .sf-reset .block_exception p a:hover { color: #565656; } - .sf-reset h2 { font-size: 16px; font-family: Arial, Helvetica, sans-serif; padding-bottom: 16px; } - .sf-reset li a { background: none; color: #868686; text-decoration: none; } - .sf-reset li a:hover { background: none; color: #313131; text-decoration: underline; } - .sf-reset .logs h2 { float: left; width: 654px; } - .sf-reset .error_count { float: right; width: 170px; text-align: right; } - .sf-reset .error_count span { display: inline-block; background-color: #aacd4e; @@ -196,21 +176,17 @@ build: 56 font-size: 11px; font-weight: bold; } - .sf-reset .toggle { vertical-align: middle; } - .sf-reset .linked ul, .sf-reset .linked li { display: inline; } - .sf-reset #output_content { color: #000; font-size: 12px; } - .sf-reset ol { padding: 10px 0; } diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception_layout.css b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception_layout.css index f545b5c53b..ce85042365 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception_layout.css +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception_layout.css @@ -1,27 +1,22 @@ html { background: #eee; } - body { font: 11px Verdana, Arial, sans-serif; color: #333; } - .sf-reset, .sf-reset .block, .sf-reset #message { margin: auto; } - img { border: 0; } - .clear { clear: both; height: 0; font-size: 0; line-height: 0; } - .clear_fix:after { content: "\0020"; display: block; @@ -38,25 +33,20 @@ img { .clear_fix { display: block; } - .header { padding: 30px 30px 20px 30px; } - .header_logo { float: left; } - .search { float: right; padding-top: 20px; } - .search label { line-height: 28px; vertical-align: middle; } - .search input { width: 188px; margin-right: 10px; @@ -66,11 +56,9 @@ img { padding: 5px 6px; color: #565656; } - .search input[type="search"] { -webkit-appearance: textfield; } - .search button { -webkit-appearance: button-bevel; float: none; @@ -87,21 +75,17 @@ img { border: 0; background: none; } - .search button:-moz-focus-inner { padding: 0; border: 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; @@ -111,12 +95,10 @@ img { padding: 0 0 0 8px; background: transparent url(../images/border_l.png) no-repeat top left; } - .search button span span { padding: 0 8px 0 0; background: transparent url(../images/border_r.png) right top no-repeat; } - .search button span span span { padding: 0 7px; font: bold 11px Arial, Helvetica, sans-serif; @@ -124,17 +106,14 @@ img { line-height: 28px; background: transparent url(../images/btn_bg.png) repeat-x top left; } - #content { width: 970px; margin: 0 auto; } - pre { white-space: normal; font-family: Arial, Helvetica, sans-serif; } - pre.xdebug-var-dump{ white-space: pre; font-family: monospace; diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler_style.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler_style.html.twig index df1fa18619..0b4c36b217 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler_style.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler_style.html.twig @@ -6,7 +6,6 @@ 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,button,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,optgroup{font-style:inherit;font-weight:inherit;}del,ins{text-decoration:none;}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:baseline;}sub{vertical-align:baseline;}legend{color:#000;}input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}input,button,textarea,select{*font-size:100%;} - html, body { background-color: #efefef; } @@ -14,14 +13,12 @@ body { font: 1em "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif; text-align: left; } - p { font-size: 14px; line-height: 20px; color: #313131; padding-bottom: 20px } - strong { color: #313131; font-weight: bold; @@ -29,7 +26,6 @@ strong { em { font-style: italic; } - a { color: #6c6159; } @@ -39,7 +35,6 @@ a img { a:hover { text-decoration: underline; } - button::-moz-focus-inner { padding: 0; border: none; @@ -50,7 +45,6 @@ button { background-color: transparent; font-weight: bold; } - caption { margin-bottom: 7px; } @@ -70,16 +64,13 @@ table th, table td { font-size: 12px; padding: 8px 10px; } - fieldset { border: none; } - abbr { border-bottom: 1px dotted #000; cursor: help; } - .clear { clear: both; height: 0; @@ -102,31 +93,24 @@ abbr { { display: block; } - #content { padding: 0 50px; margin: 0 auto 20px; font-family: Arial, Helvetica, sans-serif; min-width: 970px; - } - #header { padding: 20px 30px 20px; } - #header h1 { float: left; } - .search { float: right; } - #menu_profiler { border-right: 1px solid #dfdfdf; } - #menu_profiler li { border-bottom: 1px solid #dfdfdf; position: relative; @@ -135,7 +119,6 @@ abbr { background-color: #f6f6f6; z-index: 10000; } - #menu_profiler li a { color: #404040; display: block; @@ -144,14 +127,12 @@ abbr { text-decoration: none; cursor: pointer; } - #menu_profiler li a span.label { display: block; padding: 20px 0px 16px 65px; min-height: 16px; overflow: hidden; } - #menu_profiler li a span.icon { display: block; position: absolute; @@ -160,12 +141,10 @@ abbr { width: 60px; text-align: center; } - #menu_profiler li.selected a, #menu_profiler li a:hover { background: #d1d1d1 url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAA7CAAAAACfn7+eAAAACXZwQWcAAAABAAAAOwDiPIGUAAAAJElEQVQIW2N4y8TA9B+KGZDYEP5/FD4Eo7IgNLJqZDUIMRRTAcmVHUZf/1g/AAAAAElFTkSuQmCC) repeat-x 0 0; } - #navigation div:first-child, #menu_profiler li:first-child, #menu_profiler li:first-child a, @@ -174,34 +153,28 @@ abbr { -webkit-border-radius: 16px 0 0 0; border-radius: 16px 0 0 0; } - #menu_profiler li a span.count { padding: 0; position: absolute; right: 10px; top: 20px; } - #collector_wrapper { float: left; width: 100%; } - #collector_content { margin-left: 250px; padding: 30px 40px 40px; } - #navigation { float: left; width: 250px; margin-left: -100%; } - #collector_content table td { background-color: white; } - h1 { font-family: Georgia, "Times New Roman", Times, serif; color: #404040; @@ -210,19 +183,15 @@ h2, h3 { font-weight: bold; margin-bottom: 20px; } - li { padding-bottom: 10px; - } - #main { -moz-border-radius: 16px; -webkit-border-radius: 16px; border-radius: 16px; margin-bottom: 20px; } - #menu_profiler span.count span { display: inline-block; background-color: #aacd4e; @@ -234,7 +203,6 @@ li { margin-right: 2px; font-size: 11px; } - #resume { background-color: #f6f6f6; border-bottom: 1px solid #dfdfdf; @@ -247,7 +215,6 @@ li { -webkit-border-top-right-radius: 16px; border-top-right-radius: 16px; } - a#resume-view-all { display: inline-block; padding: 0.2em 0.7em; @@ -258,68 +225,55 @@ a#resume-view-all { font-weight: bold; text-decoration: none; } - table th.value { width: 450px; background-color: #dfeeb8; } - #content h2 { font-size: 24px; color: #313131; font-weight: bold; } - #content #main { padding: 0; background-color: #FFF; border: 1px solid #dfdfdf; } - #content #main p { color: #313131; font-size: 14px; padding-bottom: 20px; } - .sf-toolbarreset { border-top: 0; padding: 0; } - .sf-reset .block_exception_detected .text_exception { left: 10px; right: 10px; width: 95%; } - .sf-reset .block_exception_detected .illustration_exception { display: none; } - ul.alt { margin: 10px 0 30px; } - ul.alt li { padding: 5px 7px; font-size: 13px; } - ul.alt li.even { background: #f1f7e2; } - ul.alt li.error { background-color: #f66; margin-bottom: 1px; } - ul.alt li.warning { background-color: #ffcc00; margin-bottom: 1px; } - td.main, td.menu { text-align: left; margin: 0; @@ -327,16 +281,13 @@ td.main, td.menu { border: 0; vertical-align: top; } - .search { padding-top: 20px; } - .search label { line-height: 28px; vertical-align: middle; } - .search input { width: 188px; margin-right: 10px; @@ -346,11 +297,9 @@ td.main, td.menu { padding: 5px 6px; color: #565656; } - .search input[type="search"] { -webkit-appearance: textfield; } - .search button { -webkit-appearance: button-bevel; float: none; @@ -365,16 +314,13 @@ td.main, td.menu { vertical-align: middle; 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; @@ -384,12 +330,10 @@ td.main, td.menu { padding: 0 0 0 8px; background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAcCAQAAAD2QTaNAAAAwElEQVQY02NkgILLkgwODBoMcoxQrgdDsIwVpzibEJBzieVSycsTPz/9/Q+CQIGL0S9P/fkPgywXZP67CBr/hxnFwPLfXtacgQlZQJdTGsEFCYgy8vxDEWBB1gAU+MeALA9SwfAfXYCQCixm0EXLn3//GJkQAkz/3/7+ClIFg0z/L39/CjIHBpn+73964v9/JAH3J//3vT2D0MLMwBB97RsvAz8bPyM7yFBoRG0DRpSkFbsEqxAjzLqtoKjUYpADAEhLb4eyx24jAAAAAElFTkSuQmCC) no-repeat top left; } - .search button span span { padding: 0 8px 0 0; background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAcCAQAAAD2QTaNAAAAxElEQVR42r2Ruw4BUQBEx7qRbKFAud+wjYJOKcLv+B+JRiT0CgWNUEiE2Ihy41kgiHjuHdwQezU6M93JmWoCgwJcjNCw51AJSHlZH5eTFqp2TRGPz553y3Y/3xeAoMLBcCwJYzFFySDejcSZ7lk+gKCVYEoQn5gWbSF9wDAZ1QyEaGoGIKEbIL4M/jTkfya6wRtPmnE7cKUZxxmHPkA57aDpm2y6rGcmL8Pbb51VBWV1w3V9XswfR2XVUWJchAsHjdzryjuV/nX4Zt09SgAAAABJRU5ErkJggg==) right top no-repeat; } - .search button span span span { padding: 0 7px; font: bold 11px Arial, Helvetica, sans-serif; @@ -397,12 +341,10 @@ td.main, td.menu { line-height: 28px; background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAcCAQAAAAKVB1HAAAAHklEQVQI12O4vJDh33+m/wwo6B82EpMBJ5EYzB5KABsgHO7OnIbSAAAAAElFTkSuQmCC) repeat-x top left; } - #navigation div:first-child { margin: 0 0 20px; border-top: 0; } - #navigation .search { padding-top: 15px; float: none; @@ -412,102 +354,82 @@ td.main, td.menu { border: 1px solid #dfdfdf; border-left: none; } - #navigation .search h3 { font-family: Arial, Helvetica, sans-serif; text-transform: uppercase; margin-left: 10px; font-size: 13px; } - #navigation .search form { padding: 15px 0; } - #navigation .search button { float: right; margin-right: 20px; } - #navigation .search label { display: block; float: left; width: 50px; } - #navigation .search input, #navigation .search select, #navigation .search label, #navigation .search a { font-size: 12px; } - #navigation .search form { padding-left: 10px; } - #navigation .search input { width: 160px; } - #navigation .import label { float: none; display: inline; } - #navigation .import input { width: 100px; } - .timeline { background-color: #fbfbfb; margin-bottom: 15px; margin-top: 5px; } - #collector_content .routing tr.matches td { background-color: #0e0; } - #collector_content .routing tr.almost td { background-color: #fa0; } - .loading { background: transparent url(data:image/gif;base64,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) scroll no-repeat 50% 50%; height: 30px; display: none; } - .sf-profiler-timeline .legends { font-size: 12px; line-height: 1.5em; } - .sf-profiler-timeline .legends span { border-left-width: 10px; border-left-style: solid; padding: 0 10px 0 5px; } - .sf-profiler-timeline canvas { border: 1px solid #999; border-width: 1px 0; } - .collapsed-menu-parents #resume, .collapsed-menu-parents #collector_content { margin-left: 60px !important; } - .collapsed-menu { width: 60px !important; } - .collapsed-menu span :not(.icon) { display: none !important; } - .collapsed-menu span.icon img { display: inline !important; } From 812b9b1724b5d80ffbffed743e5b03f9da1aebe8 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 12 Nov 2012 18:32:01 +0100 Subject: [PATCH 3/4] replace _ in stylesheets (ids and classes) by - (should be consistent across the whole framework now) --- .../Resources/public/css/exception.css | 34 +++++++------- .../Resources/public/css/exception_layout.css | 12 ++--- .../views/Exception/exception.html.twig | 32 ++++++------- .../Resources/views/Exception/trace.html.twig | 8 ++-- .../views/Exception/traces.html.twig | 10 ++-- .../Resources/views/layout.html.twig | 16 +++---- .../Resources/views/Collector/time.html.twig | 2 +- .../Resources/views/Profiler/admin.html.twig | 8 ++-- .../Resources/views/Profiler/header.html.twig | 14 +++--- .../Resources/views/Profiler/info.html.twig | 6 +-- .../Resources/views/Profiler/layout.html.twig | 10 ++-- .../views/Profiler/profiler_style.html.twig | 46 +++++++++---------- .../Resources/views/Profiler/search.html.twig | 16 +++---- .../views/Profiler/toolbar.html.twig | 16 +++---- .../views/Profiler/toolbar_js.html.twig | 12 ++--- .../views/Profiler/toolbar_redirect.html.twig | 2 +- 16 files changed, 122 insertions(+), 122 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css index fafca7cdaf..dfdaecf910 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css @@ -89,7 +89,7 @@ build: 56 margin: 10px 0 20px; } .sf-reset .block, -.sf-reset .block_exception { +.sf-reset .block-exception { -moz-border-radius: 16px; -webkit-border-radius: 16px; border-radius: 16px; @@ -100,44 +100,44 @@ build: 56 border: 1px solid #dfdfdf; padding: 40px 50px; } -.sf-reset .block_exception { +.sf-reset .block-exception { background-color: #f6f6f6; border: 1px solid #dfdfdf; padding: 30px 28px; } -.sf-reset .block_exception div { +.sf-reset .block-exception div { color: #313131; font-size: 10px; } -.sf-reset .block_exception_detected .illustration_exception, -.sf-reset .block_exception_detected .text_exception { +.sf-reset .block-exception-detected .illustration-exception, +.sf-reset .block-exception-detected .text-exception { float: left; } -.sf-reset .block_exception_detected .illustration_exception { +.sf-reset .block-exception-detected .illustration-exception { width: 152px; } -.sf-reset .block_exception_detected .text_exception { +.sf-reset .block-exception-detected .text-exception { width: 670px; padding: 30px 44px 24px 46px; position: relative; } -.sf-reset .text_exception .open_quote, -.sf-reset .text_exception .close_quote { +.sf-reset .text-exception .open-quote, +.sf-reset .text-exception .close-quote { position: absolute; } -.sf-reset .open_quote { +.sf-reset .open-quote { top: 0; left: 0; } -.sf-reset .close_quote { +.sf-reset .close-quote { bottom: 0; right: 50px; } -.sf-reset .block_exception p { +.sf-reset .block-exception p { font-family: Arial, Helvetica, sans-serif; } -.sf-reset .block_exception p a, -.sf-reset .block_exception p a:hover { +.sf-reset .block-exception p a, +.sf-reset .block-exception p a:hover { color: #565656; } .sf-reset h2 { @@ -159,12 +159,12 @@ build: 56 float: left; width: 654px; } -.sf-reset .error_count { +.sf-reset .error-count { float: right; width: 170px; text-align: right; } -.sf-reset .error_count span { +.sf-reset .error-count span { display: inline-block; background-color: #aacd4e; -moz-border-radius: 6px; @@ -183,7 +183,7 @@ build: 56 .sf-reset .linked li { display: inline; } -.sf-reset #output_content { +.sf-reset #output-content { color: #000; font-size: 12px; } diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception_layout.css b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception_layout.css index ce85042365..5f26c54f2f 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception_layout.css +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception_layout.css @@ -17,26 +17,26 @@ img { font-size: 0; line-height: 0; } -.clear_fix:after { +.clear-fix:after { content: "\0020"; display: block; height: 0; clear: both; visibility: hidden; } -.clear_fix { +.clear-fix { display: inline-block; } -* html .clear_fix { +* html .clear-fix { height: 1%; } -.clear_fix { +.clear-fix { display: block; } .header { padding: 30px 30px 20px 30px; } -.header_logo { +.header-logo { float: left; } .search { @@ -117,4 +117,4 @@ pre { pre.xdebug-var-dump{ white-space: pre; font-family: monospace; -} \ No newline at end of file +} diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig index d1ee35e1e0..b4c9bc7955 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig @@ -1,13 +1,13 @@
    -
    -
    -
    +
    +
    +
    Exception detected!
    -
    +
    -
    +
    @@ -25,14 +25,14 @@
      {% for i, previous in exception.allPrevious %}
    • - {{ previous.class|abbr_class }} » + {{ previous.class|abbr_class }} »
      • {% endfor %}
    {% endif %} -
    +
    @@ -46,19 +46,19 @@ {% if logger %}
    -
    +
    {% spaceless %}

    Logs  - - - - + + + -

    {% endspaceless %} {% if logger.counterrors %} -
    +
    {{ logger.counterrors }} error{{ logger.counterrors > 1 ? 's' : ''}} @@ -79,14 +79,14 @@ {% spaceless %}

    Content of the Output  - - - + + + + +

    {% endspaceless %} -