Merge branch 'v2' of github.com:neocities/neocities into v2

public/assets/css/_base-sass/_forms.scss

@@ -81,9 +81,9 @@ legend, .legend{
 /* Drop Down Selection Inputs */
 .select-Container{
     @extend %input-Area;
-    background:url(../img/drop-Arrow.png) no-repeat 99% center #fff; display:inline-block; overflow:hidden;
+    background:url(../img/drop-Arrow.png) no-repeat 99% center #fff; display:inline-block;
 }
-.input-Select{background:none; border:0; font-size:$base; padding-right:$spacing*4; width:120%; -webkit-appearance:textarea}
+.input-Select{background:none; border:0; font-size:$base; padding-right:$spacing*4; width:100%; -webkit-appearance:textarea}
 
 // File Input Styling
 .file-Input-Area{

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

@@ -301,6 +301,13 @@
   margin-left: auto;
   margin-right: auto;
 }
+.folder-icon {
+  background: url(../img/folder.png) no-repeat 0px 0px;
+  width: 95px;
+  height: 65px;
+  display: block;
+  padding-top: 35px;
+}
 .overlay a {
   color: white;
   text-decoration: none;
@@ -782,3 +789,28 @@ a.tag:hover {
   padding: 0px 10px 0px 10px;
   background: #FFFFFF;
 }
+.browse-page .select-Container {
+  overflow: none!important;
+  padding: 2px 4px;
+  width: 40%;
+}
+.browse-page .input-Area {
+  width: 100%;
+  padding: 5px 5px;
+}
+.header-Outro .btn-Action {
+  margin: 0 0 0 10px;
+}
+.browse-page .text-Label {
+  float: left;
+  margin-right: 5px;
+  font-weight: bold;
+  line-height:31px;
+}
+.browse-page h1 {
+  margin-top: 0;
+}
+.interior .header-Outro.with-columns .col.filter {
+  padding-top: 0px;
+  padding-bottom: 4px;
+}

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

@@ -4,7 +4,7 @@
 
 .website-Gallery{
   list-style:none;
-  padding:10px 0;
+  padding:30px 20px;
   
   li{
     @extend .col-25;
@@ -16,34 +16,42 @@
     }
   }
   
-  a{
+  li a {
-    padding:0 $spacing*2;
     display:block;
   }
+  .site-info a {
+    color: #666;
+    font-size: 80%;
+  }
+  .title {
+    margin-top: 8px;
+    margin-bottom: 2px;
+  }
   
   &.int-Gall{
     
     li{
-      border:1px solid #ccc;
+
       margin:0 .5% 12px;
       width:24%;
       
+      background-color: white;
+      border: 9px solid white;
+      -moz-box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.2);
+      -webkit-box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.2);
+      box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.2);
+      
       @media (max-device-width:480px), screen and (max-width:800px){
         width:49%
       }
-      a{
-        padding:8px;
-      }
     }
   }
 }
 
 .neo-SS, .neo-Screen-Shot{
-  background:#fff;
+  border: 1px solid #eee;
-  @include box-shadow($bs-4);
   display:block;
   height:auto!important;
-  padding:$spacing*2;
   position:relative;
   width:100%;
 }

public/assets/css/neo.css

@@ -405,15 +405,14 @@ legend, .legend {
 /* Drop Down Selection Inputs */
 .select-Container {
   background: url(../img/drop-Arrow.png) no-repeat 99% center white;
-  display: inline-block;
+  display: inline-block; }
-  overflow: hidden; }
 
 .input-Select {
   background: none;
   border: 0;
   font-size: 0.9em;
   padding-right: 16px;
-  width: 120%;
+  width: 100%;
   -webkit-appearance: textarea; }
 
 .file-Input-Area {
@@ -1546,6 +1545,14 @@ a {
   margin-left: auto;
   margin-right: auto; }
 
+.folder-icon {
+  background: url(../img/folder.png) no-repeat 0px 0px;
+  width: 95px;
+  height: 65px;
+  display: block;
+  padding-top: 35px;
+  font-size: 14px; }
+
 .overlay a {
   color: white;
   text-decoration: none;
@@ -2017,6 +2024,31 @@ a.tag:hover {
   padding: 0px 10px 0px 10px;
   background: #FFFFFF; }
 
+.browse-page .select-Container {
+  overflow: none !important;
+  padding: 2px 4px;
+  width: 40%; }
+
+.browse-page .input-Area {
+  width: 100%;
+  padding: 5px 5px; }
+
+.header-Outro .btn-Action {
+  margin: 0 0 0 10px; }
+
+.browse-page .text-Label, .browse-page .option-Container {
+  float: left;
+  margin-right: 5px;
+  font-weight: bold;
+  line-height: 31px; }
+
+.browse-page h1 {
+  margin-top: 0; }
+
+.interior .header-Outro.with-columns .col.filter {
+  padding-top: 0px;
+  padding-bottom: 4px; }
+
 .footer-Base {
   color: #5e5b56;
   float: left;
@@ -2162,34 +2194,37 @@ a.tag:hover {
 
 .website-Gallery {
   list-style: none;
-  padding: 10px 0; }
+  padding: 30px 20px; }
   .website-Gallery li {
     float: left;
     margin-bottom: 8px; }
     @media (max-device-width: 480px), screen and (max-width: 800px) {
       .website-Gallery li {
         width: 50%; } }
-  .website-Gallery a {
+  .website-Gallery li a {
-    padding: 0 8px;
     display: block; }
+  .website-Gallery .site-info a {
+    color: #666;
+    font-size: 80%; }
+  .website-Gallery .title {
+    margin-top: 8px;
+    margin-bottom: 2px; }
   .website-Gallery.int-Gall li {
-    border: 1px solid #ccc;
     margin: 0 .5% 12px;
-    width: 24%; }
+    width: 24%;
+    background-color: white;
+    border: 9px solid white;
+    -moz-box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.2);
+    -webkit-box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.2);
+    box-shadow: 1px 1px 2px 1px rgba(0, 0, 0, 0.2); }
     @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-Screen-Shot {
-  background: #fff;
+  border: 1px solid #eee;
-  -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);
-  box-shadow: 0 8px 8px -8px rgba(0, 0, 0, 0.2);
   display: block;
   height: auto !important;
-  padding: 8px;
   position: relative;
   width: 100%; }
 

views/_header.erb

@@ -26,6 +26,9 @@
     
     <ul class="status-Nav">
       <% if !signed_in? %>
+        <li>
+          <a href="/new" class="create-New" title="Create a new website">New Site</a>
+        </li>
         <li>
           <a href="/signin" class="sign-In" title="Sign into your account">Sign In</a>
         </li>

views/browse.erb

@@ -4,19 +4,17 @@
   }
 </script>
 
-<div class="header-Outro">
+<div class="header-Outro with-columns browse-page">
   <div class="row content">
+    <div class="col col-100">
       <% if params[:tag] %>
-    <h1>Sites tagged <%= params[:tag] %>
+        <h1>Sites tagged <%= params[:tag] %></h1>
       <% else %>
         <h1>Sites on Neocities</h1>
       <% end %>
-  <h3 class="subtitle"></h3>
     </div>
-</div>
   
-<div class="row content">
+    <div class="col col-50 filter">
-  <div class="col col-50">
       <form id="search_criteria" action="/browse" method="GET">
         <fieldset class="grouping">
           <% if params[:tag] %>
@@ -38,24 +36,27 @@
             <input name="is_nsfw" type="checkbox" value="true" <%= params[:is_nsfw].to_s == 'true' ? 'checked' : '' %>> Show 18+ content
           </div>
         -->
-        <div style="margin-top: 10px">
             <input class="btn-Action" type="submit" value="Update">
+        </fieldset>
+      </form>
     </div>
+    <div class="col col-50 filter">
+      <form method="GET" action="browse">
+        <fieldset class="grouping">
+        <label class="text-Label" for="tag">Search by tag:</label>
+        <input class="input-Area typeahead" name="tag" placeholder="pokemon">
+        <input type="submit" class="btn-Action" value="Search">
         </fieldset>
       </form>
     </div>
 
-  <div class="col col-50">
-    <p>If you like a site, don't forget to follow it!<br>Visitor counts are updated hourly.</p>
-    <% unless signed_in? %>
-      <a class="btn-Action" href="/new" title="create a Neocities.org site today!">Create your Neocities site now</a>
-    <% end %>
   </div>
-</div> <!-- end .row.content -->
+</div>
+
+<div class="browse-page">
 
-<br />
 <% if @sites.length == 0 %>
-  <div class="row content single-Col">
+  <div class="row website-Gallery content int-Gall">
     <h2>No active sites found.<br>Try another search!</h2>
   </div>
 <% else %>
@@ -67,20 +68,18 @@
             <img src="/img/placeholder.png" alt="<%= site.title %>" />
           </span>
         </a>
-        <div>
+        <div class="title">
-          <span>
+          <a href="//<%= site.host %>" title="<%= site.title %>"><%= site.title.shorten(35) %></a>
-            <center><a href="//<%= site.host %>" title="<%= site.title %>"><%= site.title.shorten(35) %></a>
-          </span>
         </div>
-        <div>
+        <div class="site-info">
-          <span style="float: left">
+          <div style="float: left">
-            <a href="/site/<%= site.username %>">Profile</a>
+            <a href="/site/<%= site.username %>" title="Profile"><i class="icon-user"></i> <%= site.username %></a>
-          </span>
+          </div>
-          <span style="float: right">
+          <div style="float: right">
             <a href="/site/<%= site.username %>">
               <%= site.hits %> hit<%= site.hits == 1 ? '' : 's' %>
             </a>
-          </span>
+          </div>
         </div>
       </li>
     <% end %>
@@ -109,22 +108,11 @@
   <% end %>
 <% end %>
 
-<div class="row content">
+<div class="row website-Gallery content int-Gall">
-  <div class="col col-100">
+    <h4>Tags</h4>
-    <h3>
+    <p>
     <% Tag.popular_names.each do |tag| %>
       <a href="/browse?tag=<%= Rack::Utils.escape tag[:name] %>"><%= tag[:name] %></a>&nbsp;&nbsp;
     <% end %>
-    </h3>
+    </p>
-  </div>
-</div>
-
-<div class="row content">
-  <div class="col col-20">
-    <h4>Search by tag:</h4>
-    <form method="GET" action="browse">
-      <input class="input-Area typeahead" name="tag" placeholder="pokemon">
-      <input type="submit" class="btn-Action" value="Search" style="width: 100px">
-    </form>
-  </div>
 </div>

views/dashboard.erb

@@ -88,10 +88,10 @@
     </div>
   </div>
   <div class="header">
-    <div class="breadcrumbs">My Files</div> <!-- Should be Home when Folders are implemented -->
+    <div class="breadcrumbs">Home</div>
     <div class="actions">
       <a href="/site_files/new_page" class="btn-Action new-Page"><span>New Page</span></a>
-      <!--<a href="" class="btn-Action new-Folder"><span>New Folder</span></a>-->
+      <a href="" class="btn-Action new-Folder"><span>New Folder</span></a>
       <a href="#" class="btn-Action upload" onclick="clickUploadFiles(); return false"><span>Upload</span></a>
     </div>
   </div>
@@ -112,6 +112,12 @@
                 <img src="<%= current_site.thumbnail_url(file.filename, '105x63') %>" style="">
                 <div class="overlay"></div>
               </div>
+            <!-- if folder
+              <div class="html-thumbnail folder fileimagehover">
+                <div class="folder-icon"></div>
+                <div class="overlay"></div>
+              </div> 
+            -->
             <% else %>
               <div class="html-thumbnail misc fileimagehover">
                 <div class="misc-icon"><%= file.ext %></div>

views/layout.erb

@@ -4,7 +4,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title><%= title %></title>
     <meta itemprop="name"         content="Neocities.org">
-    <meta itemprop="description"  content="ECreate your own free home page, and do whatever you want with it.">
+    <meta itemprop="description"  content="Create your own free home page, and do whatever you want with it.">
     <meta name="description"      content="Neocities is the new Geocities. Create your own free home page, and do whatever you want with it.">
     <meta name="keywords"         content="free website, html, css, learn to code, free hosting, build a website, create a web page" >
     <meta property="og:title"       content="Neocities">

views/site_files/text_editor.erb

@@ -14,7 +14,7 @@
 </style>
 
 <div class="header-Outro">
-  <div class="row content single-Col">
+  <div class="row content">
     <h1>Editing <%= params[:filename] %></h1>
   </div>
 </div>