-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
c71ead6
commit aae3ec9
Showing
7 changed files
with
159 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
import { ThemeProvider } from 'styled-components' | ||
import GlobalStyles from './styles/global' | ||
import theme from './styles/theme' | ||
|
||
const App = () => ( | ||
<ThemeProvider theme={theme}> | ||
<GlobalStyles /> | ||
<h1>ScreenResolution</h1> | ||
</ThemeProvider> | ||
) | ||
|
||
export default App |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
import { createGlobalStyle, css } from 'styled-components' | ||
|
||
const GlobalStyles = createGlobalStyle` | ||
* { | ||
margin: 0; | ||
padding: 0; | ||
box-sizing: border-box; | ||
} | ||
${({ theme }) => css` | ||
html { | ||
font-size: 62.5%; | ||
} | ||
body { | ||
font-family: ${theme.font.family}; | ||
font-size: ${theme.font.sizes.medium}; | ||
} | ||
`} | ||
` | ||
|
||
export default GlobalStyles |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
const theme = { | ||
font: { | ||
family: | ||
"-apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif", | ||
sizes: { | ||
xsmall: '1.2rem', | ||
small: '1.4rem', | ||
medium: '1.6rem', | ||
large: '1.8rem', | ||
xlarge: '2.0rem', | ||
xxlarge: '6.0rem' | ||
} | ||
}, | ||
colors: { | ||
primary: '#343A40', | ||
secondary: 'ADB5BD', | ||
white: 'F8F9FA' | ||
}, | ||
spacings: { | ||
xxsmall: '0.8rem', | ||
xsmall: '1.6rem', | ||
small: '2.4rem', | ||
medium: '3.2rem', | ||
large: '4.0rem', | ||
xlarge: '4.8rem', | ||
xxlarge: '5.6rem' | ||
} | ||
} | ||
|
||
export default theme |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -80,7 +80,7 @@ | |
jsesc "^2.5.1" | ||
source-map "^0.5.0" | ||
|
||
"@babel/helper-annotate-as-pure@^7.10.4", "@babel/helper-annotate-as-pure@^7.12.13": | ||
"@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.10.4", "@babel/helper-annotate-as-pure@^7.12.13": | ||
version "7.12.13" | ||
resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab" | ||
integrity sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw== | ||
|
@@ -1136,7 +1136,7 @@ | |
"@babel/parser" "^7.12.13" | ||
"@babel/types" "^7.12.13" | ||
|
||
"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13", "@babel/traverse@^7.13.15", "@babel/traverse@^7.7.0": | ||
"@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13", "@babel/traverse@^7.13.15", "@babel/traverse@^7.4.5", "@babel/traverse@^7.7.0": | ||
version "7.13.15" | ||
resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.15.tgz#c38bf7679334ddd4028e8e1f7b3aa5019f0dada7" | ||
integrity sha512-/mpZMNvj6bce59Qzl09fHEs8Bt8NnpEDQYleHUPZQ3wXUMvXi+HJPLars68oAbmp839fGoOkv2pSL2z9ajCIaQ== | ||
|
@@ -1182,6 +1182,28 @@ | |
resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-10.1.0.tgz#f0950bba18819512d42f7197e56c518aa491cf18" | ||
integrity sha512-ij4wRiunFfaJxjB0BdrYHIH8FxBJpOwNPhhAcunlmPdXudL1WQV1qoP9un6JsEBAgQH+7UXyyjh0g7jTxXK6tg== | ||
|
||
"@emotion/is-prop-valid@^0.8.8": | ||
version "0.8.8" | ||
resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.8.8.tgz#db28b1c4368a259b60a97311d6a952d4fd01ac1a" | ||
integrity sha512-u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA== | ||
dependencies: | ||
"@emotion/memoize" "0.7.4" | ||
|
||
"@emotion/[email protected]": | ||
version "0.7.4" | ||
resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.7.4.tgz#19bf0f5af19149111c40d98bb0cf82119f5d9eeb" | ||
integrity sha512-Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw== | ||
|
||
"@emotion/stylis@^0.8.4": | ||
version "0.8.5" | ||
resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.8.5.tgz#deacb389bd6ee77d1e7fcaccce9e16c5c7e78e04" | ||
integrity sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ== | ||
|
||
"@emotion/unitless@^0.7.4": | ||
version "0.7.5" | ||
resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed" | ||
integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== | ||
|
||
"@eslint/eslintrc@^0.4.0": | ||
version "0.4.0" | ||
resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547" | ||
|
@@ -2633,6 +2655,21 @@ babel-plugin-polyfill-regenerator@^0.2.0: | |
dependencies: | ||
"@babel/helper-define-polyfill-provider" "^0.2.0" | ||
|
||
"babel-plugin-styled-components@>= 1.12.0": | ||
version "1.12.0" | ||
resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.12.0.tgz#1dec1676512177de6b827211e9eda5a30db4f9b9" | ||
integrity sha512-FEiD7l5ZABdJPpLssKXjBUJMYqzbcNzBowfXDCdJhOpbhWiewapUaY+LZGT8R4Jg2TwOjGjG4RKeyrO5p9sBkA== | ||
dependencies: | ||
"@babel/helper-annotate-as-pure" "^7.0.0" | ||
"@babel/helper-module-imports" "^7.0.0" | ||
babel-plugin-syntax-jsx "^6.18.0" | ||
lodash "^4.17.11" | ||
|
||
babel-plugin-syntax-jsx@^6.18.0: | ||
version "6.18.0" | ||
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" | ||
integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY= | ||
|
||
babel-plugin-syntax-object-rest-spread@^6.8.0: | ||
version "6.13.0" | ||
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5" | ||
|
@@ -3109,6 +3146,11 @@ camelcase@^6.0.0, camelcase@^6.1.0, camelcase@^6.2.0: | |
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" | ||
integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== | ||
|
||
camelize@^1.0.0: | ||
version "1.0.0" | ||
resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b" | ||
integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs= | ||
|
||
caniuse-api@^3.0.0: | ||
version "3.0.0" | ||
resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" | ||
|
@@ -3645,6 +3687,11 @@ css-blank-pseudo@^0.1.4: | |
dependencies: | ||
postcss "^7.0.5" | ||
|
||
css-color-keywords@^1.0.0: | ||
version "1.0.0" | ||
resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05" | ||
integrity sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU= | ||
|
||
[email protected], css-color-names@^0.0.4: | ||
version "0.0.4" | ||
resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" | ||
|
@@ -3706,6 +3753,15 @@ css-select@^2.0.0, css-select@^2.0.2: | |
domutils "^1.7.0" | ||
nth-check "^1.0.2" | ||
|
||
css-to-react-native@^3.0.0: | ||
version "3.0.0" | ||
resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.0.0.tgz#62dbe678072a824a689bcfee011fc96e02a7d756" | ||
integrity sha512-Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ== | ||
dependencies: | ||
camelize "^1.0.0" | ||
css-color-keywords "^1.0.0" | ||
postcss-value-parser "^4.0.2" | ||
|
||
[email protected]: | ||
version "1.0.0-alpha.37" | ||
resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22" | ||
|
@@ -5475,6 +5531,13 @@ hmac-drbg@^1.0.1: | |
minimalistic-assert "^1.0.0" | ||
minimalistic-crypto-utils "^1.0.1" | ||
|
||
hoist-non-react-statics@^3.0.0: | ||
version "3.3.2" | ||
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" | ||
integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== | ||
dependencies: | ||
react-is "^16.7.0" | ||
|
||
hoopy@^0.1.4: | ||
version "0.1.4" | ||
resolved "https://registry.yarnpkg.com/hoopy/-/hoopy-0.1.4.tgz#609207d661100033a9a9402ad3dea677381c1b1d" | ||
|
@@ -9069,7 +9132,7 @@ react-error-overlay@^6.0.9: | |
resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.9.tgz#3c743010c9359608c375ecd6bc76f35d93995b0a" | ||
integrity sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew== | ||
|
||
react-is@^16.8.1: | ||
react-is@^16.7.0, react-is@^16.8.1: | ||
version "16.13.1" | ||
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" | ||
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== | ||
|
@@ -9840,6 +9903,11 @@ sha.js@^2.4.0, sha.js@^2.4.8: | |
inherits "^2.0.1" | ||
safe-buffer "^5.0.1" | ||
|
||
shallowequal@^1.1.0: | ||
version "1.1.0" | ||
resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" | ||
integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== | ||
|
||
shebang-command@^1.2.0: | ||
version "1.2.0" | ||
resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" | ||
|
@@ -10343,6 +10411,27 @@ [email protected]: | |
loader-utils "^2.0.0" | ||
schema-utils "^2.7.0" | ||
|
||
styled-components@^5.2.3: | ||
version "5.2.3" | ||
resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.2.3.tgz#752669fd694aac10de814d96efc287dde0d11385" | ||
integrity sha512-BlR+KrLW3NL1yhvEB+9Nu9Dt51CuOnHoxd+Hj+rYPdtyR8X11uIW9rvhpy3Dk4dXXBsiW1u5U78f00Lf/afGoA== | ||
dependencies: | ||
"@babel/helper-module-imports" "^7.0.0" | ||
"@babel/traverse" "^7.4.5" | ||
"@emotion/is-prop-valid" "^0.8.8" | ||
"@emotion/stylis" "^0.8.4" | ||
"@emotion/unitless" "^0.7.4" | ||
babel-plugin-styled-components ">= 1.12.0" | ||
css-to-react-native "^3.0.0" | ||
hoist-non-react-statics "^3.0.0" | ||
shallowequal "^1.1.0" | ||
supports-color "^5.5.0" | ||
|
||
styled-media-query@^2.1.2: | ||
version "2.1.2" | ||
resolved "https://registry.yarnpkg.com/styled-media-query/-/styled-media-query-2.1.2.tgz#d59e8d91bc4bcff210dc511bdcecedf16eb2c5b7" | ||
integrity sha512-ds24iBxOrfIhdHP+e23y6kj1gbosgWu+tgAuxvMrYmnp6Sju/LjuY8lfkiVnn6P7mcdhtwpC2Z43o+apT9UdJg== | ||
|
||
stylehacks@^4.0.0: | ||
version "4.0.3" | ||
resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5" | ||
|
@@ -10352,7 +10441,7 @@ stylehacks@^4.0.0: | |
postcss "^7.0.0" | ||
postcss-selector-parser "^3.0.0" | ||
|
||
supports-color@^5.3.0: | ||
supports-color@^5.3.0, supports-color@^5.5.0: | ||
version "5.5.0" | ||
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" | ||
integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== | ||
|