Merge branch 'newdesign' of github.com:kyledrake/neocities-web into newdesign

public/assets/css/_project-sass/_project-Header.scss

@@ -180,8 +180,11 @@
 
 .status-Nav{
   float:right;
+  
+  li{float:left}
+  
   @media (max-device-width:480px), screen and (max-width:800px){
-    float:none
+    float:none;
   }
 }
 

public/assets/css/neo.css

@@ -1083,6 +1083,8 @@ a {
 
 .status-Nav {
   float: right; }
+  .status-Nav li {
+    float: left; }
   @media (max-device-width: 480px), screen and (max-width: 800px) {
     .status-Nav {
       float: none; } }

views/layout.slim

@@ -20,34 +20,34 @@ html
     == erb :'_header', layout: false
     
     .page
-    .container
-    
+      .container
       
-    
-      - flash.keys.each do |key|
-        div class="alert alert-#{key}"
-          button.close type="button" data-dismiss="alert" ×
-          == flash[key]
-      container
-        == yield
-
-  script src="/js/bootstrap.min.js"
-
-  javascript:
-    !function(){
-      var csrf_token = $('meta[name="csrf-token"]').attr('content');
-
-      $(document).ajaxSend(function(ev, jqxhr){
-        jqxhr.setRequestHeader('X-CSRF-Token', csrf_token);
-      });
-    }();
-
-
-  javascript:
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-41925541-1', 'neocities.org');
-    ga('send', 'pageview');
+        
+      
+        - flash.keys.each do |key|
+          div class="alert alert-#{key}"
+            button.close type="button" data-dismiss="alert" ×
+            == flash[key]
+        container
+          == yield
+  
+    script src="/js/bootstrap.min.js"
+  
+    javascript:
+      !function(){
+        var csrf_token = $('meta[name="csrf-token"]').attr('content');
+  
+        $(document).ajaxSend(function(ev, jqxhr){
+          jqxhr.setRequestHeader('X-CSRF-Token', csrf_token);
+        });
+      }();
+  
+  
+    javascript:
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  
+      ga('create', 'UA-41925541-1', 'neocities.org');
+      ga('send', 'pageview');