From b1de6284506f4bbddbbe337bc8673b64747fd45d Mon Sep 17 00:00:00 2001 From: Scott O'Hara Date: Sun, 13 Apr 2014 20:29:02 -0400 Subject: [PATCH 1/3] new framework link, remove some useless code, whitespace killer Add new CSS framework to the tutorials page Remove some unused code from the neocities index file and default template index file Killed lots of white space in the files i touched... --- views/index.erb | 118 ++++++++++++++++++------------------- views/templates/index.slim | 24 ++++---- views/tutorials.erb | 27 +++++---- 3 files changed, 84 insertions(+), 85 deletions(-) diff --git a/views/index.erb b/views/index.erb index b074d942..398b3929 100644 --- a/views/index.erb +++ b/views/index.erb @@ -4,15 +4,15 @@ - + Neocities.org: Create a Free website today - + - + @@ -20,37 +20,33 @@ - + - + - - - + + - + - - - +
- +
- + <% if flash.keys.length > 0 %>

@@ -104,8 +100,8 @@

<% end %> - - + +
- +
- +
- +

Featured Websites

- +
- +
- + - +
- +
@@ -292,7 +288,7 @@

Support Us

- NeoCities is funded by donations. If you’d like to contribute, you can help us + NeoCities is funded by donations. If you’d like to contribute, you can help us pay our server costs using Bitcoin or PayPal.

Donate Today @@ -303,7 +299,7 @@

About Us

- NeoCities is here to bring back the creativity and + NeoCities is here to bring back the creativity and free expression to the world wide web that made it great.

More About Us @@ -329,7 +325,7 @@

Neocities.org is an open source company.

- +
- +
- + - + - - - + --> + diff --git a/views/templates/index.slim b/views/templates/index.slim index 7af0c079..309b88ec 100644 --- a/views/templates/index.slim +++ b/views/templates/index.slim @@ -1,31 +1,31 @@ doctype html html head - meta http-equiv="Content-Type" content="text/html; charset=UTF-8" - + meta charset=UTF-8" + title #{username} - + meta name="description" content="" meta name="keywords" content="" - - link href="//groundfloor.neocities.org/default.css" rel="stylesheet" type="text/css" media="all" - - - + body - + header h1 Welcome to my Website! nav ul li Home - + main p This is a new page! Coming soon. p This page uses Ground Floor to style the page, click here 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 - p Copyright 2013 \ No newline at end of file + p Copyright 2014 diff --git a/views/tutorials.erb b/views/tutorials.erb index 0c44a149..3e3bf0e7 100644 --- a/views/tutorials.erb +++ b/views/tutorials.erb @@ -3,19 +3,19 @@

Learn to Code!

- +

We are currently building out our library of tutorials.

- +

Until then, please check out the following links to get you started:

- +

HTML

- +

HTML is short for "HyperText Markup Language", and is the basic building block used to build all web sites.

- + - +

CSS

- +

CSS is short for "Cascading Style Sheets", which is the code used to set the style of your web pages. It is embedded in your HTML, and directs how your web site should look. If HTML was your house, CSS would be what allows you to decorate the way it looks.

- + - +

CSS Frameworks

CSS frameworks are pre-built CSS styles that make it easy to quickly build a nice looking web page, without having to "roll your own" set of styles. NeoCities itself uses one as the basis for our design (Brass Tacks). They are very useful, and definitely worth checking out once you have an understanding of how CSS works.

@@ -52,15 +52,18 @@ Pure
  • - Brass Tacks + Brass Tacks +
    • +
  • + Min
    • - +

    JavaScript

    JavaScript is the programming language that comes standard with all web browsers. You can embed JavaScript code into your HTML to allow you to program your web sites to do things. JavaScript was once a weak language with a lot of problems, but it is now a very fast and powerful language that is used for both web browsers and for complicated server backends (with Node.js). It is a great beginners language if you want to learn how to program, and can be used to perform almost any kind of program.

    - + From 212f1e54795052aba1451da5bfa446ae149014d7 Mon Sep 17 00:00:00 2001 From: Scott O'Hara Date: Sun, 13 Apr 2014 20:32:06 -0400 Subject: [PATCH 2/3] typo. more white space. typo on abut.erb more whitespace conversion. (sublime just does it automatically) --- views/about.erb | 84 ++++++++++++++++++++++++------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/views/about.erb b/views/about.erb index b74b83a7..16639f7f 100644 --- a/views/about.erb +++ b/views/about.erb @@ -1,28 +1,28 @@
    - +

    - Help me keep the creative,
    independent internet alive! + Help me keep the creative,
    independent Internet alive!

    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.

    - +

    - I am tired of living in an online world where people are isolated from each other in - boring, spied-on gated communities, and are given generic templates which define what people are - supposed to know about each other. It's time we took back our personalities from these sterilized, lifeless, + I am tired of living in an online world where people are isolated from each other in + boring, spied-on gated communities, and are given generic templates which define what people are + supposed to know about each other. It's time we took back our personalities from these sterilized, lifeless, monetized, monitored entities and let our creativity flourish again.

    - +

    - That's where NeoCities comes in. I want to provide a canvas for people to make any web site they want. - Whether it be a web site about something they're good at, something they love, something they hate, or + That's where NeoCities comes in. I want to provide a canvas for people to make any web site they want. + Whether it be a web site about something they're good at, something they love, something they hate, or their own custom "Profile" where they can introduce themselves in a way that actually matters to them.

    @@ -30,46 +30,46 @@ But I can't do it without your help.

    - The technology has become affordable enough where we can provide this creative space without requiring a business - plan that involves selling people out to the marketing industry. But it still costs money, especially since server + The technology has become affordable enough where we can provide this creative space without requiring a business + plan that involves selling people out to the marketing industry. But it still costs money, especially since server demand is so high right now. And there are some possible surprise costs I haven't figured out yet (bandwidth estimates are difficult). But if NeoCities can get enough donations, NeoCities can survive! Together, we can prevent what happened to GeoCities from happening again.

    - Our creativity is too important to be commercialized. Help keep this idea alive by donating! $100, $20, $5, a + Our creativity is too important to be commercialized. Help keep this idea alive by donating! $100, $20, $5, a free round of beers at your pub, speaking invites so we can spread the word, free server hosting, anything helps. Thank you!

    -
    -
    -

    Contributors:

    - -
    -
    - - kyle drake - -
    - Kyle Drake -
    -
    - - Victoria Wang - -
    - Victoria Wang -
    -
    - - Scott O'Hara - -
    - Scott O'Hara -
    -
    - -
    +
    +
    +

    Contributors:

    + +
    +
    + + kyle drake + +
    + Kyle Drake +
    +
    + + Victoria Wang + +
    + Victoria Wang +
    +
    + + Scott O'Hara + +
    + Scott O'Hara +
    +
    + +
    From f9d09284d677a6de5a4eee724aa46dcdcd8d9375 Mon Sep 17 00:00:00 2001 From: Scott O'Hara Date: Sun, 13 Apr 2014 20:47:50 -0400 Subject: [PATCH 3/3] CSS update for small screens fixes a padding-left issue where the file list was bumping up against the left edge of the browser window on small screen sizes. Also swapped out style="float: right" for the class "float-Right" on the right column menu icons. --- views/dashboard.slim | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/views/dashboard.slim b/views/dashboard.slim index fda2f06d..60521eda 100644 --- a/views/dashboard.slim +++ b/views/dashboard.slim @@ -18,19 +18,19 @@ javascript: .content-Base .row.content .col.col-60 - + h1 Your Website p These are the files on your site. index.html is the main page, it is the first page loaded when users visit your site. not_found.html is the page users see when they try to access a file on the site that's not there (it is also commonly referred to as the 404 page). - current_site.file_list.each do |file| hr style="margin: 12px 0px" .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" - if file.ext.match(/jpg|png|bmp|gif/) i class="icon-picture icon": span style="margin-left: 5px" #{file.filename} - else 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/) a href="/site_files/text_editor/#{file.filename}" : i class="icon-edit" style="margin-right: 10px" title="Edit" - else @@ -46,7 +46,7 @@ javascript: .col.col-40 - + div.txt-Center.dash-SS a href="http://#{current_site.username}.neocities.org" style="display:block" target="_blank": img src="/site_screenshots/#{current_site.username}.jpg" alt="screen shot" br @@ -55,22 +55,22 @@ javascript: p: small | (access statistics updated hourly) - + .progress.progress-info.progress-striped .bar style="width: #{(current_site.total_space / Site::MAX_SPACE.to_f) * 100}%" h4.base.txt-Center p Using #{((current_site.total_space.to_f / Site::MAX_SPACE) * 100).round(1)}% (#{current_site.total_space_in_megabytes}MB) of your #{(Site::MAX_SPACE.to_f / 2**20).to_i}MB of free space. - + div.txt-Center a href="/site_files/upload" class="btn-Action" style="margin-bottom:10px" Upload New Files br a href="/site_files/new_page" class="btn-Action" style="margin-bottom:10px" Create New HTML Page br a href="/site_files/#{current_site.username}.zip" class="btn-Action" Download Entire Site - + hr - + div    Need to learn web design? br @@ -83,7 +83,7 @@ javascript: form method="POST" action="/site_files/delete" id="deleteFilenameForm" input name="csrf_token" type="hidden" value="#{csrf_token}" input type="hidden" id="deleteFilenameInput" name="filename" - + .modal.hide.fade id="deleteConfirmModal" tabindex="-1" role="dialog" aria-labelledby="deleteConfirmModalLabel" aria-hidden="true" .modal-header button.close type="button" data-dismiss="modal" aria-hidden="true" x