diff --git a/dist/assets/static/css/defaults.css b/dist/assets/static/css/defaults.css index 2a078204..30b4d95b 100644 --- a/dist/assets/static/css/defaults.css +++ b/dist/assets/static/css/defaults.css @@ -1,31 +1,85 @@ +/* +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { + display: block; +} +body { + line-height: 1; +} +ol, ul { + list-style: none; +} +blockquote, q { + quotes: none; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} +table { + border-collapse: collapse; + border-spacing: 0; +} + */ + /* ------- resets ------- */ -* { margin:0;padding:0 } -html, body { height:100%;box-sizing:border-box } -*, *::before, *::after { box-sizing:inherit } -img { max-width:100% } -a { color:inherit;text-decoration:none } -ul, menu { list-style-type:none } -h1,h2,h3,h4,h5,h6 { font-weight:inherit } -strong { font-weight:700 } -figure { text-align:center } -figcaption { font-size:0.9em } -table, hr { border:0 } -nav, menu { letter-spacing:0 } -sup { font-size:66% } + +* { margin: 0; padding: 0 } +html, body { height: 100%; box-sizing: border-box } +*, *::before, *::after { box-sizing: inherit } +img { max-width: 100% } +a { color: inherit; text-decoration: none } +ul, menu { list-style-type: none } +h1,h2,h3,h4,h5,h6 { font-weight: inherit } +strong { font-weight: 700 } +figure { text-align: center } +figcaption { font-size: 0.9em } +table, hr { border: 0 } +nav, menu { letter-spacing: 0 } +sup { font-size: 66% } /* ------- body ------- */ body { background:#d3d3d3; color:#070707; - font:400 16px/1.45 'Avenir Next',Avenir,'Segoe UI',Roboto,'Helvetica Neue',sans-serif; - letter-spacing:1px; - text-rendering:optimizeLegibility; - -webkit-font-smoothing:antialiased; - -webkit-tap-highlight-color:transparent; - -moz-osx-font-smoothing:grayscale; + font: 400 16px/1.45 'Avenir Next', Avenir, 'Segoe UI', Roboto, 'Helvetica Neue', sans-serif; + letter-spacing: 1px; + text-rendering: optimizeLegibility; + -webkit-font-smoothing: antialiased; + -webkit-tap-highlight-color: transparent; + -moz-osx-font-smoothing: grayscale } /* ------- app ------- */ -#app { width:100%;height:100%;opacity:0;transition:opacity 0.44s 0.22s } -#app.ready { font-family:'Comfortaa',cursive;opacity:1 } +#app { + width: 100%; + height: 100%; + opacity: 0; + transition: opacity 0.44s 0.22s +} +#app.ready { + font-family: 'Comfortaa', cursive; + opacity:1 +} diff --git a/dist/assets/static/css/fonts.css b/dist/assets/static/css/fonts.css new file mode 100644 index 00000000..e5bf523c --- /dev/null +++ b/dist/assets/static/css/fonts.css @@ -0,0 +1,43 @@ +@font-face { + font-family: 'Comfortaa'; + font-style: normal; + font-weight: 300; + font-display: swap; + src: local('Comfortaa'), + url('../fonts/comfortaa-v28-latin-300.woff2') format('woff2'), + url('../fonts/comfortaa-v28-latin-300.woff') format('woff'); +} +@font-face { + font-family: 'Comfortaa'; + font-style: normal; + font-weight: 400; + font-display: swap; + src: local('Comfortaa'), + url('../fonts/comfortaa-v28-latin-regular.woff2') format('woff2'), + url('../fonts/comfortaa-v28-latin-regular.woff') format('woff'); +} +/* @font-face { + font-family: 'Comfortaa'; + font-style: normal; + font-weight: 500; + font-display: swap; + src: local('Comfortaa'), url('../fonts/comfortaa-v28-latin-500.woff2') format('woff2'), + url('../fonts/comfortaa-v28-latin-500.woff') format('woff'); +} +@font-face { + font-family: 'Comfortaa'; + font-style: normal; + font-weight: 600; + font-display: swap; + src: local('Comfortaa'), url('../fonts/comfortaa-v28-latin-600.woff2') format('woff2'), + url('../fonts/comfortaa-v28-latin-600.woff') format('woff'); +} */ +@font-face { + font-family: 'Comfortaa'; + font-style: normal; + font-weight: 700; + font-display: swap; + src: local('Comfortaa'), + url('../fonts/comfortaa-v28-latin-700.woff2') format('woff2'), + url('../fonts/comfortaa-v28-latin-700.woff') format('woff'); +} diff --git a/dist/assets/static/fonts/comfortaa-v28-latin-300.woff b/dist/assets/static/fonts/comfortaa-v28-latin-300.woff new file mode 100644 index 00000000..52da5b37 Binary files /dev/null and b/dist/assets/static/fonts/comfortaa-v28-latin-300.woff differ diff --git a/dist/assets/static/fonts/comfortaa-v28-latin-300.woff2 b/dist/assets/static/fonts/comfortaa-v28-latin-300.woff2 new file mode 100644 index 00000000..f29e6728 Binary files /dev/null and b/dist/assets/static/fonts/comfortaa-v28-latin-300.woff2 differ diff --git a/dist/assets/static/fonts/comfortaa-v28-latin-500.woff b/dist/assets/static/fonts/comfortaa-v28-latin-500.woff new file mode 100644 index 00000000..d83002dd Binary files /dev/null and b/dist/assets/static/fonts/comfortaa-v28-latin-500.woff differ diff --git a/dist/assets/static/fonts/comfortaa-v28-latin-500.woff2 b/dist/assets/static/fonts/comfortaa-v28-latin-500.woff2 new file mode 100644 index 00000000..e243b8d2 Binary files /dev/null and b/dist/assets/static/fonts/comfortaa-v28-latin-500.woff2 differ diff --git a/dist/assets/static/fonts/comfortaa-v28-latin-600.woff b/dist/assets/static/fonts/comfortaa-v28-latin-600.woff new file mode 100644 index 00000000..0b9632b4 Binary files /dev/null and b/dist/assets/static/fonts/comfortaa-v28-latin-600.woff differ diff --git a/dist/assets/static/fonts/comfortaa-v28-latin-600.woff2 b/dist/assets/static/fonts/comfortaa-v28-latin-600.woff2 new file mode 100644 index 00000000..e624a5b6 Binary files /dev/null and b/dist/assets/static/fonts/comfortaa-v28-latin-600.woff2 differ diff --git a/dist/assets/static/fonts/comfortaa-v28-latin-700.woff b/dist/assets/static/fonts/comfortaa-v28-latin-700.woff new file mode 100644 index 00000000..b51fc5a2 Binary files /dev/null and b/dist/assets/static/fonts/comfortaa-v28-latin-700.woff differ diff --git a/dist/assets/static/fonts/comfortaa-v28-latin-700.woff2 b/dist/assets/static/fonts/comfortaa-v28-latin-700.woff2 new file mode 100644 index 00000000..94cc1376 Binary files /dev/null and b/dist/assets/static/fonts/comfortaa-v28-latin-700.woff2 differ diff --git a/dist/assets/static/fonts/comfortaa-v28-latin-regular.woff b/dist/assets/static/fonts/comfortaa-v28-latin-regular.woff new file mode 100644 index 00000000..d4df39f0 Binary files /dev/null and b/dist/assets/static/fonts/comfortaa-v28-latin-regular.woff differ diff --git a/dist/assets/static/fonts/comfortaa-v28-latin-regular.woff2 b/dist/assets/static/fonts/comfortaa-v28-latin-regular.woff2 new file mode 100644 index 00000000..63c45889 Binary files /dev/null and b/dist/assets/static/fonts/comfortaa-v28-latin-regular.woff2 differ diff --git a/src/assets/styles/resets.css b/src/assets/styles/resets.css new file mode 100644 index 00000000..55ab2cb0 --- /dev/null +++ b/src/assets/styles/resets.css @@ -0,0 +1,13 @@ +* { margin: 0; padding: 0 } +html, body { height: 100%; box-sizing: border-box } +*, *::before, *::after { box-sizing: inherit } +img { max-width: 100% } +a { color: inherit; text-decoration: none } +ul, menu { list-style-type: none } +h1,h2,h3,h4,h5,h6 { font-weight: inherit } +strong { font-weight: 700 } +figure { text-align: center } +figcaption { font-size: 0.9em } +table, hr { border: 0 } +nav, menu { letter-spacing: 0 } +sup { font-size: 66% } diff --git a/src/components/Global/Global.js b/src/components/Global/Global.js new file mode 100644 index 00000000..5e3c2234 --- /dev/null +++ b/src/components/Global/Global.js @@ -0,0 +1,82 @@ +import React from 'react' +import { Global as GlobalStyles, css } from '@emotion/core' +// import resets from 'assets/styles/resets.css' + +const Global = () => ( + css` + * { + margin: 0; + padding: 0; + } + html, + body { + height: 100%; + box-sizing: border-box; + } + *, + ::before, + *::after { + box-sizing: inherit; + } + img { + max-width: 100%; + } + a { + color: inherit; + text-decoration: none; + } + ul, + menu { + list-style-type: none; + } + h1, + h2, + h3, + h4, + h5, + h6 { + font-weight: inherit; + } + strong { + font-weight: 700; + } + figure { + text-align: center; + } + figcaption { + font-size: 0.9em; + } + table, + hr { + border: 0; + } + nav, + menu { + letter-spacing: 0; + } + sup { + font-size: 66%; + } + + body { + background: ${theme.colors.grey[3]}; + color: ${theme.colors.grey[8]}; + font: 400 16px/1.45 'Avenir Next', Avenir, 'Segoe UI', Roboto, + 'Helvetica Neue', sans-serif; + letter-spacing: 1px; + transition: opacity 0.44s 0.66s; + text-rendering: optimizeLegibility; + -webkit-font-smoothing: antialiased; + -webkit-tap-highlight-color: transparent; + -moz-osx-font-smoothing: grayscale; + } + #root { + height: 100%; + font-family: 'Comfortaa', cursive; + } + `} + /> +) + +export default Global diff --git a/src/components/index.js b/src/components/index.js index c0546c2d..529b43ca 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -1,4 +1,5 @@ /* ------- base components ------- */ +import Global from './Global/Global' import Header from './Header/Header' import Footer from './Footer/Footer' import Social from './Social/Social' @@ -34,6 +35,7 @@ import Diamond from './Diamond/Diamond' import UpdateTime from './UpdateTime/UpdateTime' export { + Global, Header, Footer, Social, diff --git a/src/index.html b/src/index.html index 71853761..5c432d94 100644 --- a/src/index.html +++ b/src/index.html @@ -8,7 +8,7 @@ uxscoreboard - +