Merge branch 'master' of https://github.com/wesbos/Advanced-React

edwincorea · Oct 9, 2018 · 4c19822 · 4c19822
2 parents 146a96b + c1e4578
commit 4c19822
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
diff --git a/finished-application/frontend/components/CartCount.js b/finished-application/frontend/components/CartCount.js
@@ -11,7 +11,7 @@ const AnimationStyles = styled.span`
     transition: all 0.4s;
     backface-visibility: hidden;
   }
-  /* Intial State of the entered Dot */
+  /* Initial State of the entered Dot */
   .count-enter {
     transform: scale(4) rotateX(0.5turn);
   }

diff --git a/finished-application/frontend/components/Page.js b/finished-application/frontend/components/Page.js
@@ -49,6 +49,7 @@ injectGlobal`
     text-decoration: none;
     color: ${theme.black};
   }
+  button {  font-family: 'radnika_next'; }
 `;
 
 class Page extends Component {

diff --git a/finished-application/frontend/package.json b/finished-application/frontend/package.json
@@ -57,7 +57,7 @@
       ".*": "babel-jest"
     }
   },
-  "//": "This is out babel config, I prefer this over a .babelrc file",
+  "//": "This is our babel config, I prefer this over a .babelrc file",
   "babel": {
     "env": {
       "development": {

diff --git a/readme.md b/readme.md
@@ -3,10 +3,7 @@
 Coming Soon!
 
 
+## FAQ
 
-## Early Access Bugs Already Fixed
-
-* [x] Removed unused Prisma directory in starter files and finished app
-* [X] Upgrade Next.js
-* [x] Video 7 reset at 0:45
-* [x] Added note in video 1 to turn on custom title bar setting to get the colours to work
+**Q:** Which Extensions for VS Code is Wes using?
+**A:** All my extensions are listed on my dotfiles repo → https://github.com/wesbos/dotfiles but specifically this course uses [ESLint](https://github.com/Microsoft/vscode-eslint), [Prettier](https://github.com/prettier/prettier-vscode)
diff --git a/sick-fits/frontend/package.json b/sick-fits/frontend/package.json
@@ -57,7 +57,7 @@
       ".*": "babel-jest"
     }
   },
-  "//": "This is out babel config, I prefer this over a .babelrc file",
+  "//": "This is our babel config, I prefer this over a .babelrc file",
   "babel": {
     "env": {
       "development": {

diff --git a/stepped-solutions/45/frontend/components/CartCount.js b/stepped-solutions/45/frontend/components/CartCount.js
@@ -11,7 +11,7 @@ const AnimationStyles = styled.span`
     transition: all 0.4s;
     backface-visibility: hidden;
   }
-  /* Intial State of the entered Dot */
+  /* Initial State of the entered Dot */
   .count-enter {
     transform: scale(4) rotateX(0.5turn);
   }