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 <<