made logo on built-in templates smaller and tweaked CSS

mojolicious · Apr 24, 2012 · dd2ad74 · dd2ad74
1 parent 7190773
commit dd2ad74
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 30 deletions.
diff --git a/Changes b/Changes
@@ -1,6 +1,8 @@
 This file documents the revision history for Perl extension Mojolicious.
 
-2.89  2012-04-25
+2.89  2012-04-24
+  - Made logo on built-in templates smaller.
+  - Improved CSS of built-in templates.
   - Improved documentation.
   - Improved tests.
 

diff --git a/lib/Mojo/Template.pm b/lib/Mojo/Template.pm
@@ -423,7 +423,7 @@ the default in L<Mojolicious> C<.ep> templates for example.
 
 L<Mojo::ByteStream> objects are always excluded from automatic escaping.
 
-  <%= b('<div>excluded!</div>') %>
+  <%= Mojo::ByteStream->new('<div>excluded!</div>') %>
 
 =head2 Trimming
 

diff --git a/lib/Mojolicious/Guides/Rendering.pod b/lib/Mojolicious/Guides/Rendering.pod
@@ -114,7 +114,7 @@ which is the default to prevent XSS attacks against your application.
 
 Only L<Mojo::ByteStream> objects are excluded from automatic escaping.
 
-  <%= b('<p>test</p>') %>
+  <%= Mojo::ByteStream->new('<p>test</p>') %>
 
 You can also add an additional equal sign to the end of a tag to have it
 automatically remove all surrounding whitespace, this allows free indenting

diff --git a/lib/Mojolicious/public/mojolicious-white.png b/lib/Mojolicious/public/mojolicious-white.png
diff --git a/lib/Mojolicious/templates/exception.development.html.ep b/lib/Mojolicious/templates/exception.development.html.ep
@@ -48,6 +48,10 @@
       .infobox tr:nth-child(odd) .value { background-color: #ddeeff }
       .infobox tr:nth-child(even) .value { background-color: #eef9ff }
       .key { text-align: right }
+      .spaced {
+        margin-left: 5em;
+        margin-right: 5em;
+      }
       .striped { border-top: solid #cce4ff 1px }
       .tap {
         font: 0.5em Verdana, sans-serif;
@@ -58,18 +62,10 @@
         width: 100%;
       }
       #footer {
-        margin-top: 1.5em;
+        padding-top: 1em;
         text-align: center;
-        width: 100%;
-      }
-      #showcase {
-        -moz-border-radius-topleft: 5px;
-        border-top-left-radius: 5px;
-        -moz-border-radius-topright: 5px;
-        border-top-right-radius: 5px;
-        margin-left: 5em;
-        margin-right: 5em;
       }
+      #nothing { padding-top: 60px }
       #showcase > pre {
         font: 1.5em 'Helvetica Neue', Helvetica, sans-serif;
         font-weight: 300;
@@ -81,29 +77,25 @@
         border-bottom-left-radius: 5px;
         -moz-border-radius-bottomright: 5px;
         border-bottom-right-radius: 5px;
-        margin-left: 5em;
-        margin-right: 5em;
       }
       #more .tap, #trace .tap { text-shadow: #ddd 0 1px 0 }
       #request {
         -moz-border-radius-topleft: 5px;
         border-top-left-radius: 5px;
         -moz-border-radius-topright: 5px;
         border-top-right-radius: 5px;
-        margin-left: 5em;
-        margin-right: 5em;
         margin-top: 1em;
       }
       #wrapperlicious {
         max-width: 1000px;
         margin: 0 auto;
-        padding-top: 90px;
       }
     % end
   </head>
   <body onload="prettyPrint()">
     %= include inline => $Mojolicious::Controller::MOJOBAR
     <div id="wrapperlicious">
+      <div id="nothing" class="box spaced"></div>
       % my $cv = begin
         % my ($key, $value, $i) = @_;
         %= tag 'tr', $i ? (class => 'important') : undef, begin
@@ -118,7 +110,7 @@
           <td class="striped value"><pre><%= $value %></pre></td>
         </tr>
       % end
-      <div id="showcase" class="code box">
+      <div id="showcase" class="box code spaced">
         <pre><%= $exception->message %></pre>
         <div id="context">
           <table>
@@ -163,7 +155,7 @@
           % end
         % }
       </div>
-      <div class="box" id="trace">
+      <div id="trace" class="box spaced">
         % if (@{$exception->frames}) {
           <div class="infobox" id="frames">
             <table>
@@ -185,7 +177,7 @@
           % end
         % }
       </div>
-      <div class="box infobox" id="request">
+      <div id="request" class="box infobox spaced">
         <table>
           % my $req = $self->req;
           %= $kv->(Method => $req->method)
@@ -202,7 +194,7 @@
           % }
         </table>
       </div>
-      <div class="box infobox" id="more">
+      <div id="more" class="box infobox spaced">
         <div id="infos">
           <table>
             %= $kv->(Perl => "$^V ($^O)")

diff --git a/lib/Mojolicious/templates/mojobar.html.ep b/lib/Mojolicious/templates/mojobar.html.ep
@@ -16,10 +16,10 @@
         #000 100%
       );
       background: linear-gradient(top, #2a2a2a 0%, #000 100%);
-      -moz-box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.6);
-      -webkit-box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.6);
-      box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.6);
-      height: 60px;
+      -moz-box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.6);
+      -webkit-box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.6);
+      box-shadow: 0px 1px 2px rgba(0, 0, 0, 0.6);
+      height: 46px;
       overflow: hidden;
       position: absolute;
       text-align: right;
@@ -30,14 +30,14 @@
     #mojobar-logo {
       float: left;
       margin-left: 5em;
-      padding-top: 2px;
+      padding-top: 3px;
     }
     #mojobar-links {
       display:table-cell;
       float: right;
       height: 60px;
       margin-right: 5em;
-      margin-top: 1.5em;
+      margin-top: 1em;
     }
     #mojobar-links a {
       color: #ccc;

diff --git a/lib/Mojolicious/templates/not_found.development.html.ep b/lib/Mojolicious/templates/not_found.development.html.ep
@@ -65,7 +65,7 @@
         margin-left: 5em;
         margin-right: 5em;
         padding: 1em;
-        padding-top: 7em;
+        padding-top: 70px;
       }
       #wrapperlicious {
         max-width: 1000px;

diff --git a/lib/Mojolicious/templates/perldoc.html.ep b/lib/Mojolicious/templates/perldoc.html.ep
@@ -51,7 +51,7 @@
         margin-left: 5em;
         margin-right: 5em;
         padding: 3em;
-        padding-top: 7em;
+        padding-top: 70px;
       }
       #perldoc > ul:first-of-type a { text-decoration: none }
       #wrapperlicious {