From 230a6b4b0d6ae01eced0bf9f5a2fde2d2d5bb7ac Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasongoo@gmail.com>
Date: Fri, 24 Oct 2014 19:32:21 -0700
Subject: [PATCH 1/4] Dashboard - tweaks to edit/delete links

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

diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss
index bf139578..21b99294 100644
--- a/sass/_project-sass/_project-Main.scss
+++ b/sass/_project-sass/_project-Main.scss
@@ -311,8 +311,8 @@
   display: block;
   margin-left: 5px;
 }
-.overlay i {
-  font-weight: bold;
+.overlay .fa-trash {
+  vertical-align: 1px;
 }
 .overlay {
   position:absolute;
diff --git a/views/dashboard.erb b/views/dashboard.erb
index 0189274d..e38abc05 100644
--- a/views/dashboard.erb
+++ b/views/dashboard.erb
@@ -143,13 +143,13 @@
             </a>
             <div class="overlay">
               <% if file[:is_editable] %>
-                <a href="/site_files/text_editor<%= file[:path] %>"><i class="fa fa-edit" title="Edit"> Edit</i></a>
+                <a href="/site_files/text_editor<%= file[:path] %>"><i class="fa fa-edit" title="Edit"></i> Edit</a>
               <% end %>
               <% if file[:is_directory] %>
-                <a href="?dir=<%= Rack::Utils.escape file[:path] %>"><i class="fa fa-edit" title="Manage"> Manage</i></a>
+                <a href="?dir=<%= Rack::Utils.escape file[:path] %>"><i class="fa fa-edit" title="Manage"></i> Manage</a>
               <% end %>
               <% if !file[:is_root_index] %>
-                <a href="#" onclick="confirmFileDelete('<%= file[:path] %>')"><i class="fa fa-trash" title="Delete"> Delete</i></a>
+                <a href="#" onclick="confirmFileDelete('<%= file[:path] %>')"><i class="fa fa-trash" title="Delete"></i> Delete</a>
               <% end %>
               <a class="link-overlay" href="http://<%= current_site.username %>.neocities.org<%= file[:path] %>" title="View <%= file[:path] %>" target="_blank"></a>
             </div>

From 51bc2b3fae4cd6af2b97983f29d27eaca5ff4212 Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasongoo@gmail.com>
Date: Fri, 24 Oct 2014 19:47:16 -0700
Subject: [PATCH 2/4] Changed dashboard breadcrumb separator to angle icon

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

diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss
index 21b99294..368a72e5 100644
--- a/sass/_project-sass/_project-Main.scss
+++ b/sass/_project-sass/_project-Main.scss
@@ -160,6 +160,13 @@
   float: left;
   font-weight:bold;
   margin-top: 4px;
+  a {
+    color: white;
+  }
+  .fa-angle-right {
+    font-size: 1.3em;
+    margin: 0 .2em 0 .2em;
+  }
 }
 .files .actions {
   float: right;
@@ -292,7 +299,7 @@
   display: block;
   padding-top: 35px;
   font-size: 14px;
-  color: #bbb;
+  color: #C0C0C0;
   font-weight: bold;
   margin-left: auto;
   margin-right: auto;
diff --git a/views/dashboard.erb b/views/dashboard.erb
index e38abc05..22692608 100644
--- a/views/dashboard.erb
+++ b/views/dashboard.erb
@@ -92,7 +92,7 @@
         <% dir_array = @dir.split '/' %>
         <% dir_array.each_with_index do |dir,i| %>
           <% if i+1 < dir_array.length %>
-            <a href="/dashboard?dir=<%= Rack::Utils.escape dir %>"><%= dir %></a> / 
+            <a href="/dashboard?dir=<%= Rack::Utils.escape dir %>"><%= dir %></a> <i class="fa fa-angle-right"></i> 
           <% else %>
             <%= dir %>
           <% end %>

From 6ff82a699e44d5c46bcff3ac5117ce6fff19803b Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasongoo@gmail.com>
Date: Fri, 24 Oct 2014 19:53:36 -0700
Subject: [PATCH 3/4] Clicking on folder name in dashboard now brings you to
 manage folder view

---
 views/dashboard.erb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/views/dashboard.erb b/views/dashboard.erb
index 22692608..a51d8c8b 100644
--- a/views/dashboard.erb
+++ b/views/dashboard.erb
@@ -151,7 +151,11 @@
               <% if !file[:is_root_index] %>
                 <a href="#" onclick="confirmFileDelete('<%= file[:path] %>')"><i class="fa fa-trash" title="Delete"></i> Delete</a>
               <% end %>
+              <% if file[:is_directory] %>
+              <a class="link-overlay" href="?dir=<%= Rack::Utils.escape file[:path] %>" title="View <%= file[:path] %>"></a>
+              <% else %>
               <a class="link-overlay" href="http://<%= current_site.username %>.neocities.org<%= file[:path] %>" title="View <%= file[:path] %>" target="_blank"></a>
+              <% end %>
             </div>
           </div>
         <% end %>

From 7565a300e1b9e1c0b0a051557fa6367ccc1db5c1 Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasongoo@gmail.com>
Date: Sat, 25 Oct 2014 23:15:11 -0700
Subject: [PATCH 4/4] Restored light tan color to sidebars, header tweaks

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

diff --git a/sass/_project-sass/_project-Main.scss b/sass/_project-sass/_project-Main.scss
index 0193b42e..29697590 100644
--- a/sass/_project-sass/_project-Main.scss
+++ b/sass/_project-sass/_project-Main.scss
@@ -55,16 +55,18 @@
   padding-right: 6%;
 }
 .content.misc-page {
-  background: #FFFFFF;
+  background: #FAF6F1;
   -moz-box-shadow: 0px 1px 1px 1px rgba(0,0,0,0.10);
   -webkit-box-shadow: 0px 1px 1px 1px rgba(0,0,0,0.10);
   box-shadow: 0px 1px 1px 1px rgba(0,0,0,0.10);
-  padding: 1px 3% 40px 3%; 
+  padding: 1px 3% 40px 3%;
+  
+  h1, h2, h3, h4, h5, h6 {
+    margin-top: 1em;
+  }
 }
-.content.misc-page {
-    h3, h4, h5, h6 {
-      margin-top: 1em;
-    }
+.content.single-Col.misc-page {
+  background: #FFFFFF;
 }
 .content.misc-page h2 {
   font-size: 1.6em;
@@ -77,7 +79,7 @@
   font-size: 1em;
 }
 .content.misc-page h1 {
-  font-size: 2.2em;
+  font-size: 2em;
   margin-bottom: 20px;
 }
 .content.misc-page hr {