From cfabefa44201181f01c604c68293354a6da9c7ac Mon Sep 17 00:00:00 2001 From: Matt Dunn-Rankin Date: Mon, 18 May 2020 00:56:46 -0700 Subject: [PATCH] inline index.css, omit unused fonts, preload hints --- {src => public}/fonts/Delicious-Bold.otf | Bin .../fonts/Delicious-BoldItalic.otf | Bin {src => public}/fonts/Delicious-Heavy.otf | Bin {src => public}/fonts/Delicious-Italic.otf | Bin {src => public}/fonts/Delicious-Roman.otf | Bin public/index.html | 30 ++++++++++++ src/app/PosePicker.js | 2 +- src/app/util.js | 15 +++++- src/index.css | 44 ------------------ src/index.js | 1 - 10 files changed, 44 insertions(+), 48 deletions(-) rename {src => public}/fonts/Delicious-Bold.otf (100%) rename {src => public}/fonts/Delicious-BoldItalic.otf (100%) rename {src => public}/fonts/Delicious-Heavy.otf (100%) rename {src => public}/fonts/Delicious-Italic.otf (100%) rename {src => public}/fonts/Delicious-Roman.otf (100%) delete mode 100644 src/index.css diff --git a/src/fonts/Delicious-Bold.otf b/public/fonts/Delicious-Bold.otf similarity index 100% rename from src/fonts/Delicious-Bold.otf rename to public/fonts/Delicious-Bold.otf diff --git a/src/fonts/Delicious-BoldItalic.otf b/public/fonts/Delicious-BoldItalic.otf similarity index 100% rename from src/fonts/Delicious-BoldItalic.otf rename to public/fonts/Delicious-BoldItalic.otf diff --git a/src/fonts/Delicious-Heavy.otf b/public/fonts/Delicious-Heavy.otf similarity index 100% rename from src/fonts/Delicious-Heavy.otf rename to public/fonts/Delicious-Heavy.otf diff --git a/src/fonts/Delicious-Italic.otf b/public/fonts/Delicious-Italic.otf similarity index 100% rename from src/fonts/Delicious-Italic.otf rename to public/fonts/Delicious-Italic.otf diff --git a/src/fonts/Delicious-Roman.otf b/public/fonts/Delicious-Roman.otf similarity index 100% rename from src/fonts/Delicious-Roman.otf rename to public/fonts/Delicious-Roman.otf diff --git a/public/index.html b/public/index.html index b4d1118..2ac213f 100644 --- a/public/index.html +++ b/public/index.html @@ -21,6 +21,36 @@ Learn how to configure a non-root public URL by running `npm run build`. --> Dress to Impress + + + diff --git a/src/app/PosePicker.js b/src/app/PosePicker.js index 2e3fa99..aafaa07 100644 --- a/src/app/PosePicker.js +++ b/src/app/PosePicker.js @@ -314,7 +314,7 @@ function PoseButton({ pose, onChange, inputRef }) { ) : ( + {children} ); @@ -45,7 +50,13 @@ export function Heading1({ children, ...props }) { */ export function Heading2({ children, ...props }) { return ( - + {children} ); diff --git a/src/index.css b/src/index.css deleted file mode 100644 index 09dbc2d..0000000 --- a/src/index.css +++ /dev/null @@ -1,44 +0,0 @@ -body { - margin: 0; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", - "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", - sans-serif; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -code { - font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New", - monospace; -} - -/* A font by Jos Buivenga (exljbris) -> www.exljbris.com */ -@font-face { - font-family: "Delicious"; - src: url(./fonts/Delicious-Roman.otf); -} - -@font-face { - font-family: "Delicious"; - font-weight: 700; - src: url(./fonts/Delicious-Bold.otf); -} - -@font-face { - font-family: "Delicious"; - font-weight: 800 1000; - src: url(./fonts/Delicious-Heavy.otf); -} - -@font-face { - font-family: "Delicious"; - font-style: italic; - src: url(./fonts/Delicious-Italic.otf); -} - -@font-face { - font-family: "Delicious"; - font-style: italic; - font-weight: 700 1000; - src: url(./fonts/Delicious-BoldItalic.otf); -} diff --git a/src/index.js b/src/index.js index bbe71dd..6dddf3d 100644 --- a/src/index.js +++ b/src/index.js @@ -1,6 +1,5 @@ import React from "react"; import ReactDOM from "react-dom"; -import "./index.css"; import App from "./app/App"; ReactDOM.render(