Browse Source

Merge remote branch 'Seldaek/wdt'

* Seldaek/wdt:
  [FrameworkBundle] Highlight error logs in red and not green
  [FrameworkBundle] Fix alignment of <li> with the selected class and small opera glitch
  [FrameworkBundle] Don't hide logs by default in exception pages
Fabien Potencier 14 years ago
parent
commit
63b8b08b2a

+ 8 - 4
src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css

@@ -86,15 +86,20 @@ build: 56
 {
     font-size:12px;
     color:#868686;
-    padding-bottom:10px;
+    padding: 5px 4px;
     list-style-type:decimal;
-    margin-left:24px;
+    margin-left:20px;
+}
+
+/* fix for Opera not liking empty <li> */
+.sf-exceptionreset .traces li:after {
+    content: '\00A0'
 }
 
 .sf-exceptionreset #logs .traces em
 {
     font-style:normal;
-    color:#aacd4e;
+    color:#AA3333;
     font-weight: bold;
 }
 
@@ -259,5 +264,4 @@ build: 56
 .sf-exceptionreset li .selected
 {
     background-color: #ffd;
-    padding: 4px 3px
 }

+ 3 - 3
src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception.html.twig

@@ -51,8 +51,8 @@
                 <h2>
                     Logs&nbsp;
                     <a href="#" onclick="toggle('logs'); switchIcons('icon_logs_open', 'icon_logs_close'); return false;">
-                        <img class="toggle" id="icon_logs_close" alt="-" src="{{ asset('bundles/framework/images/blue_picto_less.gif') }}" style="visibility: hidden" />
-                        <img class="toggle" id="icon_logs_open" alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="visibility: display; margin-left: -18px" />
+                        <img class="toggle" id="icon_logs_open" alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="visibility: hidden" />
+                        <img class="toggle" id="icon_logs_close" alt="-" src="{{ asset('bundles/framework/images/blue_picto_less.gif') }}" style="visibility: display; margin-left: -18px" />
                     </a>
                 </h2>
                 {% endspaceless %}
@@ -67,7 +67,7 @@
 
             </div>
 
-            <div id="logs" style="display: none">
+            <div id="logs">
                 {% include 'FrameworkBundle:Exception:logs.html.twig' with { 'logs': logger.logs } only %}
             </div>