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

views/admin.slim

@@ -1,37 +1,40 @@
-.row
-  .span12  
-    h1 SECRET NSA BACKDOOR REPORTING ZONE
-
-.row
-  .span6
-    
-    h2 Ban User
-    
-    form action="/admin/banhammer" method="POST"
-      input name="csrf_token" type="hidden" value="#{csrf_token}"
-      p Site Name:
-      input type="text" name="username" placeholder="edwardsnowden" autocapitalize="off" autocorrect="off"
-      br
-      input.btn.btn-danger type="submit" value="Ban"
-  .span6
-    h2 Banned Terrorists
-    - @banned_sites.each do |banned_site|
-      = banned_site.username
-      br
-
-
-.row
-  .span6
-    h2 Mark NSFW
-    
-    form action="/admin/mark_nsfw" method="POST"
-      input name="csrf_token" type="hidden" value="#{csrf_token}"
-      p Site name:
-      input type="text" name="username" placeholder="edwardsnowden" autocapitalize="off" autocorrect="off"
-      br
-      input.btn.btn-danger type="submit" value="Mark NSFW"
-  .span6
-    h2 NSFW Sites
-    - @nsfw_sites.each do |nsfw_site|
-      = nsfw_site.username
-      br
+.content-Base
+  .row.content
+    .col  
+      h1.beta SECRET NSA BACKDOOR REPORTING ZONE
+  
+  .row.content
+    .col.col-50
+      
+      h3 Ban User
+      
+      form action="/admin/banhammer" method="POST"
+        input name="csrf_token" type="hidden" value="#{csrf_token}"
+        p Site Name:
+        input type="text" name="username" placeholder="edwardsnowden" autocapitalize="off" autocorrect="off"
+        br
+        input.btn.btn-danger type="submit" value="Ban"
+    .col.col-50
+      h2 Banned Terrorists
+      .scroll-Admin
+        - @banned_sites.each do |banned_site|
+          = banned_site.username
+          br
+  
+  
+  .row.content
+    .col.col-50
+      h3 Mark NSFW
+      
+      form action="/admin/mark_nsfw" method="POST"
+        input name="csrf_token" type="hidden" value="#{csrf_token}"
+        p Site name:
+        input type="text" name="username" placeholder="edwardsnowden" autocapitalize="off" autocorrect="off"
+        br
+        input.btn.btn-danger type="submit" value="Mark NSFW"
+    .col.col-50
+      h2 NSFW Sites
+      .scroll-Admin
+        - @nsfw_sites.each do |nsfw_site|
+          = nsfw_site.username
+          br

views/browse.erb

@@ -39,12 +39,14 @@
       </div>
       
     </div> <!-- end .row.content -->
-
-  <ul class="row website-Gallery">
+<br />
+  <ul class="row website-Gallery content int-Gall">
     <% @sites.each do |site| %>
       <li>
-        <a href="http://<%= site.username %>.neocities.org" target="_blank">
-          <img src="http://neocities.org/site_screenshots/<%= site.username %>.jpg" class="neo-SS" alt="<%= site.username %>" />
+        <a href="http://<%= site.username %>.neocities.org" class="neo-Screen-Shot" target="_blank" title="Website of <%= site.username %>">
+          <span class="img-Holder" style="background:url(http://neocities.org/site_screenshots/<%= site.username %>.jpg) no-repeat;">
+            <img src="/img/placeholder.png" alt="<%= site.username %>" />
+          </span>
         </a>
       </li>
     <% end %>