zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-25 01:32:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Kyle Drake 2016-04-15 15:35:08 -07:00
commit 0fe8b47b61
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Gemfile.lock
View file

@ -297,6 +297,3 @@ DEPENDENCIES
webmock webmock
will_paginate will_paginate
zipruby zipruby
BUNDLED WITH
1.11.2

12
views/tutorial/html/10.erb
View file

@ -1,12 +1,20 @@
<div class="comic" style="height: 900px; background-image: url(/img/tutorial/ch1pg10.png); background-size: 800px;"> <div class="comic" style="height: 900px; background-image: url(/img/tutorial/ch1pg10.png); background-size: 800px;">
<div class="dialogue"> <div class="dialogue" style="top: 35px">
And that's it for Chapter One! Here's a new badge for your first ever version of victoria.neocities.org! And that's it for Chapter One! Congrats on your first ever version of victoria.neocities.org!
</div> </div>
<div class="dialogue" style="top: 60px;left:580px; width:180px;"> <div class="dialogue" style="top: 60px;left:580px; width:180px;">
But you're not done yet! There's much in store for you: Adding colors, fonts, backgrounds, and more, all in chapter 2! But you're not done yet! There's much in store for you: Adding colors, fonts, backgrounds, and more, all in chapter 2!
</div> </div>
</div> </div>
<div class="welcome">
<h4>Thank you!</h4>
<p>Thanks for trying out Chapter One of the Neocities tutorial! This is a work in progress—<a href="/contact">let us know</a> if you have any questions or suggestions.</p>
<p>To continue working on your site, head to the <a href="/dashboard">dashboard</a>!</p>
<p>You can also keep up with cool sites on Neocities via your <a href="/">news feed</a>!</p>
</div>
<script> <script>
function checkHomework(editor) { function checkHomework(editor) {
alert('check homework here') alert('check homework here')

6
views/tutorial/html/2.erb
View file

@ -1,6 +1,6 @@
<div class="comic" style="height: 608px; width:320px; background-image: url(/img/tutorial/ch1pg2.png); background-size: 320px; float: left;"> <div class="comic" style="height: 608px; width:320px; background-image: url(/img/tutorial/ch1pg2.png); background-size: 320px; float: left;">
<div class="dialogue" style="left: 25px; top: 40px; width: 250px"> <div class="dialogue" style="left: 25px; top: 40px; width: 250px">
<p>All you need to build your first site is a computer language called HTML.</p><p>HTML is made of tags - there's usually an opening tag and a closing tag, with content in between them.</p> <p>All you need to build your first site is a computer language called <strong>HTML</strong>.</p><p>HTML is made of tags - there's usually an opening tag and a closing tag, with content between them.</p>
</div> </div>
</div> </div>
<div class="comic" style="width: 289px; <div class="comic" style="width: 289px;
@ -8,7 +8,7 @@
background-image: url(/img/tutorial/ch1pg2_2.png); background-image: url(/img/tutorial/ch1pg2_2.png);
background-size: 289px; background-size: 289px;
position: absolute; position: absolute;
right: -47px; right: -46px;
top: 0; top: 0;
z-index: 1000;"> z-index: 1000;">
<div class="dialogue" style="left: -40px; top: 40px; width: 250px"> <div class="dialogue" style="left: -40px; top: 40px; width: 250px">
@ -25,7 +25,7 @@
<p>HTML stands for <strong>H</strong>yper<strong>T</strong>ext <strong>M</strong>arkup <strong>L</strong>anguage. <p>HTML stands for <strong>H</strong>yper<strong>T</strong>ext <strong>M</strong>arkup <strong>L</strong>anguage.
Hypertext refers to text that has links, and markup refers to the tags.</p> Hypertext refers to text that has links, and markup refers to the tags.</p>
<p>Don't worry if anything seems confusing - you'll get the hang of it once you try coding! If you ever get stuck, click the <strong>Help</strong> link below.</p> <p>Don't worry if anything seems confusing - you'll get the hang of it soon! <!-- If you ever get stuck, click the Help link below. --></p>
</div> </div>
<script> <script>