diff --git a/config/template.html b/config/template.html index 218ce08..404e0ff 100644 --- a/config/template.html +++ b/config/template.html @@ -90,6 +90,10 @@ +
diff --git a/config/webpack.dev.config.js b/config/webpack.dev.config.js index 3ba7aa0..c566028 100644 --- a/config/webpack.dev.config.js +++ b/config/webpack.dev.config.js @@ -1,13 +1,14 @@ -const webpackBaseConfig = require('./webpack.base.config'); -const paths = require('./paths'); +const webpackBaseConfig = require("./webpack.base.config"); +const paths = require("./paths"); module.exports = { - mode: 'development', - devtool: 'eval-source-map', - ...webpackBaseConfig({ plugins: [] }), - devServer: { - contentBase: paths.output, - port: 9000, - hot: true, - } + mode: "development", + devtool: "eval-source-map", + ...webpackBaseConfig({ plugins: [] }), + devServer: { + contentBase: paths.output, + port: 9000, + host: "0.0.0.0", + hot: true, + }, }; diff --git a/package.json b/package.json index 73124fa..8aa1036 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "blobs.app", - "version": "1.0.0", - "description": "Generate blob shapes for Web and Fluttter", + "version": "1.1.0", + "description": "Generate blob shapes for Web and Flutter", "main": "index.js", "scripts": { "build": "rm -rf build && NODE_ENV=production npm run build:css && webpack ---config ./config/webpack.prod.config.js", @@ -23,12 +23,10 @@ "@babel/preset-env": "^7.9.0", "@babel/preset-react": "^7.9.4", "@risingstack/react-easy-state": "^6.3.0", - "animejs": "^3.2.0", "antd": "^4.2.4", "autoprefixer": "^9.7.6", "babel-loader": "^8.1.0", "dynamics.js": "^1.1.5", - "kute.js": "^1.6.6", "postcss-cli": "^7.1.0", "prop-types": "^15.7.2", "react": "^16.13.1", diff --git a/src/app.scss b/src/app.scss index 022423b..a7a90a4 100644 --- a/src/app.scss +++ b/src/app.scss @@ -1,4 +1,10 @@ html body { + line-height: 25px; + font-family: "Manrope", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; + button { + line-height: 25px; + } .brand-bg { margin-top: -16px; transform: translate(-50%, 0); @@ -9,8 +15,23 @@ html body { max-width: 500px; } - #blob { - fill: #d1d8e0; + .stroke { + border: 4px solid #d1d8e0; + &.stroke-fill { + position: relative; + display: flex; + align-items: center; + justify-content: center; + &:after { + content: ""; + + width: 100%; + height: 100%; + transform: scale(0.7); + border-radius: 100%; + background-color: #4a5568; + } + } } .ant-slider-step { @@ -49,7 +70,39 @@ html body { .ant-popover-inner { max-width: 300px; - border-radius: 4px; + border-radius: 10px; + } + + .ant-popover-arrow { + display: none; + } + + .ant-popover-inner-content { + padding: 25px; + background: rgba(207, 214, 222, 0.15); + } + + input.ant-input { + border-radius: 6px; + padding: 9px; + font-weight: bold; + color: #828b99; + border-color: #cfd8df; + border-width: 2px; + } + + .ant-input:hover { + border-color: #4e566b; + border-right-width: 2px !important; + } + + .ant-input:focus, + .ant-input-focused { + border-color: #4c5468; + border-right-width: 2px !important; + outline: 0; + -webkit-box-shadow: 0 0 0 2px rgba(78, 86, 107, 0.34); + box-shadow: 0 0 0 2px rgba(78, 86, 107, 0.34); } pre { diff --git a/src/assets/css/main.css b/src/assets/css/main.css index 656da69..9426178 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -559,7 +559,7 @@ pre, code, kbd, samp { - font-family: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; + font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; } /** @@ -6431,16 +6431,8 @@ video { clear: none; } -.font-sans { - font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; -} - -.font-serif { - font-family: Georgia, Cambria, "Times New Roman", Times, serif; -} - -.font-mono { - font-family: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; +.font-body { + font-family: Manrope; } .font-hairline { @@ -26385,16 +26377,8 @@ video { clear: none; } - .sm\:font-sans { - font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; - } - - .sm\:font-serif { - font-family: Georgia, Cambria, "Times New Roman", Times, serif; - } - - .sm\:font-mono { - font-family: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; + .sm\:font-body { + font-family: Manrope; } .sm\:font-hairline { @@ -46338,16 +46322,8 @@ video { clear: none; } - .md\:font-sans { - font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; - } - - .md\:font-serif { - font-family: Georgia, Cambria, "Times New Roman", Times, serif; - } - - .md\:font-mono { - font-family: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; + .md\:font-body { + font-family: Manrope; } .md\:font-hairline { @@ -66291,16 +66267,8 @@ video { clear: none; } - .lg\:font-sans { - font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; - } - - .lg\:font-serif { - font-family: Georgia, Cambria, "Times New Roman", Times, serif; - } - - .lg\:font-mono { - font-family: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; + .lg\:font-body { + font-family: Manrope; } .lg\:font-hairline { @@ -86244,16 +86212,8 @@ video { clear: none; } - .xl\:font-sans { - font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; - } - - .xl\:font-serif { - font-family: Georgia, Cambria, "Times New Roman", Times, serif; - } - - .xl\:font-mono { - font-family: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; + .xl\:font-body { + font-family: Manrope; } .xl\:font-hairline { diff --git a/src/components/actions/flutterCopy.jsx b/src/components/actions/flutterCopy.jsx index 0fe5ace..99b14c0 100644 --- a/src/components/actions/flutterCopy.jsx +++ b/src/components/actions/flutterCopy.jsx @@ -4,7 +4,7 @@ import Button from "../common/button"; import { appStore } from "../../store"; import Modal from "../common/modal"; import Highlight from "../common/highlight"; -import Copy from "../common/ copy"; +import Copy from "../common/copy"; const FlutterCopy = view(({ onClose }) => { const [isModalOpen, openModal] = useState(false); diff --git a/src/components/actions/svgCopy.jsx b/src/components/actions/svgCopy.jsx index 020adfd..5e53312 100644 --- a/src/components/actions/svgCopy.jsx +++ b/src/components/actions/svgCopy.jsx @@ -4,17 +4,15 @@ import Button from "../common/button"; import { appStore } from "../../store"; import Modal from "../common/modal"; import Highlight from "../common/highlight"; -import Copy from "../common/ copy"; +import Copy from "../common/copy"; import Download from "../common/download"; +import formatter from "../../services/formatter"; const SVGCopy = view(({ onClose }) => { const [isModalOpen, openModal] = useState(false); const ID = `${appStore.edges}-${appStore.growth}-${appStore.id}`; - const code = ` - - - - `; + const svgEl = document.getElementById("blobSvg"); + const code = svgEl ? formatter(svgEl.outerHTML) : ""; return ( <>