Skip to content
Permalink
Browse files
added standard upstream note
  • Loading branch information
aa7401 committed Sep 12, 2019
1 parent c33b19b commit 7693186
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 33 deletions.
@@ -1,27 +1,7 @@

# Learning HTML5

The worksheet is based on the materials from the HTML lecture and you should refer to the [slide deck](https://drive.google.com/open?id=1-kA3w6-H7AkW5iWRG2D1O-soxAnHgnU0YgOH3eYfeAQ) to help your understanding. It will take approximately **15 hours** to work through all the exercises and you should ensure that you have completed them all before attempting subsequent worksheets.

Before you start you need to download and new materials. To do this you will be carrying out three tasks:

1. You need to use your **SSH Terminal** and navigate to the _root directory_ of your project (the one containing the `exercises/` directory).
2. There must be no changes in your working directories. These must be stashed using the `git stash` command.
3. You can then use the `git pull` command to pull any changes from the GitHub repository.
4. Finally you need to unstash the changes you made.

The full list of commands is:

```shell
$ git stash
$ git pull origin master
$ git stash pop
```

If the VI editor window pops open:

1. press the Esc key.
2. type `:wq` and press the Enter key.
Before you start you need to pull any _upstream changes_. Detailed instructions can be found in the **Setup** lab.

In this worksheet you will be learning about the markup language HTML which is currently in version 5. The worksheet is split into five parts with the resources for each part in their own subdirectory. The `template.html` file contains a basic HTML5 template you will find useful when creating your own web pages.

@@ -1,18 +1,7 @@

# Learning CSS3

Before you start this worksheet make sure you have the latest lab materials:

```shell
$ git stash
$ git pull origin master
$ git stash pop
```

If the VI editor window pops open:

1. press the Esc key.
2. type `:wq` and press the Enter key.
Before you start you need to pull any _upstream changes_. Detailed instructions can be found in the **Setup** lab.

## 1 Introduction to CSS3

@@ -1,6 +1,8 @@

# Functions and Objects

Before you start you need to pull any _upstream changes_. Detailed instructions can be found in the **Setup** lab.

## 1 Functions

In JavaScript, as in most other languages, code can be divided in to modular blocks called functions. Once defined, these can be called from other code. Data can be passed in the form of parameters and functions can return data back to the calling code.
@@ -3,6 +3,8 @@

In this worksheet you will be applying a range of techniques to improve the quality of your code.

Before you start you need to pull any _upstream changes_. Detailed instructions can be found in the **Setup** lab.

## 1 Modularisation

The first step you will need to do is to split your code up to make it easier to understand. Take a look at the end of the `index.js` routes file.
@@ -3,3 +3,4 @@

In this worksheet you will learn the basics of using automated tests to improve the quality of your code.

Before you start you need to pull any _upstream changes_. Detailed instructions can be found in the **Setup** lab.

0 comments on commit 7693186

Please sign in to comment.