merged branch vicb/exc/overflow (PR symfony#6877)

fabpot · fabpot · commit 163e607781e7 · 2013-01-25T17:50:23.000+01:00
This PR was merged into the master branch. Commits ------- 189a05e css fix Discussion ---------- css fix before ![ov](https://f.cloud.github.com/assets/248818/97566/72a11c18-66fe-11e2-80b1-f434a5216a66.jpg) after ![nov](https://f.cloud.github.com/assets/248818/97563/41ace560-66fe-11e2-988e-fcdb931d88d7.jpg) --------------------------------------------------------------------------- by WouterJ at 2013-01-25T15:19:13Z :+1:
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css
@@ -36,6 +36,8 @@
     background-color: #f6f6f6;
     border: 1px solid #dfdfdf;
     padding: 30px 28px;
+    word-wrap: break-word;
+    overflow: hidden;
 }
 .sf-reset .block-exception div {
     color: #313131;
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.css.twig
@@ -36,6 +36,8 @@
     background-color: #f6f6f6;
     border: 1px solid #dfdfdf;
     padding: 30px 28px;
+    word-wrap: break-word;
+    overflow: hidden;
 }
 .sf-reset .block-exception div {
     color: #313131;
diff --git a/src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php b/src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php
@@ -201,6 +201,8 @@ public function getStylesheet(FlattenException $exception)
                 border-top:1px solid #ccc;
                 border-right:1px solid #ccc;
                 border-left:1px solid #ccc;
+                overflow: hidden;
+                word-wrap: break-word;
             }
             .sf-reset li a { background:none; color:#868686; text-decoration:none; }
             .sf-reset li a:hover { background:none; color:#313131; text-decoration:underline; }

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,8 @@`
`36`	`36`	`background-color: #f6f6f6;`
`37`	`37`	`border: 1px solid #dfdfdf;`
`38`	`38`	`padding: 30px 28px;`
	`39`	`+ word-wrap: break-word;`
	`40`	`+ overflow: hidden;`
`39`	`41`	`}`
`40`	`42`	`.sf-reset .block-exception div {`
`41`	`43`	`color: #313131;`
Original file line number	Diff line number	Diff line change
`@@ -201,6 +201,8 @@ public function getStylesheet(FlattenException $exception)`
`201`	`201`	`border-top:1px solid #ccc;`
`202`	`202`	`border-right:1px solid #ccc;`
`203`	`203`	`border-left:1px solid #ccc;`
	`204`	`+ overflow: hidden;`
	`205`	`+ word-wrap: break-word;`
`204`	`206`	`}`
`205`	`207`	`.sf-reset li a { background:none; color:#868686; text-decoration:none; }`
`206`	`208`	`.sf-reset li a:hover { background:none; color:#313131; text-decoration:underline; }`