Merge violasong

sass/_project-sass/_project-Header.scss

@@ -389,7 +389,7 @@
 
 .hp .logo{
   padding-top:45px;
-  
+  img { width: 300px; }
    @media (max-device-width:480px), screen and (max-width:800px){
     padding-left:20px;
     padding-right:20px;
@@ -442,12 +442,12 @@
   left:0;
   position:absolute;
   top:0;
-  width:70px;
+  width:73px;
   z-index:9;
 }
 
 .interior .header-Nav{
-  padding-left:70px;
+  padding-left:74px;
   @media (max-device-width:480px), screen and (max-width:800px){
     width:100%;
   }  

sass/_project-sass/_project-Main.scss

@@ -308,9 +308,9 @@
   margin-right: auto;
 }
 .folder-icon {
-  background: url(/img/folder.png) no-repeat 0px 0px;
+  background: url(/img/folder.png) 6px 3px no-repeat;
-  width: 95px;
+  background-size: 95px;
-  height: 65px;
+  height: 69px;
   display: block;
   padding-top: 35px;
 }
@@ -1389,16 +1389,25 @@ a.tag:hover {
   padding: 25px 40px 40px 40px;
 }
 .brand-asset {
-  margin-bottom: 3em;
+  margin-bottom: 2.7em;
   p {
     margin-top: 10px;
   }
 }
-.columns.press {
+.columns.press .col-66 {
   h3 {
     margin-bottom: 0;
     line-height: 150%;
     margin-bottom: 10px;
     margin-top: 1.5em;
   }
+  blockquote {
+    quotes: none;
+    margin: 0 1.5em;
+    font-style: italic;
+    font-size: .85em;
+  }
+  blockquote:before, blockquote:after {
+    content: none;
+  }
 }

views/_footer.erb

@@ -11,6 +11,7 @@
           <li><a href="/about" title="About Neocities">About</a></li>
           <li><a href="/blog" title="Neocities Blog">Blog</a></li>
           <li><a href="/api" title="Neocities API">API</a></li>
+          <li><a href="/press" title="Neocities Press">Press</a></li>
           <li><a href="/terms" title="Neocities Terms of Use" rel="nofollow">Terms</a></li>
           <li><a href="/privacy" title="Neocities Privacy Policy" rel="nofollow">Privacy</a></li>
           <li><a href="/contact" title="Contact Us" rel="nofollow">Contact</a></li>

views/_header.erb

@@ -10,15 +10,15 @@
       <li>
         <a href="/browse" title="Browse Neocities member websites">Websites</a>
       </li>
+      <li>
+        <a href="/about" title="About Neocities">About</a>
+      </li>
       <li>
         <a href="/tutorials" title="Learn to code with these tutorials">Tutorials</a>
       </li>
       <li>
         <a href="/api" title="Neocities Developers API">API</a>
       </li>
-      <li>
-        <a href="/about" title="About Neocities">About</a>
-      </li>
       <li>
         <a href="/plan" title="Support Neocities">Support Us</a>
       </li>
@@ -27,7 +27,7 @@
     <ul class="status-Nav">
       <% if !signed_in? %>
         <li>
-          <a href="/new" class="create-New" title="Create a new website">New Site</a>
+          <a href="/#new" class="create-New" title="Sign up for free">Sign up for Free</a>
         </li>
         <li>
           <a href="/signin" class="sign-In" title="Sign into your account">Sign In</a>

views/about.erb

@@ -32,7 +32,7 @@
       Long Live the Web!
     </p>
     <p>
-      What are you waiting for? <strong><a href="/new">Go make your web site!</a></strong>
+      What are you waiting for? <strong><a href="/#new">Go make your web site!</a></strong>
     </p>
     <h1>Neocities is:</h1>
     <ul>

views/dashboard.erb

@@ -102,7 +102,7 @@
     <div class="actions">
       <a href="/site_files/new_page?dir=<%= Rack::Utils.escape @dir %>" class="btn-Action"><i class="fa fa-file"></i> New Page</a>
       <a href="#createDir" class="btn-Action" data-toggle="modal"><i class="fa fa-folder"></i> New Folder</a>
-      <a href="#" class="btn-Action" onclick="clickUploadFiles(); return false"><i class="fa fa-upload"></i> Upload</a>
+      <a href="#" class="btn-Action" onclick="clickUploadFiles(); return false"><i class="fa fa-arrow-circle-up"></i> Upload</a>
     </div>
   </div>
   <div class="list">

views/donate.erb

@@ -38,7 +38,7 @@
         
         <h3>Flattr</h3>
         <script id='flattrbtn'>(function(i){var f,s=document.getElementById(i);f=document.createElement('iframe');f.src='//api.flattr.com/button/view/?uid=kyledrake&url='+encodeURIComponent(document.URL);f.title='Flattr';f.height=100;f.width=100;f.style.borderWidth=0;s.parentNode.insertBefore(f,s);})('flattrbtn');</script>
-        <h4 style="margin-top: 30px; margin-bottom: 30px">Thanks. You are great! <a href="/new">Now go and make an awesome web site!</a></h4>
+        <h4 style="margin-top: 30px; margin-bottom: 30px">Thanks. You are great! <a href="/#new">Now go and make an awesome web site!</a></h4>
       </section>
   </article>
 </div> <!-- end .content -->

views/index.erb

@@ -55,15 +55,15 @@
               <li>
                 <a href="/browse" title="Browse Neocities member websites">Websites</a>
               </li>
+              <li>
+                <a href="/about" title="About Neocities">About</a>
+              </li>
               <li>
                 <a href="/tutorials" title="Learn to code with these tutorials">Tutorials</a>
               </li>
               <li>
                 <a href="/api" title="Neocities Developers API">API</a>
               </li>
-              <li>
-                <a href="/about" title="About Neocities">About</a>
-              </li>
               <li>
                 <a href="/plan" title="Support Neocities">Support Us</a>
               </li>
@@ -316,7 +316,7 @@
           <h3>
             "Designed as a 21st century reincarnation of GeoCities, Neocities lets you make your own site for free. <strong>And it just might spark a renaissance of creativity online.</strong>"
             <br />
-            —Matthew Guay, <a href="http://web.appstorm.net/reviews/web-dev/neocities-the-free-place-to-code-your-own-site-from-scratch" target="_blank">AppStorm</a>
+            —Matthew Guay, <a href="http://web.appstorm.net/reviews/web-dev/neocities-the-free-place-to-code-your-own-site-from-scratch" target="_blank">AppStorm</a>. <a href="/press">View All Press »</a>
           </h3>
       </div>
     </div>

views/press.erb

@@ -11,34 +11,38 @@
 <div class="container">
   <div class="content misc-page columns right-col press">
     <div class="col-left">
-      <div class="col col-66" style="min-height: 30em;">
+      <div class="col col-66" style="min-height: 43em;">
         <h2>Latest News</h2>
         <div class="press-news">
           <h3><a href="http://www.fastcodesign.com/3037028/why-the-internet-is-time-traveling-back-to-1994"><strong>Fast Company</strong>: Oh, Snap! '90s Web Design Is Hot Again</a></h3>
-          <p>“What I'm trying to do with Neocities is re-enable that creativity, and show people that it isn’t just a nostalgia thing any more,” [Kyle Drake] says, adding that the site now hosts about 26,000 sites and has proven financially self-sustaining. “This is something you can really do.”</p>
+          <blockquote>“What I'm trying to do with Neocities is re-enable that creativity, and show people that it isn’t just a nostalgia thing any more,” [Kyle Drake] says, adding that the site now hosts about 26,000 sites and has proven financially self-sustaining.</blockquote>
           
           <h3><a href="http://www.wired.com/2013/07/neocities/"><strong>Wired</strong>: NeoCities Wants to Save Us From the Crushing Boredom of Social Networking</a></h3>
-          <p>“…[T]here needs to be an alternative to the current pre-formatted, template-driven, standardizing platforms, which make it easy to have a web presence, but hard to make that presence your own.”</p>
+          <blockquote>There needs to be an alternative to the current pre-formatted, template-driven, standardizing platforms, which make it easy to have a web presence, but hard to make that presence your own.</blockquote>
         
           <h3><a href="http://motherboard.vice.com/blog/neocities-is-recreating-the-garish-web-10-creativity-of-geocities"><strong>Vice</strong>: NeoCities Is Recreating the Garish, Web 1.0 Creativity of Geocities</a></h3>
-          <p>“…[T]he project is a way to recreate not only the aesthetic of the early personal websites, but also the original mission of Geocities: to give anyone with internet access a free place on the web.”</p>
+          <blockquote>The project is a way to recreate not only the aesthetic of the early personal websites, but also the original mission of Geocities: to give anyone with internet access a free place on the web.</blockquote>
           <h3><a href="http://arstechnica.com/tech-policy/2014/05/web-host-gives-fcc-a-28-8kbps-slow-lane-in-net-neutrality-protest/"><strong>Ars Technica</strong>: Web host gives FCC a 28.8Kbps slow lane in net neutrality protest</a></h3>
-          <p>“Lots of people are angry about FCC Chairman Tom Wheeler's Internet "fast lane" proposal that would let Internet service providers charge Web services for priority access to consumers. But one Web hosting service called NeoCities isn't just writing letters to the FCC. Instead, the company found the FCC's internal IP address range and throttled all connections to 28.8Kbps speeds.”</p>
+          <blockquote>Lots of people are angry about FCC Chairman Tom Wheeler's Internet "fast lane" proposal that would let Internet service providers charge Web services for priority access to consumers. But one Web hosting service called NeoCities isn't just writing letters to the FCC. Instead, the company found the FCC's internal IP address range and throttled all connections to 28.8Kbps speeds.</blockquote>
         </div>
       </div>
 
       <div class="col col-33">
-        <h2>Contact Us</h2>
+        <h2 style="margin-bottom: 9px;">Contact Us</h2>
-        <p><a href="mailto:press@neocities.org">press@neocities.org</a></p>
+        <p><a href="mailto:press@neocities.org"><i class="fa fa-envelope-o"></i> press@neocities.org</a></p>
         
         <h2>Brand Assets</h2>
-        <div class="brand-asset">
+        <div class="brand-asset" style="margin-bottom: 2.3em;">
           <a href="/img/neocitieslogo.svg" download="neocitieslogo.svg"><img src="/img/neocitieslogo.svg" style="width:100px; margin: -10px 0;"></a>
-          <p><a href="/img/neocitieslogo.svg" download="neocitieslogo.svg"><i class="fa fa-download"></i> Download SVG</a></p>
+          <p><a href="/img/neocitieslogo.svg" download="neocitieslogo.svg"><i class="fa fa-arrow-circle-down"></i> Download SVG</a></p>
+        </div>
+        <div class="brand-asset">
+          <a href="/img/neocitieslogotext.svg" download="neocitieslogotext.svg"><img src="/img/neocitieslogotext.svg" style="width:180px;"></a>
+          <p><a href="/img/neocitieslogotext.svg" download="neocitieslogotext.svg"><i class="fa fa-arrow-circle-down"></i> Download SVG</a></p>
         </div>
         <div class="brand-asset">
           <a href="/img/neocitiesbadge.svg" download="neocitiesbadge.svg"><img src="/img/neocitiesbadge.svg"></a>
-          <p><a href="/img/neocitiesbadge.svg" download="neocitiesbadge.svg"><i class="fa fa-download"></i> Download SVG</a></p>
+          <p><a href="/img/neocitiesbadge.svg" download="neocitiesbadge.svg"><i class="fa fa-arrow-circle-down"></i> Download SVG</a></p>
         </div>
       </div>
     </div>

views/signin.erb

@@ -31,7 +31,7 @@
 
   <hr>
   <p>
-    <a href="/new" title="Sign me up!">I don't have an account yet.</a>
+    <a href="/#new" title="Sign me up!">I don't have an account yet.</a>
   </p>
   <p>
     <a href="/password_reset" title="What did I huh?">I forgot my password.</a>

views/surf.erb

@@ -25,9 +25,10 @@
       overflow: hidden;
     }
     #logo {
-      background: url(/img/topbar-cat.png) no-repeat 1px -1px;
+      background: url(/img/topbar-cat.png) no-repeat 1px 0px;
       width: 30px;
-      height: 29px;
+      height: 26px;
+      background-size: 29px;
       position: absolute;
       display: block;
     }