diff options
| author | Wes Bos <wesbos@gmail.com> | 2018-10-09 14:53:21 -0400 |
|---|---|---|
| committer | Wes Bos <wesbos@gmail.com> | 2018-10-09 14:53:21 -0400 |
| commit | 4c19822af7495c1cb99be17f6021420e80f4f092 (patch) | |
| tree | 48efedf80eab84d413f6efe4a3792bd6295902bc /finished-application/frontend | |
| parent | 146a96b7bc31b7eedc12381aa8f794e549638b2c (diff) | |
| parent | c1e4578226850024cad3d60af8728e9db182d626 (diff) | |
Merge branch 'master' of https://github.com/wesbos/Advanced-React
Diffstat (limited to 'finished-application/frontend')
| -rw-r--r-- | finished-application/frontend/components/CartCount.js | 2 | ||||
| -rw-r--r-- | finished-application/frontend/components/Page.js | 1 | ||||
| -rw-r--r-- | finished-application/frontend/package.json | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/finished-application/frontend/components/CartCount.js b/finished-application/frontend/components/CartCount.js index c202d74..8f705ec 100644 --- 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 index 99f3158..47ef489 100644 --- 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 index 43af0cf..2200d6f 100644 --- 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": { |