From 120fc5296a97fcabbee2dd12ff094c483ab2826c Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasong@gmail.com>
Date: Mon, 11 May 2015 17:04:48 -0700
Subject: [PATCH 01/11] Initial work on dashboard list view

---
 sass/_project-sass/_project-Main.scss | 49 +++++++++++++++++++++++++++
 views/dashboard.erb                   |  2 +-
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss
index f0beca13..26575bdf 100644
--- a/sass/_project-sass/_project-Main.scss
+++ b/sass/_project-sass/_project-Main.scss
@@ -448,6 +448,55 @@
 .html-thumbnail.misc.fileimagehover .overlay {
   margin: 1px 0 0 2px;
 }
+.files .list.list-view {
+  .upload-Boundary {
+    padding: 0;
+    border: 0;
+  }
+  .file {
+    padding: 3px 0;
+    margin: 0;
+    margin-bottom: 6px;
+    width: 100%;
+    
+    .title {
+      margin: 0;
+      margin-left: 7px;
+      margin-top: 2px;
+      float: left;
+      font-size: 13px;
+    }
+  }
+  .html-thumbnail, .misc-icon {
+    margin: 0;
+    margin-left: 4px;
+    float: left;
+    width: 23px;
+    height: 23px;
+    background-size: 23px;
+    padding: 0;
+    font-size: 8px;
+    
+    img {
+      max-width: 23px;
+      max-height: 23px;
+    }
+  }
+  .misc-icon {
+    padding-top: 8px;
+  }
+  .folder-icon {
+    background-position: 0 4px;
+    background-size: 23px;
+    height: 23px;
+  }
+  .file > .overlay {
+    border-radius: 3px;
+  }
+  .html-thumbnail > .overlay {
+    background-color: transparent;
+  }
+}
 .site-actions {
   float: left;
   margin-top: 20px;
diff --git a/views/dashboard.erb b/views/dashboard.erb
index 2913e18d..89b49d0f 100644
--- a/views/dashboard.erb
+++ b/views/dashboard.erb
@@ -106,7 +106,7 @@
       <a href="#" class="btn-Action" onclick="clickUploadFiles(); return false"><i class="fa fa-arrow-circle-up"></i> Upload</a>
     </div>
   </div>
-  <div class="list">
+  <div class="list list-view">
     <form action="/site_files/upload" class="dropzone" id="uploads">
       <div class="dz-message" style="display: none"></div>
       <input name="csrf_token" type="hidden" value="<%= csrf_token %>">

From 5878692c81aa824c71ee882ee2a6587551661051 Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasong@gmail.com>
Date: Wed, 13 May 2015 15:04:40 -0700
Subject: [PATCH 02/11] Moved manage/delete buttons to the right

---
 sass/_project-sass/_project-Main.scss | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss
index 26575bdf..b63edc2d 100644
--- a/sass/_project-sass/_project-Main.scss
+++ b/sass/_project-sass/_project-Main.scss
@@ -492,6 +492,14 @@
   }
   .file > .overlay {
     border-radius: 3px;
+    padding-top: 3px;
+    text-align: right;
+    
+    a {
+      color: #e93250;
+      display: inline;
+      margin-right: 5px;
+    }
   }
   .html-thumbnail > .overlay {
     background-color: transparent;

From b0667a73a7332ef589a4c3a4fc0d315f0dc9613f Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasong@gmail.com>
Date: Wed, 13 May 2015 15:16:10 -0700
Subject: [PATCH 03/11] Initial work on size/updated columns; switched title
 truncation from ruby to css text-overflow

---
 sass/_project-sass/_project-Main.scss |  9 +++++++++
 views/dashboard.erb                   | 13 ++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss
index b63edc2d..832f1ca1 100644
--- a/sass/_project-sass/_project-Main.scss
+++ b/sass/_project-sass/_project-Main.scss
@@ -360,6 +360,7 @@
   white-space: nowrap;
   overflow: hidden;
   display: block;
+  text-overflow: ellipsis;
 }
 .html-thumbnail {
   font-size: 11px;
@@ -465,6 +466,9 @@
       margin-top: 2px;
       float: left;
       font-size: 13px;
+      text-align: left;
+      width: 30%;
+      text-overflow: ellipsis;
     }
   }
   .html-thumbnail, .misc-icon {
@@ -494,6 +498,7 @@
     border-radius: 3px;
     padding-top: 3px;
     text-align: right;
+    background-color: rgba(0, 0, 0, 0.06);
     
     a {
       color: #e93250;
@@ -504,6 +509,10 @@
   .html-thumbnail > .overlay {
     background-color: transparent;
   }
+  .column {
+    float: left;
+    width: 15%;
+  }
 }
 .site-actions {
   float: left;
diff --git a/views/dashboard.erb b/views/dashboard.erb
index 89b49d0f..3046a157 100644
--- a/views/dashboard.erb
+++ b/views/dashboard.erb
@@ -137,12 +137,15 @@
             <% end %>
 
             <a class="title">
-              <% if file[:name].length > 19 %>
-                <%= file[:name].slice(0..18) %>&hellip;
-              <% else %>
-                <%= file[:name] %>
-              <% end %>
+              <%= file[:name] %>
             </a>
+            <div class="column size">
+              5KB
+            </div>
+            <div class="column updated">
+              5/13/15
+            </div>
+            
             <div class="overlay">
               <% if file[:is_editable] %>
                 <a href="/site_files/text_editor<%= file[:path] %>"><i class="fa fa-edit" title="Edit"></i> Edit</a>

From 674798a01b877e2bc8295f8266d96a4e6f20f8af Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasong@gmail.com>
Date: Wed, 13 May 2015 15:28:53 -0700
Subject: [PATCH 04/11] Change list view manage/delete to always shown

---
 sass/_project-sass/_project-Main.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss
index 832f1ca1..9aed6a47 100644
--- a/sass/_project-sass/_project-Main.scss
+++ b/sass/_project-sass/_project-Main.scss
@@ -498,7 +498,8 @@
     border-radius: 3px;
     padding-top: 3px;
     text-align: right;
-    background-color: rgba(0, 0, 0, 0.06);
+    background-color: transparent;
+    display: block;
     
     a {
       color: #e93250;

From b7f96cb72ce63059478525333078bda19f612d4d Mon Sep 17 00:00:00 2001
From: Kyle Drake <kyle@kyledrake.net>
Date: Fri, 15 May 2015 12:34:53 -0700
Subject: [PATCH 05/11] new top header

---
 views/index.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/index.erb b/views/index.erb
index 8f2c447b..b785a8cb 100644
--- a/views/index.erb
+++ b/views/index.erb
@@ -57,7 +57,7 @@
 <div class="header-Outro">
 <div class="row header-Content content">
   <div class="col intro">
-    <h2 class="section-header">Create your own free web site, and discover new ones.</h2>
+    <h2 class="section-header">Create your own free web site, with no advertising, ever.</h2>
     <p class="intro-text">
      Neocities is a community of <a href="/browse"><%= @sites_count.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> sites</a> that are bringing back the lost individual creativity of the web. We provide free hosting and tools that allow anyone to make a web site. Only your imagination is required. Join us!
     </p>

From 239c1e2eb7525edfaa63ea7e3aaef1b6ae09f37e Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasong@gmail.com>
Date: Mon, 18 May 2015 17:43:24 -0700
Subject: [PATCH 06/11] Added checkboxes to file list, fixed links

---
 sass/_project-sass/_project-Main.scss | 19 +++++++++++++++++--
 views/dashboard.erb                   |  1 +
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss
index 9aed6a47..29c50cff 100644
--- a/sass/_project-sass/_project-Main.scss
+++ b/sass/_project-sass/_project-Main.scss
@@ -237,6 +237,10 @@
   width: 100%;
   position: relative;
   margin-top: 7px;
+  
+  .column, input[type='checkbox'] {
+    display: none;
+  }
 }
 .files .header {
   background: #5E95A1;
@@ -470,6 +474,12 @@
       width: 30%;
       text-overflow: ellipsis;
     }
+    input[type='checkbox'] {
+      display: block;
+      float: left;
+      margin-top: 5px;
+      margin-right: 6px;
+    }
   }
   .html-thumbnail, .misc-icon {
     margin: 0;
@@ -495,8 +505,9 @@
     height: 23px;
   }
   .file > .overlay {
-    border-radius: 3px;
     padding-top: 3px;
+    margin-left: 20px;
+    padding-right: 20px;
     text-align: right;
     background-color: transparent;
     display: block;
@@ -506,13 +517,17 @@
       display: inline;
       margin-right: 5px;
     }
+    .link-overlay {
+      width: 30%;
+    }
   }
   .html-thumbnail > .overlay {
-    background-color: transparent;
+    display: none;
   }
   .column {
     float: left;
     width: 15%;
+    display: block;
   }
 }
 .site-actions {
diff --git a/views/dashboard.erb b/views/dashboard.erb
index 3046a157..1b7fec51 100644
--- a/views/dashboard.erb
+++ b/views/dashboard.erb
@@ -114,6 +114,7 @@
       <div class="upload-Boundary <%= @file_list.length <= 5 ? 'with-instruction' : '' %>">
         <% @file_list.each do |file| %>
           <div class="file filehover">
+            <input type="checkbox" name="" value="" />
             <% if file[:is_html] && current_site.screenshot_exists?(file[:path], '210x158') %>
               <div class="html-thumbnail html fileimagehover">
                 <img src="<%= current_site.screenshot_url(file[:path], '210x158') %>" alt="">

From 7c017388f05f01f2035c26f1ad0642b2a6710b0c Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasong@gmail.com>
Date: Mon, 18 May 2015 17:57:42 -0700
Subject: [PATCH 07/11] Added alternating background colors to file list rows,
 adjusted fonts, etc

---
 sass/_project-sass/_project-Main.scss | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss
index 29c50cff..7e6fd1ee 100644
--- a/sass/_project-sass/_project-Main.scss
+++ b/sass/_project-sass/_project-Main.scss
@@ -454,22 +454,27 @@
   margin: 1px 0 0 2px;
 }
 .files .list.list-view {
+  padding: 0;
+  
   .upload-Boundary {
     padding: 0;
     border: 0;
+    margin: 0;
   }
   .file {
-    padding: 3px 0;
+    padding: 10px 20px;
     margin: 0;
-    margin-bottom: 6px;
     width: 100%;
     
+    &:nth-child(even) {
+      background: #EFE8DC;
+    }
     .title {
       margin: 0;
       margin-left: 7px;
       margin-top: 2px;
       float: left;
-      font-size: 13px;
+      font-size: 14px;
       text-align: left;
       width: 30%;
       text-overflow: ellipsis;
@@ -505,12 +510,12 @@
     height: 23px;
   }
   .file > .overlay {
-    padding-top: 3px;
+    padding-top: 11px;
     margin-left: 20px;
-    padding-right: 20px;
     text-align: right;
     background-color: transparent;
     display: block;
+    width: 94%;
     
     a {
       color: #e93250;
@@ -526,8 +531,10 @@
   }
   .column {
     float: left;
-    width: 15%;
+    width: 13%;
+    font-size: 13px;
     display: block;
+    padding-top: 4px;
   }
 }
 .site-actions {

From 0cf25653e1bad26b46f49853bafcb76bb118412c Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasong@gmail.com>
Date: Tue, 19 May 2015 17:09:07 -0700
Subject: [PATCH 08/11] Added buttons for switching between list/icon view

---
 sass/_project-sass/_project-Main.scss | 20 ++++++++++++++++++++
 views/dashboard.erb                   |  4 ++++
 2 files changed, 24 insertions(+)

diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss
index 7e6fd1ee..f1f48ade 100644
--- a/sass/_project-sass/_project-Main.scss
+++ b/sass/_project-sass/_project-Main.scss
@@ -241,6 +241,26 @@
   .column, input[type='checkbox'] {
     display: none;
   }
+  
+  .btn-group {
+    float: left;
+    margin-right: 15px;
+    .btn {
+      padding-left: 11px;
+      padding-right: 11px;
+      padding-top: 7px;
+      padding-bottom: 7px;
+      margin-top: 1px;
+      margin-left: -3px;
+      background: #77ABB8;
+      @include box-shadow(0 0 5px rgba(0, 0, 0, 0.25));
+      
+      &:focus {
+          outline: 0;
+      }
+      
+    }
+  }
 }
 .files .header {
   background: #5E95A1;
diff --git a/views/dashboard.erb b/views/dashboard.erb
index 1b7fec51..062b6bc6 100644
--- a/views/dashboard.erb
+++ b/views/dashboard.erb
@@ -82,6 +82,10 @@
     </div>
   </div>
   <div class="header">
+    <div class="btn-group" role="group" aria-label="...">
+      <button type="button" class="btn btn-default" title="List View"><i class="fa fa-list"></i></button>
+      <button type="button" class="btn btn-default" title="Icon View"><i class="fa fa-th"></i></button>
+    </div>
     <div class="breadcrumbs">
       <% if params[:dir].nil? || params[:dir].empty? || params[:dir] == '/' %>
         Home

From 9bf33e192b783de2e7bf843c94656872415ee7e4 Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasong@gmail.com>
Date: Wed, 20 May 2015 16:16:30 -0700
Subject: [PATCH 09/11] Improvements to file list/icon view switcher, added
 select and hover styles

---
 sass/_project-sass/_project-Main.scss | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss
index f1f48ade..c0b625d9 100644
--- a/sass/_project-sass/_project-Main.scss
+++ b/sass/_project-sass/_project-Main.scss
@@ -245,20 +245,25 @@
   .btn-group {
     float: left;
     margin-right: 15px;
+    
+    >.btn+.btn {
+      margin-left: 0px;
+      border-left: 1px solid rgba(0, 0, 0, 0.1);
+    }
     .btn {
-      padding-left: 11px;
-      padding-right: 11px;
-      padding-top: 7px;
-      padding-bottom: 7px;
+      padding: 7px 11px;
       margin-top: 1px;
       margin-left: -3px;
       background: #77ABB8;
-      @include box-shadow(0 0 5px rgba(0, 0, 0, 0.25));
-      
-      &:focus {
-          outline: 0;
+      @include box-shadow(0 0 5px rgba(0, 0, 0, 0.2));
+
+      &:hover {
+        background: #83B3C0;
+      }
+      &:focus {
+        outline: 0;
+        background: #4F727B;
       }
-      
     }
   }
 }

From e4f24954386b7fd9cb17227db4ece9e657fc8b99 Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasong@gmail.com>
Date: Wed, 20 May 2015 16:38:15 -0700
Subject: [PATCH 10/11] Dashboard (list-view) mobile styles

---
 sass/_project-sass/_project-Main.scss | 28 ++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss
index c0b625d9..fcd54b3f 100644
--- a/sass/_project-sass/_project-Main.scss
+++ b/sass/_project-sass/_project-Main.scss
@@ -245,6 +245,7 @@
   .btn-group {
     float: left;
     margin-right: 15px;
+    margin-left: -3px;
     
     >.btn+.btn {
       margin-left: 0px;
@@ -253,14 +254,13 @@
     .btn {
       padding: 7px 11px;
       margin-top: 1px;
-      margin-left: -3px;
       background: #77ABB8;
       @include box-shadow(0 0 5px rgba(0, 0, 0, 0.2));
 
       &:hover {
         background: #83B3C0;
       }
-      &:focus {
+      &:focus, &.active {
         outline: 0;
         background: #4F727B;
       }
@@ -288,12 +288,22 @@
 }
 .files .actions {
   float: right;
+  
+  @media (max-device-width:480px), screen and (max-width:800px) {
+    float: left;
+    margin-top: 7px;
+    
+    .fa {
+      display: none;
+    }
+  }
 }
 .files .btn-Action {
   margin-left: 8px;
   
   @media (max-device-width:480px), screen and (max-width:800px) {
-    margin: 4px 8px 4px 0;
+    margin: 4px 3px 4px 0;
+    padding: 8px 17px;
   }
 }
 .files .list {
@@ -503,6 +513,10 @@
       text-align: left;
       width: 30%;
       text-overflow: ellipsis;
+      
+      @media (max-device-width:480px), screen and (max-width:800px) {
+        width: 33%;
+      }
     }
     input[type='checkbox'] {
       display: block;
@@ -550,6 +564,10 @@
     .link-overlay {
       width: 30%;
     }
+    
+    @media (max-device-width:480px), screen and (max-width:800px) {
+      width: 84%;
+    }
   }
   .html-thumbnail > .overlay {
     display: none;
@@ -560,6 +578,10 @@
     font-size: 13px;
     display: block;
     padding-top: 4px;
+    
+    @media (max-device-width:480px), screen and (max-width:800px) {
+      display: none;
+    }
   }
 }
 .site-actions {

From e138fc1dfe874067cd1d24683d7bf56f1860d209 Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasong@gmail.com>
Date: Wed, 20 May 2015 17:30:24 -0700
Subject: [PATCH 11/11] dashboard mobile tweak

---
 sass/_project-sass/_project-Main.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss
index fcd54b3f..402cc7c0 100644
--- a/sass/_project-sass/_project-Main.scss
+++ b/sass/_project-sass/_project-Main.scss
@@ -205,8 +205,8 @@
   float: left;
   
   @media (max-device-width: 480px), screen and (max-width: 800px) {
-    margin-left: 22px;
-    margin-top: 18px;
+    margin-left: 0px;
+    margin-top: 16px;
   }
 }
 .welcome {