improved syntax highlighting in documentation browser

mojolicious · Sep 11, 2013 · 305a5e4 · 305a5e4
1 parent c8204a6
commit 305a5e4
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/Changes b/Changes
@@ -4,6 +4,7 @@
   - Added match method to Mojo::DOM::CSS.
   - Improved ancestors and children methods in Mojo::DOM to support all CSS
     selectors.
+  - Improved syntax highlighting in documentation browser.
   - Improved compatibility with different object systems.
 
 4.35  2013-09-10

diff --git a/...us/public/mojo/prettify/prettify-mojo.css → ...blic/mojo/prettify/prettify-mojo-dark.css b/...us/public/mojo/prettify/prettify-mojo.css → ...blic/mojo/prettify/prettify-mojo-dark.css
diff --git a/lib/Mojolicious/public/mojo/prettify/prettify-mojo-light.css b/lib/Mojolicious/public/mojo/prettify/prettify-mojo-light.css
diff --git a/lib/Mojolicious/templates/exception.development.html.ep b/lib/Mojolicious/templates/exception.development.html.ep
@@ -6,7 +6,7 @@
     <meta http-equiv="Expires" content="-1">
     %= javascript '/mojo/jquery/jquery.js'
     %= javascript '/mojo/prettify/run_prettify.js'
-    %= stylesheet '/mojo/prettify/prettify-mojo.css'
+    %= stylesheet '/mojo/prettify/prettify-mojo-dark.css'
     %= stylesheet begin
       a img { border: 0 }
       body {

diff --git a/lib/Mojolicious/templates/not_found.development.html.ep b/lib/Mojolicious/templates/not_found.development.html.ep
@@ -2,8 +2,6 @@
 <html>
   <head>
     <title>Page not found</title>
-    %= javascript '/mojo/prettify/run_prettify.js'
-    %= stylesheet '/mojo/prettify/prettify-mojo.css'
     %= stylesheet begin
       body {
         background-color: #f5f6f8;

diff --git a/lib/Mojolicious/templates/perldoc.html.ep b/lib/Mojolicious/templates/perldoc.html.ep
@@ -3,7 +3,7 @@
   <head>
     <title><%= $title %></title>
     %= javascript '/mojo/prettify/run_prettify.js'
-    %= stylesheet '/mojo/prettify/prettify-mojo.css'
+    %= stylesheet '/mojo/prettify/prettify-mojo-light.css'
     %= stylesheet begin
       a { color: inherit }
       a:hover { color: #2a2a2a }
@@ -23,17 +23,16 @@
       }
       h1 a, h2 a, h3 a { text-decoration: none }
       pre {
-        background-color: #eee;
-        background: url(<%= url_for '/mojo/pinstripe.gif' %>);
+        border: 1px solid #eee;
         -moz-border-radius: 5px;
         border-radius: 5px;
-        color: #eee;
+        color: #4d4d4c;
         font: 0.8em Consolas, Menlo, Monaco, Courier, monospace;
         line-height: 1.7em;
-        text-align: left;
-        text-shadow: #333 0 1px 0;
         padding-bottom: 1.5em;
         padding-top: 1.5em;
+        text-align: left;
+        text-shadow: #ddd 0 1px 0;
         white-space: pre-wrap;
       }
       #footer {

diff --git a/t/mojolicious/exception_lite_app.t b/t/mojolicious/exception_lite_app.t
@@ -214,7 +214,9 @@ $t->get_ok('/mojo/jquery/jquery.js')->status_is(200)
   ->content_type_is('application/javascript');
 $t->get_ok('/mojo/prettify/prettify.js')->status_is(200)
   ->content_type_is('application/javascript');
-$t->get_ok('/mojo/prettify/prettify-mojo.css')->status_is(200)
+$t->get_ok('/mojo/prettify/prettify-mojo-dark.css')->status_is(200)
+  ->content_type_is('text/css');
+$t->get_ok('/mojo/prettify/prettify-mojo-light.css')->status_is(200)
   ->content_type_is('text/css');
 $t->get_ok('/mojo/failraptor.png')->status_is(200)
   ->content_type_is('image/png');