From fb2c80fda42f0c951291461c419e23c9eed3ed65 Mon Sep 17 00:00:00 2001 From: heyjul3s Date: Wed, 27 Jan 2021 13:23:05 +1100 Subject: [PATCH 1/2] Update Components - Section, Container to use just SC - Remove margins for H2 in SectionTitle - remove inline styles for Container in Footer --- docs/components/Global/Container.tsx | 25 +++++++++++++++++------- docs/components/Global/Footer/Footer.tsx | 2 +- docs/components/Section.tsx | 15 +++++++------- docs/components/SectionTitle.tsx | 6 +++--- 4 files changed, 29 insertions(+), 19 deletions(-) diff --git a/docs/components/Global/Container.tsx b/docs/components/Global/Container.tsx index 7b613e5..442666d 100644 --- a/docs/components/Global/Container.tsx +++ b/docs/components/Global/Container.tsx @@ -1,11 +1,22 @@ +import styled from 'styled-components'; import { theme } from '../../theme'; -import { createBlockComponents } from 'artifak'; -const styles = { - Container: { - margin: '0 auto', - maxWidth: theme.container +export const Container = styled.div` + margin: 0 auto; + width: 100%; + max-width: ${theme.container[0]}; + padding-left: 1em; + padding-right: 1em; + + @media (min-width: 576px) { + max-width: ${theme.container[1]}; + } + + @media (min-width: 768px) { + max-width: ${theme.container[2]}; } -}; -export const { Container } = createBlockComponents(styles); + @media (min-width: 992px) { + max-width: ${theme.container[3]}; + } +`; diff --git a/docs/components/Global/Footer/Footer.tsx b/docs/components/Global/Footer/Footer.tsx index fe820a7..dab6a19 100644 --- a/docs/components/Global/Footer/Footer.tsx +++ b/docs/components/Global/Footer/Footer.tsx @@ -15,7 +15,7 @@ export function Footer() { const currentYear = new Date().getFullYear(); return ( - + diff --git a/docs/components/Section.tsx b/docs/components/Section.tsx index e3487e0..6f5468d 100644 --- a/docs/components/Section.tsx +++ b/docs/components/Section.tsx @@ -1,10 +1,9 @@ -import { createBlockComponents } from 'artifak'; +import styled from 'styled-components'; -const styles = { - Section: { - marginBottom: ['1.5em', '5em'], - as: 'section' - } -}; +export const Section = styled.section` + margin-bottom: 1.5em; -export const { Section } = createBlockComponents(styles); + @media (min-width: 576px) { + margin-bottom: 5em; + } +`; diff --git a/docs/components/SectionTitle.tsx b/docs/components/SectionTitle.tsx index cdac007..8b325a1 100644 --- a/docs/components/SectionTitle.tsx +++ b/docs/components/SectionTitle.tsx @@ -9,7 +9,7 @@ type Props = { export function SectionTitle({ title }: Props) { return ( - {title} + {title} ); } @@ -37,8 +37,8 @@ const StyledSectionTitle = styled.div` margin-left: 1em; } - > ${H2} { - color: ${theme.colors.primary}; + & > h2 { + margin: 0; } `} `; From 638c7f7201254c2d8733c802b5ca5eee182f3e6f Mon Sep 17 00:00:00 2001 From: heyjul3s Date: Wed, 27 Jan 2021 15:12:10 +1100 Subject: [PATCH 2/2] pkg -update --- docs/package.json | 6 +-- docs/yarn.lock | 99 +++++++++++++++++++++++++++-------------------- 2 files changed, 59 insertions(+), 46 deletions(-) diff --git a/docs/package.json b/docs/package.json index f283b0f..63ddc46 100644 --- a/docs/package.json +++ b/docs/package.json @@ -9,7 +9,7 @@ "deploy": "yarn build && yarn export" }, "dependencies": { - "artifak": "^1.1.5", + "artifak": "1.1.5", "csstype": "^3.0.6", "framer-motion": "^3.2.1", "lodash.isplainobject": "^4.0.6", @@ -18,7 +18,7 @@ "react": "^17.0.1", "react-custom-scrollbars": "^4.2.1", "react-dom": "^17.0.1", - "react-intl": "^5.10.16", + "react-intl": "^5.10.18", "react-markings": "^1.3.0", "react-spring": "^8.0.27", "react-syntax-highlighter": "^15.4.3", @@ -27,7 +27,7 @@ "styled-system": "^5.1.5" }, "devDependencies": { - "@types/node": "^14.14.20", + "@types/node": "^14.14.22", "@types/react": "^17.0.0", "@types/styled-components": "^5.1.7", "@types/styled-system": "^5.1.10", diff --git a/docs/yarn.lock b/docs/yarn.lock index bd85d19..f506ad5 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -54,37 +54,45 @@ cross-fetch "3.0.6" "@artifak/block@^1.1.4": - version "1.1.4" - resolved "https://registry.yarnpkg.com/@artifak/block/-/block-1.1.4.tgz#b4a031dfa28de7eb135bfb2ca4980ca50350e301" - integrity sha512-VFk/EsMNIZNjFzQT74CJwBM0aRze/7LcWkTbBF36bXpNvI7QbuGT8pB20snUBS3u/xdDoj+NAcYuoyzq+kRNWA== + version "1.1.5" + resolved "https://registry.yarnpkg.com/@artifak/block/-/block-1.1.5.tgz#d57906699db06b7d93e3a75e5c2640a249dca7fb" + integrity sha512-JNeuzV4unYh+49gHhipMjurzaNhS9XxZ4XP3OsbFgjiEX1w8Vohwhts9rAQ+HcG0aVAk0UT5fJyiutkKKROssQ== dependencies: - "@artifak/component-generator" "^1.1.4" + "@artifak/component-generator" "^2.0.0" "@artifak/component-generator@^1.1.4": version "1.1.4" resolved "https://registry.yarnpkg.com/@artifak/component-generator/-/component-generator-1.1.4.tgz#57756de580650c47da1bf9124b8210b70a15dba3" integrity sha512-FH4V6u6kYMgs6cfW9zX5EJIbW8qRQnFSfh/8ruNdh5TeYmgU6PVdUAf+HRa5eDCbBchlxmmoxtqLzmlcsZs/AA== +"@artifak/component-generator@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@artifak/component-generator/-/component-generator-2.0.0.tgz#bc02066cf0c8ce7af1f6928fa463955273b202c7" + integrity sha512-5nSEjLdETmJibAfEF4r0nb1PvXYcIwSedwFj4hdMZE2tkxKDCjqhGozjug2wxpke0zFrvaNdTAY8a41UxcYZmQ== + dependencies: + lodash.isempty "^4.4.0" + lodash.isplainobject "^4.0.6" + "@artifak/flex@^1.1.4": - version "1.1.4" - resolved "https://registry.yarnpkg.com/@artifak/flex/-/flex-1.1.4.tgz#b682fb4e94966ccd54cddc3b4914b876ce216496" - integrity sha512-uzejhf3abyjn8jmAuZ78/t3/qxuv5rmKHREpyhGBPGIfC5r97pb+VCavHaHMkmYluZjY5DZOWE8cgN0gNbYuAw== + version "1.1.5" + resolved "https://registry.yarnpkg.com/@artifak/flex/-/flex-1.1.5.tgz#7900617fb1523b9cdea1cac528ab50bc3e466376" + integrity sha512-/CWaQi7hbM4dNo2vO3GrPdrkhvcC9gKCAdzdzpnbeUzF5TYCiDr5OwSKxdBEHNyN8yKWXLkYFadjrMr0J3l7xw== dependencies: - "@artifak/component-generator" "^1.1.4" + "@artifak/component-generator" "^2.0.0" "@artifak/grid@^1.1.4": - version "1.1.4" - resolved "https://registry.yarnpkg.com/@artifak/grid/-/grid-1.1.4.tgz#bb955857ce255e9afbe7cdb04cb665fad39663f0" - integrity sha512-Qo9DLvP9TPqT7sSGVAWoXXMaZqVViy/KnkMjVYITEDho2Nhx1MnLwqc8bYzMmEUDV8OtVvJrju0VjNTimVqDAw== + version "1.1.5" + resolved "https://registry.yarnpkg.com/@artifak/grid/-/grid-1.1.5.tgz#2b24339eb739cc7d1ab258c02648f67b443d0e54" + integrity sha512-XxcUd2Z5oq2WCRtyC1cQH2eRbYuXp2FJRGUHRFj3N62cId06pWguF+/e3lG8JTRbm+pvpzts2goBlUYxWF4qsA== dependencies: - "@artifak/component-generator" "^1.1.4" + "@artifak/component-generator" "^2.0.0" "@artifak/imagery@^1.0.6": - version "1.0.6" - resolved "https://registry.yarnpkg.com/@artifak/imagery/-/imagery-1.0.6.tgz#8d9f24cff84f82e626fc0963872e3fe6fb46789a" - integrity sha512-VXbjMI+mUKasypb3kCakKYFjKNbSWKb/zPo9kRU9pN4TlPtHTkldpus6itUsayl20gvek2PXA7l3out7/U8VKw== + version "1.0.7" + resolved "https://registry.yarnpkg.com/@artifak/imagery/-/imagery-1.0.7.tgz#6f15e69003240644d867844f19d024831c337ab2" + integrity sha512-FktBzIqke56F38gc3emRJF/LHh8Zjg84/2qbtfBbpo36+2Md+BKHjbi9AJbHg1009yGOJewufvHwAyTqkVgDrQ== dependencies: - "@artifak/component-generator" "^1.1.4" + "@artifak/component-generator" "^2.0.0" "@artifak/typography@^1.1.5": version "1.1.5" @@ -303,10 +311,10 @@ "@formatjs/ecma402-abstract" "1.5.1" tslib "^2.0.1" -"@formatjs/intl@1.6.1": - version "1.6.1" - resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-1.6.1.tgz#6f6de1650136feb48c475409e7d77769ae851934" - integrity sha512-911RCkqyZuwbihUT98qBfVNsEmukdf5Y4DIVqAx+BGIyyPNUeS+JXpKx6M8awXx2L9UbeTHKKhjJbNzZlVFO+w== +"@formatjs/intl@1.6.3": + version "1.6.3" + resolved "https://registry.yarnpkg.com/@formatjs/intl/-/intl-1.6.3.tgz#11586982ae2d5b701ec0d0c0ca9d912639d5e062" + integrity sha512-5ucEdE0jZrZvqLOFXTix1y1ShHzQAod20QjUTF84suASZxxZyIQ8tpM8w9cGbSRcC+wBh7Y/1NyTV7KO+/ItqA== dependencies: "@formatjs/ecma402-abstract" "1.5.1" "@formatjs/intl-datetimeformat" "3.2.4" @@ -314,8 +322,8 @@ "@formatjs/intl-listformat" "5.0.4" "@formatjs/intl-relativetimeformat" "8.0.3" fast-memoize "^2.5.2" - intl-messageformat "9.4.3" - intl-messageformat-parser "6.1.3" + intl-messageformat "9.4.5" + intl-messageformat-parser "6.3.0" tslib "^2.0.1" "@hapi/accept@5.0.1": @@ -497,10 +505,10 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw== -"@types/node@^14.14.20": - version "14.14.20" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.20.tgz#f7974863edd21d1f8a494a73e8e2b3658615c340" - integrity sha512-Y93R97Ouif9JEOWPIUyU+eyIdyRqQR0I8Ez1dzku4hDx34NWh4HbtIc3WNzwB1Y9ULvNGeu5B8h8bVL5cAk4/A== +"@types/node@^14.14.22": + version "14.14.22" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.22.tgz#0d29f382472c4ccf3bd96ff0ce47daf5b7b84b18" + integrity sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw== "@types/prop-types@*": version "15.7.3" @@ -865,7 +873,7 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= -artifak@^1.1.5: +artifak@1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/artifak/-/artifak-1.1.5.tgz#844d1d493a62b29f3c86b3596dfebbb7f60c69cc" integrity sha512-TXAxGZ4z4Of4Z+mw1BoQSP1YXDQHZns0227GJQZ0kzgg1Wt7ilhvhhCJ0RHXvB4JLFpAfrBz7hSuf3jGyo97WQ== @@ -2522,21 +2530,21 @@ ini@~1.3.0: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== -intl-messageformat-parser@6.1.3: - version "6.1.3" - resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-6.1.3.tgz#c333850f66d686eca5c9d87eff1ad46f8721b64d" - integrity sha512-rQTtrVTFy/Z6Lg0ieHkkhdFfi/47BKv1P9+wMWlKWaAxpdDP0FIsp2LRyLPpIVKTwUfL3xf26QT25d69cSkZgQ== +intl-messageformat-parser@6.3.0: + version "6.3.0" + resolved "https://registry.yarnpkg.com/intl-messageformat-parser/-/intl-messageformat-parser-6.3.0.tgz#66082dbd78c2001e91febe7651d5354789a30a65" + integrity sha512-MsvPa0tOzeGxvB7g7w7mdl1aEEeiQyAt74iX/E36bgOICrXKHu7arAizAXPk/nUu/z/XwKhEpDgbA45ADSkvXg== dependencies: "@formatjs/ecma402-abstract" "1.5.1" tslib "^2.0.1" -intl-messageformat@9.4.3: - version "9.4.3" - resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-9.4.3.tgz#c769923deced44b4c13ad35f84333a20c4f2bf38" - integrity sha512-vTn8gCY5EvHYCYha22QcX4zMSYxkIT8r+3vXeUtvb2udicb7Z+0Ev9p/8hHzcvyrMJk0HPADnkNLVsx8EUfRkg== +intl-messageformat@9.4.5: + version "9.4.5" + resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-9.4.5.tgz#ae8135ad58c332e1aa975f9852a6e6bdac9ef158" + integrity sha512-jfNoWQ5dy9YVxdVoGBvT1TNVs8xbdJolgj9eiC9saGxV4xU88HFCIK2/i1BdIAJdzRPY10WJjAMuUh3F3LKuTA== dependencies: fast-memoize "^2.5.2" - intl-messageformat-parser "6.1.3" + intl-messageformat-parser "6.3.0" tslib "^2.0.1" is-accessor-descriptor@^0.1.6: @@ -2852,6 +2860,11 @@ lodash.assign@^4.2.0: resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc= +lodash.isempty@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e" + integrity sha1-b4bL7di+TsmHvpqvM8loTbGzHn4= + lodash.isplainobject@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" @@ -3763,21 +3776,21 @@ react-dom@^17.0.1: object-assign "^4.1.1" scheduler "^0.20.1" -react-intl@^5.10.16: - version "5.10.16" - resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-5.10.16.tgz#2ccde74acd26cbe4f9e6e42765048a7f2f40e645" - integrity sha512-Cp0p9MGGWYNsl3hamJcrRqKid2HZun4MsdIlHV9fdmYVoLOII1+YynH6UBBwLuDlrLi8JrSniH1G1pqUlwQZMw== +react-intl@^5.10.18: + version "5.10.18" + resolved "https://registry.yarnpkg.com/react-intl/-/react-intl-5.10.18.tgz#75b2e8e02d0226579224a54105c64cada508e590" + integrity sha512-vf4MbASGDGrZkC1fuvnY3BWTIsllT341Em3ggYiEdUvxUpJcvEcDsXxEpDphoj8PWab9bNQwx7YQs0hOfKUy1Q== dependencies: "@formatjs/ecma402-abstract" "1.5.1" - "@formatjs/intl" "1.6.1" + "@formatjs/intl" "1.6.3" "@formatjs/intl-displaynames" "4.0.4" "@formatjs/intl-listformat" "5.0.4" "@formatjs/intl-relativetimeformat" "8.0.3" "@types/hoist-non-react-statics" "^3.3.1" fast-memoize "^2.5.2" hoist-non-react-statics "^3.3.2" - intl-messageformat "9.4.3" - intl-messageformat-parser "6.1.3" + intl-messageformat "9.4.5" + intl-messageformat-parser "6.3.0" shallow-equal "^1.2.1" tslib "^2.0.1"