Skip to content

Commit

Permalink
alternate green and purple with new order
Browse files Browse the repository at this point in the history
  • Loading branch information
pepopowitz committed Mar 10, 2019
1 parent 843dcaf commit cddbe3e
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 29 deletions.
22 changes: 11 additions & 11 deletions _not_important/instructor-notes/TODO.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
1: Modern JavaScript: Modules (& fat-arrow)
2: Thinking In Components
3: Modern JavaScript: Working With Variables (was 4)
t4: JSX Fundamentals (was 5)
v5: What can a component render? (was 6)
t6: Composition & `props.children` (was 8)
v7: Three Ways To Style (was 10)
t8: React Router (was 11)
v9: Managing Component State (was 12)
v4: JSX Fundamentals (was 5)
t5: What can a component render? (was 6)
v6: Composition & `props.children` (was 8)
t7: Three Ways To Style (was 10)
v8: React Router (was 11)
t9: Managing Component State (was 12)
10: Modern JavaScript: `async`/`await` (was 13)
t11: Loading Data (was 14)
v12: React Context (was 15)
v11: Loading Data (was 14)
t12: React Context (was 15)
13: Modern JavaScript: Class Syntax (was 3)
t14: Convert A Component (was 7)
v15: Legacy State Management (new)
t16: Legacy Lifecycle Events (new)
v14: Convert A Component (was 7)
t15: Legacy State Management (new)
v16: Legacy Lifecycle Events (new)
17: Testing Component Render
18: Testing Component Interactions

Expand Down
4 changes: 2 additions & 2 deletions exercise-11/App.module.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.app {
text-align: center;

--brand-dark: teal;
--brand-light: mintcream;
--brand-dark: blueviolet;
--brand-light: ghostwhite;
}

.appHeader {
Expand Down
4 changes: 2 additions & 2 deletions exercise-11/complete/App.module.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.app {
text-align: center;

--brand-dark: teal;
--brand-light: mintcream;
--brand-dark: blueviolet;
--brand-light: ghostwhite;
}

.appHeader {
Expand Down
4 changes: 2 additions & 2 deletions exercise-12/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ This should open a browser window pointed at localhost:3000, showing a web app t

We've modified the CSS Modules coming into this exercise, so that they render based on a static theme. The static theme is defined in `./theme/static/index.js`. If you change the static theme, the UI will reflect it.

👉 Change the exported value in `./theme/static/index.js` from `purple` to `green`.
👉 Change the exported value in `./theme/static/index.js` from `green` to `purple`.

In your browser, you should see the theme change from purple to green.
In your browser, you should see the theme change from green to purple.

### ThemeSwitcher

Expand Down
2 changes: 1 addition & 1 deletion exercise-12/theme/static.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export default 'purple';
export default 'green';
10 changes: 5 additions & 5 deletions exercise-6/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
}

.App-header {
background-color: teal;
background-color: blueviolet;
height: 100px;
padding: 20px;
color: white;
Expand All @@ -18,7 +18,7 @@
display: flex;
flex-direction: row;
justify-content: center;
background: repeating-linear-gradient(to top, mintcream, teal);
background: repeating-linear-gradient(to top, ghostwhite, blueviolet);
height: calc(100vh - 140px);
}

Expand All @@ -34,14 +34,14 @@

.card {
min-width: 150px;
background-color: mintcream;
background-color: ghostwhite;
margin: 20px;
padding: 30px;
box-shadow: 0 1px 2px teal;
box-shadow: 0 1px 2px blueviolet;
}

.card:hover {
box-shadow: 0 2px 4px teal;
box-shadow: 0 2px 4px blueviolet;
}

.friend-profile {
Expand Down
4 changes: 2 additions & 2 deletions exercise-8/App.module.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.app {
text-align: center;

--brand-dark: teal;
--brand-light: mintcream;
--brand-dark: blueviolet;
--brand-light: ghostwhite;
}

.appHeader {
Expand Down
4 changes: 2 additions & 2 deletions exercise-8/complete/App.module.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.app {
text-align: center;

--brand-dark: teal;
--brand-light: mintcream;
--brand-dark: blueviolet;
--brand-light: ghostwhite;
}

.appHeader {
Expand Down
4 changes: 2 additions & 2 deletions exercise-9/App.module.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.app {
text-align: center;

--brand-dark: blueviolet;
--brand-light: ghostwhite;
--brand-dark: teal;
--brand-light: mintcream;
}

.appHeader {
Expand Down

0 comments on commit cddbe3e

Please sign in to comment.