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

Gemfile.lock

@@ -15,12 +15,12 @@ GEM
     columnize (0.3.6)
     connection_pool (1.1.0)
     crack (0.3.2)
-    debugger (1.6.0)
+    debugger (1.6.1)
       columnize (>= 0.3.1)
       debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.1)
+      debugger-ruby_core_source (~> 1.2.3)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.2)
+    debugger-ruby_core_source (1.2.3)
     fabrication (2.7.1)
     faker (1.1.2)
       i18n (~> 0.5)

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

@@ -18,7 +18,7 @@ body{background:#CCDF9B}
 // while allowing for larger sections to expand the whole page for BG purposes
 .content{
 	margin:0 auto;
-	max-width:1000px;
+	max-width:1200px;
 	padding:$spacing*5;
 	
 	& > :last-child{

public/assets/css/_project-sass/_project-Website-Gallery.scss

@@ -4,33 +4,58 @@
 
 .website-Gallery{
   list-style:none;
-  margin:0 auto;
+  padding:10px 0;
-  padding:0;
-  width:90%;
   
   li{
     @extend .col-25;
     float:left;
     margin-bottom:$spacing*2;
     
-    @media (max-device-width:480px), screen and (max-width:800px){width:50%}
+    @media (max-device-width:480px), screen and (max-width:800px){
+      width:50%
+    }
   }
   
   a{
     padding:0 $spacing*2;
     display:block;
   }
+  
+  &.int-Gall{
+    
+    li{
+      border:1px solid #ccc;
+      margin:0 .5% 12px;
+      width:24%;
+      
+      @media (max-device-width:480px), screen and (max-width:800px){
+        width:49%
+      }
+      a{
+        padding:8px;
+      }
+    }
+  }
 }
 
-.neo-SS{
+.neo-SS, .neo-Screen-Shot{
   background:#fff;
   @include box-shadow($bs-4);
   display:block;
   height:auto!important;
   padding:$spacing*2;
+  position:relative;
   width:100%;
 }
 
-.hp-Gallery img{
+.img-Holder{
+  -moz-background-size:cover!important;
+  -webkit-background-size:cover!important;
+  background-size:cover!important;
+  display:block;
+}
+
+.hp-Gallery img, .neo-Screen-Shot img{
   width:100%
 }
+

public/assets/css/neo.css

@@ -935,7 +935,7 @@ body {
 
 .content, .footer-Content {
   margin: 0 auto;
-  max-width: 1000px;
+  max-width: 1200px;
   padding: 20px; }
   .content > :last-child, .footer-Content > :last-child {
     margin-bottom: 0; }
@@ -1385,9 +1385,7 @@ a {
 
 .website-Gallery {
   list-style: none;
-  margin: 0 auto;
+  padding: 10px 0; }
-  padding: 0;
-  width: 90%; }
   .website-Gallery li {
     float: left;
     margin-bottom: 8px; }
@@ -1397,8 +1395,17 @@ a {
   .website-Gallery a {
     padding: 0 8px;
     display: block; }
+  .website-Gallery.int-Gall li {
+    border: 1px solid #ccc;
+    margin: 0 .5% 12px;
+    width: 24%; }
+    @media (max-device-width: 480px), screen and (max-width: 800px) {
+      .website-Gallery.int-Gall li {
+        width: 49%; } }
+    .website-Gallery.int-Gall li a {
+      padding: 8px; }
 
-.neo-SS {
+.neo-SS, .neo-Screen-Shot {
   background: #fff;
   -moz-box-shadow: 0 8px 8px -8px rgba(0, 0, 0, 0.2);
   -webkit-box-shadow: 0 8px 8px -8px rgba(0, 0, 0, 0.2);
@@ -1406,7 +1413,14 @@ a {
   display: block;
   height: auto !important;
   padding: 8px;
+  position: relative;
   width: 100%; }
 
-.hp-Gallery img {
+.img-Holder {
+  -moz-background-size: cover !important;
+  -webkit-background-size: cover !important;
+  background-size: cover !important;
+  display: block; }
+
+.hp-Gallery img, .neo-Screen-Shot img {
   width: 100%; }

public/css/styles.css

@@ -27,3 +27,10 @@ select, textarea, input[type="text"], input[type="password"], input[type="dateti
 
 select, textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input {
 line-height:inherit; height:auto!important}
+
+.scroll-Admin{
+  background:rgba(255,255,255,.4);
+  border:1px solid #ccc;
+  max-height:400px;
+  overflow:auto;
+}

views/admin.slim

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

views/browse.erb

@@ -39,12 +39,14 @@
       </div>
       
     </div> <!-- end .row.content -->
-
+<br />
-  <ul class="row website-Gallery">
+  <ul class="row website-Gallery content int-Gall">
     <% @sites.each do |site| %>
       <li>
-        <a href="http://<%= site.username %>.neocities.org" target="_blank">
+        <a href="http://<%= site.username %>.neocities.org" class="neo-Screen-Shot" target="_blank" title="Website of <%= site.username %>">
-          <img src="http://neocities.org/site_screenshots/<%= site.username %>.jpg" class="neo-SS" alt="<%= 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 %>