From b1de6284506f4bbddbbe337bc8673b64747fd45d Mon Sep 17 00:00:00 2001 From: Scott O'Hara Date: Sun, 13 Apr 2014 20:29:02 -0400 Subject: [PATCH] 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.

    - +