Merge branch 'master' of github.com:neocities/neocities

This commit is contained in:
Kyle Drake 2014-04-13 21:03:25 -07:00
commit 21fe0d524b
5 changed files with 135 additions and 136 deletions

View file

@ -8,7 +8,7 @@
<article> <article>
<h2 class="txt-Center"> <h2 class="txt-Center">
Help me keep the creative,<br />independent internet alive! Help me keep the creative,<br />independent Internet alive!
</h2> </h2>
<hr /> <hr />
<h3>My goal with NeoCities is to help bring back the creativity and free expression to the world wide web that made it great. I need your help.</h3> <h3>My goal with NeoCities is to help bring back the creativity and free expression to the world wide web that made it great. I need your help.</h3>
@ -42,34 +42,34 @@
free round of beers at your pub, speaking invites so we can spread the word, free server hosting, anything helps. Thank you! free round of beers at your pub, speaking invites so we can spread the word, free server hosting, anything helps. Thank you!
</p> </p>
</article> </article>
<hr /> <hr />
<section> <section>
<h3 class="beta">Contributors:</h3> <h3 class="beta">Contributors:</h3>
<div class="row txt-Center"> <div class="row txt-Center">
<div class="col col-33"> <div class="col col-33">
<a href="http://t.co/vmyU09oYC7" title="Visit Kyle's Website"> <a href="http://t.co/vmyU09oYC7" title="Visit Kyle's Website">
<img src="https://0.gravatar.com/avatar/62a43048a3c2c688654274abdc0ecb9c?d=https%3A%2F%2Fidenticons.github.com%2Ffde07ba82b25f95afa9d080819f95717.png&amp;r=x&amp;s=440" alt="kyle drake" class="pic-Rounded" /> <img src="https://0.gravatar.com/avatar/62a43048a3c2c688654274abdc0ecb9c?d=https%3A%2F%2Fidenticons.github.com%2Ffde07ba82b25f95afa9d080819f95717.png&amp;r=x&amp;s=440" alt="kyle drake" class="pic-Rounded" />
</a> </a>
<br /> <br />
<a href="https://twitter.com/kyledrake" title="Follow me on Twitter" class="eps">Kyle Drake</a> <a href="https://twitter.com/kyledrake" title="Follow me on Twitter" class="eps">Kyle Drake</a>
</div> </div>
<div class="col col-33"> <div class="col col-33">
<a href="http://t.co/e1x1XoD2qi" title="Visit Victoria's Website"> <a href="http://t.co/e1x1XoD2qi" title="Visit Victoria's Website">
<img src="https://1.gravatar.com/avatar/2b577f8b3e5ab79bc927ed5185c0eae0?d=https%3A%2F%2Fidenticons.github.com%2Fe03006819f4a835afa237716f6701c95.png&amp;r=x&amp;s=440" alt="Victoria Wang" class="pic-Rounded" /> <img src="https://1.gravatar.com/avatar/2b577f8b3e5ab79bc927ed5185c0eae0?d=https%3A%2F%2Fidenticons.github.com%2Fe03006819f4a835afa237716f6701c95.png&amp;r=x&amp;s=440" alt="Victoria Wang" class="pic-Rounded" />
</a> </a>
<br /> <br />
<a href="https://twitter.com/violasong" title="Follow me on Twitter" class="eps">Victoria Wang</a> <a href="https://twitter.com/violasong" title="Follow me on Twitter" class="eps">Victoria Wang</a>
</div> </div>
<div class="col col-33"> <div class="col col-33">
<a href="http://scottohara.me/" title="Visit Scott's Website"> <a href="http://scottohara.me/" title="Visit Scott's Website">
<img src="https://0.gravatar.com/avatar/6ade16e6184b3efb573ee91255ff7abe?d=https%3A%2F%2Fidenticons.github.com%2Fa6362986538cdcb93a8b04f6c3f66b5e.png&amp;r=x&amp;s=440" alt="Scott O'Hara" class="pic-Rounded" /> <img src="https://0.gravatar.com/avatar/6ade16e6184b3efb573ee91255ff7abe?d=https%3A%2F%2Fidenticons.github.com%2Fa6362986538cdcb93a8b04f6c3f66b5e.png&amp;r=x&amp;s=440" alt="Scott O'Hara" class="pic-Rounded" />
</a> </a>
<br /> <br />
<a href="https://twitter.com/scottohara" title="Follow me on Twitter" class="eps">Scott O'Hara</a> <a href="https://twitter.com/scottohara" title="Follow me on Twitter" class="eps">Scott O'Hara</a>
</div> </div>
</div> </div>
</section> </section>
</div> <!-- end .content --> </div> <!-- end .content -->

View file

@ -24,13 +24,13 @@ javascript:
- current_site.file_list.each do |file| - current_site.file_list.each do |file|
hr style="margin: 12px 0px" hr style="margin: 12px 0px"
.row style="margin-bottom: 0px" id="files" .row style="margin-bottom: 0px" id="files"
.col .col style="padding-left: 20px;"
a href="http://#{current_site.username}.neocities.org/#{file.filename}" title="View #{file.filename}" target="_blank" a href="http://#{current_site.username}.neocities.org/#{file.filename}" title="View #{file.filename}" target="_blank"
- if file.ext.match(/jpg|png|bmp|gif/) - if file.ext.match(/jpg|png|bmp|gif/)
i class="icon-picture icon": span style="margin-left: 5px" #{file.filename} i class="icon-picture icon": span style="margin-left: 5px" #{file.filename}
- else - else
i class="icon-file-alt icon": span style="margin-left: 10px;" #{file.filename} i class="icon-file-alt icon": span style="margin-left: 10px;" #{file.filename}
span style="float: right" span class="float-Right"
- if file.ext.match(/html|htm|txt|js|css|md/) - if file.ext.match(/html|htm|txt|js|css|md/)
a href="/site_files/text_editor/#{file.filename}" : i class="icon-edit" style="margin-right: 10px" title="Edit" a href="/site_files/text_editor/#{file.filename}" : i class="icon-edit" style="margin-right: 10px" title="Edit"
- else - else

View file

@ -29,10 +29,6 @@
<link rel="apple-touch-icon-precomposed" href="#apple-icon-144.png" /> <link rel="apple-touch-icon-precomposed" href="#apple-icon-144.png" />
<link rel="apple-touch-startup-image" href="#startup.png" /> <link rel="apple-touch-startup-image" href="#startup.png" />
<!-- Tile icon for Win8 (144x144 + tile color) __doesn't validate__
<meta name="msapplication-TileImage" content="#apple-icon-144.png" />
<meta name="msapplication-TileColor" content="#222222" />
-->
<!-- Mobile Meta --> <!-- Mobile Meta -->
<meta name="HandheldFriendly" content="True" /> <meta name="HandheldFriendly" content="True" />

View file

@ -1,14 +1,14 @@
doctype html doctype html
html html
head head
meta http-equiv="Content-Type" content="text/html; charset=UTF-8" meta charset=UTF-8"
title #{username} title #{username}
meta name="description" content="" meta name="description" content=""
meta name="keywords" content="" meta name="keywords" content=""
link href="//groundfloor.neocities.org/default.css" rel="stylesheet" type="text/css" media="all" link href="//groundfloor.neocities.org/default.css" rel="stylesheet" media="all"
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script> <script src="//html5shiv.googlecode.com/svn/trunk/html5.js" type="text/javascript"></script>
@ -28,4 +28,4 @@ html
p This page uses <strong>Ground Floor</strong> to style the page, <a href="//groundfloor.neocities.org" target="_blank">click here</a> to see some code examples. You can opt-out of this style and make your own design by removing the "default.css" link in the HTML. p This page uses <strong>Ground Floor</strong> to style the page, <a href="//groundfloor.neocities.org" target="_blank">click here</a> to see some code examples. You can opt-out of this style and make your own design by removing the "default.css" link in the HTML.
footer footer
p Copyright 2013 p Copyright 2014

View file

@ -52,7 +52,10 @@
<a href="http://purecss.io/" title="Yahoo!'s Pure CSS" target="_blank">Pure</a> <a href="http://purecss.io/" title="Yahoo!'s Pure CSS" target="_blank">Pure</a>
</li> </li>
<li> <li>
<a href="https://github.com/bleachedgraphics/Brass-Tacks" title="Brass Tacks (currently in Alpha. More updates to come)" target="_blank">Brass Tacks</a> <a href="https://github.com/scottaohara/Brass-Tacks" title="Brass Tacks Sass Framework" target="_blank">Brass Tacks</a>
</li>
<li>
<a href="https://github.com/owenversteeg/min" title="Min: the world's smallest (995 bytes) CSS framework" target="_blank">Min</a>
</li> </li>
</ul> </ul>