Skip to content

Commit

Permalink
ctrl-f master -> main
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattxwang
mattxwang committed Jul 2, 2021
1 parent afae255 commit 4374255
Show file tree
Hide file tree
Showing 8 changed files with 66 additions and 66 deletions.
2 changes: 1 addition & 1 deletion 02-intermediate-css/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ Wow, that was a lot! But, we now have many tools in our CSS toolkit to position

There's no pressure if you don't remember all of this at once! The important thing is that you now know that there are many different ways to position elements, and you have a general idea of how some of them work (Google is your friend)!

Take a quick break, you deserve it! And, if you want to put some of this to use, you can check out our [portfolio task](https://github.com/uclaacm/learning-lab-crash-course-su20/blob/master/task-1-portfolio/README.md)!
Take a quick break, you deserve it! And, if you want to put some of this to use, you can check out our [portfolio task](https://github.com/uclaacm/learning-lab-crash-course-su20/blob/main/task-1-portfolio/README.md)!

## Further Reading

Expand Down
4 changes: 2 additions & 2 deletions 02-intermediate-css/sample.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<h1>code samples for lesson 2: intermediate CSS</h1>
<p>
notes for the lesson are <a
href="https://github.com/uclaacm/learning-lab-crash-course-su20/tree/master/02-intermediate-css">on
href="https://github.com/uclaacm/learning-lab-crash-course-su20/tree/main/02-intermediate-css">on
GitHub</a>
</p>
<h2>the content area</h2>
Expand Down Expand Up @@ -93,4 +93,4 @@ <h2>floats</h2>
</div>
</body>

</html>
</html>
74 changes: 37 additions & 37 deletions 13-accessibility/README.md
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion 15-async-js/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ class App extends React.Component {
}
```
And the same example, with the state hook (if you're rusty, you can check our [hooks lesson](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/master/11-react-hooks) or [the React tutorial](https://reactjs.org/docs/hooks-intro.html))
And the same example, with the state hook (if you're rusty, you can check our [hooks lesson](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/main/11-react-hooks) or [the React tutorial](https://reactjs.org/docs/hooks-intro.html))

```jsx
function App() {
Expand Down
2 changes: 1 addition & 1 deletion 17-intro-testing-js/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ Then, we chain it with `.toBe` - a function that takes an argument on what... th
To run your test, you can run `npm test`:

```
npm test master * ] 5:44 PM
npm test main * ] 5:44 PM
> example-node@1.0.0 test /Users/matt/code/learning-lab-crash-course-su20/17-intro-testing-js/example-node
> jest
Expand Down
40 changes: 20 additions & 20 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,29 @@ While these notes are a good starting point, simply reading through all of these

Lessons:

* [Lesson 01: Intro to HTML & CSS](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/master/01-intro-html-css)
* [Lesson 02: Intermediate CSS: The Box Model & Positioning](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/master/02-intermediate-css)
* [Lesson 03: Intro to JS](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/master/03-intro-js)
* [Lesson 04: Intermediate CSS: Flexbox & Grid](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/master/04-flexbox-grid)
* [Lesson 05: A Brief Flyover of CSS Frameworks](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/master/05-css-frameworks)
* [Lesson 06: A CSS Animations Primer](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/master/06-css-animations)
* [Lesson 07: Intro to React](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/master/07-intro-react)
* [Lesson 08: Intro to Design with Figma (guest lecturer: Tomoki!)](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/master/08-intro-design)
* [Lesson 09: Intermediate React (Concepts & Patterns)](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/master/09-intermediate-react-1)
* [Lesson 10: Intro to SASS](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/master/10-sass)
* [Lesson 11: React Hooks](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/master/11-react-hooks)
* [Lesson 12: JS Library Tour](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/master/12-js-lib)
* [Lesson 13: Accessibility on the Web (guest lecturer: Karen!)](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/master/13-accessibility)
* [Lesson 14: Misc. DevOps](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/master/14-misc-devops)
* [Lesson 15: Async & Fetch](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/master/15-async-js)
* [Lesson 16: Intro to Backend Development](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/master/16-intro-backend)
* [Lesson 17: Intro to Testing in JS](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/master/17-intro-testing-js)
* [Lesson 18: Intro to Firebase](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/master/18-firebase)
* [Lesson 01: Intro to HTML & CSS](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/main/01-intro-html-css)
* [Lesson 02: Intermediate CSS: The Box Model & Positioning](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/main/02-intermediate-css)
* [Lesson 03: Intro to JS](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/main/03-intro-js)
* [Lesson 04: Intermediate CSS: Flexbox & Grid](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/main/04-flexbox-grid)
* [Lesson 05: A Brief Flyover of CSS Frameworks](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/main/05-css-frameworks)
* [Lesson 06: A CSS Animations Primer](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/main/06-css-animations)
* [Lesson 07: Intro to React](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/main/07-intro-react)
* [Lesson 08: Intro to Design with Figma (guest lecturer: Tomoki!)](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/main/08-intro-design)
* [Lesson 09: Intermediate React (Concepts & Patterns)](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/main/09-intermediate-react-1)
* [Lesson 10: Intro to SASS](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/main/10-sass)
* [Lesson 11: React Hooks](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/main/11-react-hooks)
* [Lesson 12: JS Library Tour](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/main/12-js-lib)
* [Lesson 13: Accessibility on the Web (guest lecturer: Karen!)](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/main/13-accessibility)
* [Lesson 14: Misc. DevOps](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/main/14-misc-devops)
* [Lesson 15: Async & Fetch](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/main/15-async-js)
* [Lesson 16: Intro to Backend Development](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/main/16-intro-backend)
* [Lesson 17: Intro to Testing in JS](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/main/17-intro-testing-js)
* [Lesson 18: Intro to Firebase](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/main/18-firebase)

And two tasks:

1. [Make a portfolio website!](https://github.com/uclaacm/learning-lab-crash-course-su20/blob/master/task-1-portfolio)
2. [Make a to-do list!](https://github.com/uclaacm/learning-lab-crash-course-su20/blob/master/task-2-to-do-list)
1. [Make a portfolio website!](https://github.com/uclaacm/learning-lab-crash-course-su20/blob/main/task-1-portfolio)
2. [Make a to-do list!](https://github.com/uclaacm/learning-lab-crash-course-su20/blob/main/task-2-to-do-list)

You can also find recorded videos of our summer sessions on the ACM YouTube channel, in [this playlist](https://www.youtube.com/playlist?list=PLPO7_kXilXFa6YdXxn5oln1gagcqnFI4l).

Expand Down
6 changes: 3 additions & 3 deletions task-1-portfolio/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Now, we can check what `git` sees with `git status`:

```sh
$ git status
On branch master
On branch main

No commits yet

Expand All @@ -110,7 +110,7 @@ This is an important distinction. Just because we've changed a file, doesn't mea
```sh
$ git add *
$ git status
On branch master
On branch main

No commits yet

Expand Down Expand Up @@ -145,7 +145,7 @@ $ git remote add origin https://github.com/YOUR_GITHUB_USERNAME/YOUR_GITHUB_USER
Great, and now we're ready. We can finally run `git push`!

```sh
$ git push -u origin master
$ git push -u origin main
...
```

Expand Down
2 changes: 1 addition & 1 deletion task-2-to-do-list/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ What about the stretch goals?

## Deploying Your Web App: Netlify

See [the video on deploying to Netlify](https://youtu.be/HH2c3YZZasg) or our [misc devops notes](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/master/14-misc-devops) on how to do this!
See [the video on deploying to Netlify](https://youtu.be/HH2c3YZZasg) or our [misc devops notes](https://github.com/uclaacm/learning-lab-crash-course-su20/tree/main/14-misc-devops) on how to do this!

0 comments on commit 4374255

Please sign in to comment.