Make header consistent with main container across 'desktop' resolutions

diff --git a/data/templates/base.htm b/data/templates/base.htm
index 426432ebb895df8e78d2e0e7d2fc470b9decb2b4..2eb194e83ab99116a800343ae7d8c7a5cd0ec8c0 100644 (file)
--- a/data/templates/base.htm
+++ b/data/templates/base.htm
@@ -20,10 +20,10 @@
   <div class="navbar navbar-inverse">
    <div class="navbar-inner">
     <div class="container">
-     <a class="brand" href="/">
-      {{title}}
-     </a>
      <ul class="nav">
+      <li>
+       <a class="brand" href="/">{{title}}</a>
+      </li>
       <li>
        <a href="/new">New paste</a>
       </li>

diff --git a/www/css/phorkie.css b/www/css/phorkie.css
index 9cca2dfdf54a204f9f632fcd0195c83ecc6d4640..bc1bdc98e7da7dc29a45f4a25c6b2156ba4b6e21 100644 (file)
--- a/www/css/phorkie.css
+++ b/www/css/phorkie.css
@@ -19,18 +19,28 @@ a.anchorlink {
     margin-left: 0.5em;
     font-size: smaller;
 }
-.navbar .brand {
+.navbar li a.brand {
     /*float: right;*/
+    margin-left: -14px;
     color: #DDA;
     text-shadow: 0 0 30px rgba(255, 255, 255, .9);
 }
-.navbar .brand:hover {
+.navbar li a.brand:hover {
     color: #FFA;
 }
 
-.navbar .container {
-    width: 940px;
+@media (min-width: 980px) and (max-width: 1199px) {
+    .navbar .container {
+        width: 940px;
+    }
 }
+
+@media (min-width: 768px) and (max-width: 979px) {
+    .navbar .container {
+        width: 724px;
+    }
+}
+
 .footer {
     margin-top: 36px;
     margin-bottom: 0px;