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

This commit is contained in:
Kyle Drake 2015-10-15 16:37:53 -07:00
commit 9ee34e5a5b
5 changed files with 23 additions and 3 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 76 KiB

View file

@ -13,6 +13,8 @@
background-color: #1D1F21; background-color: #1D1F21;
color: white; color: white;
font: 16px/normal 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace; font: 16px/normal 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace;
margin-bottom: 0;
border: 0;
} }
h3 { h3 {
margin-top: 10px; margin-top: 10px;
@ -25,6 +27,12 @@
.btn { .btn {
float: right; float: right;
} }
.error {
background: #93771b;
color: #fff;
padding: 5px 10px;
font-size: 14px;
}
} }
.lesson { .lesson {
h1, .subtitle { h1, .subtitle {

View file

@ -1,4 +1,4 @@
<div class="comic" style="height: 967px; background-image: url(/img/tutorial/ch1pg1.png);"> <div class="comic" style="height: 967px; background-image: url(/img/tutorial/ch1pg1.png); background-size: 839px;">
<div class="dialogue" style="left: 270px; top:374px;"> <div class="dialogue" style="left: 270px; top:374px;">
Oh, a new student! Oh, a new student!
</div> </div>
@ -17,6 +17,17 @@
</div> </div>
</div> </div>
<div class="comic" style="height: 300px; background-image: url(/img/tutorial/ch1pg1_2.png);background-size: 839px;">
<div class="dialogue" style="left: 200px; top:30px;">
Welcome, [NAME]! You're about to embark on a very exciting challenge: creating your first website!
</div>
<div class="dialogue" style="left: 640px; top:20px;">
You've already made the first important step of starting this lesson, so here's a badge for your profile.
</div>
</div>
<a href="./2">Next >></a>
<script> <script>
$('#checkButton').on('click', function(button) { $('#checkButton').on('click', function(button) {
checkHomework($('#nameInput').val()) checkHomework($('#nameInput').val())

View file

@ -9,8 +9,6 @@
<p>You'll see the results here.</p> <p>You'll see the results here.</p>
<p>Make sure to check the green boxes below for important bonus info!</p> <p>Make sure to check the green boxes below for important bonus info!</p>
</div> </div>
<div class="dialogue">
</div>
</div> </div>
<div class="welcome"> <div class="welcome">

View file

@ -27,6 +27,9 @@
</body> </body>
</html> </html>
</textarea> </textarea>
<div class="error">
<i class="fa fa-exclamation-triangle"></i> Try again: make sure you change Hello World to something else.
</div>
<h3>Site Preview</h3> <h3>Site Preview</h3>
<iframe class="preview" style="background: white"></iframe> <iframe class="preview" style="background: white"></iframe>