Merge branch 'master' into orion-fixes

static/styles/noir/style.css

@@ -233,15 +233,15 @@ ul.thin li { margin:0px 0px; padding:0px; }
 }
 
 #logo {
-  width: 300px;
-  height: 197px;
+  width: 1140px;
+  height: 150px;
   margin: 0 auto;
 }
 
 #logo a {
   border: none;
   width: 100%;
-  height: 197px;
+  height: 150px;
   display: block;
 }
 

static/styles/noir2/style.css

@@ -248,15 +248,15 @@ ul.thin li { margin:0px 0px; padding:0px; }
 }
 
 #logo {
-  width: 300px;
-  height: 197px;
+  width: 1140px;
+  height: 150px;
   margin: 0 auto;
 }
 
 #logo a {
   border: none;
   width: 100%;
-  height: 197px;
+  height: 150px;
   display: block;
 }
 

static/styles/nostalgia/style.css

@@ -239,15 +239,15 @@ ul.thin li { margin:0px 0px; padding:0px; }
 }
 
 #logo {
-  width: 300px;
-  height: 197px;
+  width: 1140px;
+  height: 150px;
   margin: 0 auto;
 }
 
 #logo a {
   border: none;
   width: 100%;
-  height: 197px;
+  height: 150px;
   display: block;
 }