From 14630c89c87a6fe4725eb1e92512ffbb2a174854 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Thu, 22 Oct 2020 13:42:49 -0300 Subject: [PATCH 1/6] Changes Scroll --- components/core/Footer/Footer.tsx | 48 ++++++++++++++++++------ components/core/UserNav/DropdownMenu.tsx | 2 +- 2 files changed, 38 insertions(+), 12 deletions(-) diff --git a/components/core/Footer/Footer.tsx b/components/core/Footer/Footer.tsx index 26f1b010c..c205b98ba 100644 --- a/components/core/Footer/Footer.tsx +++ b/components/core/Footer/Footer.tsx @@ -23,16 +23,40 @@ const Footer: FC = ({ className, pages }) => { return (
) diff --git a/components/core/UserNav/DropdownMenu.tsx b/components/core/UserNav/DropdownMenu.tsx index 13e2adfc4..61f8d4ca2 100644 --- a/components/core/UserNav/DropdownMenu.tsx +++ b/components/core/UserNav/DropdownMenu.tsx @@ -26,7 +26,7 @@ const DropdownMenu: FC = ({ return ( Date: Thu, 22 Oct 2020 14:19:16 -0300 Subject: [PATCH 2/6] New Footer --- components/core/Footer/Footer.tsx | 151 +++++++++++++++++------------- components/icon/Github.tsx | 20 ++++ components/icon/index.ts | 1 + public/vercel.png | Bin 0 -> 3258 bytes 4 files changed, 106 insertions(+), 66 deletions(-) create mode 100644 components/icon/Github.tsx create mode 100644 public/vercel.png diff --git a/components/core/Footer/Footer.tsx b/components/core/Footer/Footer.tsx index c205b98ba..7fefce4df 100644 --- a/components/core/Footer/Footer.tsx +++ b/components/core/Footer/Footer.tsx @@ -3,7 +3,8 @@ import cn from 'classnames' import Link from 'next/link' import type { Page } from '@lib/bigcommerce/api/operations/get-all-pages' import getSlug from '@utils/get-slug' -import { Logo } from '@components/ui' +import { Logo, Container } from '@components/ui' +import { Github } from '@components/icon' interface Props { className?: string @@ -14,79 +15,97 @@ interface Props { const LEGAL_PAGES = ['terms-of-use', 'shipping-returns', 'privacy-policy'] const Footer: FC = ({ className, pages }) => { - const rootClassName = cn( - 'flex flex-col p-6 md:py-12 md:flex-row flex-wrap max-w-screen-xl m-auto', - className - ) + const rootClassName = cn(className) const { sitePages, legalPages } = getPages(pages) return ( -
- ) } diff --git a/components/icon/Github.tsx b/components/icon/Github.tsx new file mode 100644 index 000000000..b8cc0c558 --- /dev/null +++ b/components/icon/Github.tsx @@ -0,0 +1,20 @@ +const Sun = ({ ...props }) => { + return ( + + + + ) +} + +export default Sun diff --git a/components/icon/index.ts b/components/icon/index.ts index 929003d6f..399ae4f5b 100644 --- a/components/icon/index.ts +++ b/components/icon/index.ts @@ -8,3 +8,4 @@ export { default as Minus } from './Minus' export { default as Check } from './Check' export { default as Sun } from './Sun' export { default as Moon } from './Moon' +export { default as Github } from './Github' diff --git a/public/vercel.png b/public/vercel.png new file mode 100644 index 0000000000000000000000000000000000000000..659ca11d04cfe2b1b0ee8e66fa70fdfec6abd831 GIT binary patch literal 3258 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 literal 0 HcmV?d00001 From 4a328a8ae742ea7edf3f359acc1c5d0b9682dfae Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Thu, 22 Oct 2020 14:44:09 -0300 Subject: [PATCH 3/6] New Footer --- components/core/Footer/Footer.tsx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/components/core/Footer/Footer.tsx b/components/core/Footer/Footer.tsx index 7fefce4df..ebe137856 100644 --- a/components/core/Footer/Footer.tsx +++ b/components/core/Footer/Footer.tsx @@ -24,7 +24,7 @@ const Footer: FC = ({ className, pages }) => {
- {' '} -
- - - +
+
From a7b0d9391af5d8e951aac62acf5ff841e0e1736c Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Thu, 22 Oct 2020 15:35:09 -0300 Subject: [PATCH 4/6] New Footer --- assets/utils.css | 1 + components/core/UserNav/UserNav.tsx | 2 +- components/ui/Skeleton/Skeleton.module.css | 2 +- package.json | 4 ++-- yarn.lock | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/assets/utils.css b/assets/utils.css index 65dd5f63a..281d90c76 100644 --- a/assets/utils.css +++ b/assets/utils.css @@ -1 +1,2 @@ +@tailwind screens; @tailwind utilities; diff --git a/components/core/UserNav/UserNav.tsx b/components/core/UserNav/UserNav.tsx index 2f0d4925d..bf5a5a4b2 100644 --- a/components/core/UserNav/UserNav.tsx +++ b/components/core/UserNav/UserNav.tsx @@ -55,7 +55,7 @@ const UserNav: FC = ({ className, children, ...props }) => { {({ open }) => ( <> - + diff --git a/components/ui/Skeleton/Skeleton.module.css b/components/ui/Skeleton/Skeleton.module.css index 6def0a5e0..5a852562b 100644 --- a/components/ui/Skeleton/Skeleton.module.css +++ b/components/ui/Skeleton/Skeleton.module.css @@ -1,5 +1,5 @@ .skeleton { - @apply block rounded; + @apply block; background-image: linear-gradient( 270deg, var(--accents-1), diff --git a/package.json b/package.json index 9365500a3..4608e0479 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,8 @@ "react-swipeable-views": "^0.13.9", "react-swipeable-views-utils": "^0.14.0-alpha.0", "react-ticker": "^1.2.2", - "swr": "^0.3.3" + "swr": "^0.3.3", + "tailwindcss": "^1.9" }, "devDependencies": { "@graphql-codegen/cli": "^1.17.10", @@ -65,7 +66,6 @@ "postcss-flexbugs-fixes": "^4.2.1", "postcss-preset-env": "^6.7.0", "prettier": "^2.1.2", - "tailwindcss": "^1.8.10", "typescript": "^4.0.3" }, "resolutions": { diff --git a/yarn.lock b/yarn.lock index 023467d2b..999b4c92e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8017,7 +8017,7 @@ symbol-observable@^1.0.4, symbol-observable@^1.1.0: resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== -tailwindcss@^1.8.10: +tailwindcss@^1.9: version "1.9.5" resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-1.9.5.tgz#3339b790a68bc1f09a8efd8eb94cb05aed5235c2" integrity sha512-Je5t1fAfyW333YTpSxF+8uJwbnrkpyBskDtZYgSMMKQbNp6QUhEKJ4g/JIevZjD2Zidz9VxLraEUq/yWOx6nQg== From 7ebdd243a83274d2f9df7c4e2491063307b6ce22 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Thu, 22 Oct 2020 15:43:09 -0300 Subject: [PATCH 5/6] Dropdown Menu --- assets/{global.css => base.css} | 6 ------ assets/components.css | 3 +++ assets/main.css | 8 ++++++++ assets/tailwind.css | 2 -- assets/utils.css | 2 -- package.json | 1 + pages/_app.tsx | 4 +--- yarn.lock | 25 +++++++++++++++++++++++-- 8 files changed, 36 insertions(+), 15 deletions(-) rename assets/{global.css => base.css} (95%) create mode 100644 assets/components.css create mode 100644 assets/main.css delete mode 100644 assets/tailwind.css delete mode 100644 assets/utils.css diff --git a/assets/global.css b/assets/base.css similarity index 95% rename from assets/global.css rename to assets/base.css index 4d3d23402..9cfd1cf0b 100644 --- a/assets/global.css +++ b/assets/base.css @@ -1,5 +1,3 @@ -@import './font.css'; - :root { --primary: white; --primary-2: #f1f3f5; @@ -58,10 +56,6 @@ --accents-9: #f8f9fa; } -.fit { - min-height: calc(100vh - 88px - 41px); -} - *, *:before, *:after { diff --git a/assets/components.css b/assets/components.css new file mode 100644 index 000000000..eab469589 --- /dev/null +++ b/assets/components.css @@ -0,0 +1,3 @@ +.fit { + min-height: calc(100vh - 88px - 41px); +} diff --git a/assets/main.css b/assets/main.css new file mode 100644 index 000000000..e18f81fbf --- /dev/null +++ b/assets/main.css @@ -0,0 +1,8 @@ +@import 'tailwindcss/base'; +@import './font.css'; +@import './base.css'; + +@import 'tailwindcss/components'; +@import './components.css'; + +@import 'tailwindcss/utilities'; diff --git a/assets/tailwind.css b/assets/tailwind.css deleted file mode 100644 index 605a9cef0..000000000 --- a/assets/tailwind.css +++ /dev/null @@ -1,2 +0,0 @@ -@tailwind base; -@tailwind components; diff --git a/assets/utils.css b/assets/utils.css deleted file mode 100644 index 281d90c76..000000000 --- a/assets/utils.css +++ /dev/null @@ -1,2 +0,0 @@ -@tailwind screens; -@tailwind utilities; diff --git a/package.json b/package.json index 4608e0479..e4b34f4e8 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "next-seo": "^4.11.0", "next-themes": "^0.0.4", "nextjs-progressbar": "^0.0.6", + "postcss-import": "^13.0.0", "postcss-nesting": "^7.0.1", "react": "^16.14.0", "react-aria": "^3.0.0", diff --git a/pages/_app.tsx b/pages/_app.tsx index f6c1ffcd8..986ccedbe 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -1,6 +1,4 @@ -import '@assets/global.css' -import '@assets/tailwind.css' -import '@assets/utils.css' +import '@assets/main.css' // To be removed import 'animate.css' diff --git a/yarn.lock b/yarn.lock index 999b4c92e..b8c69bb0a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6439,6 +6439,11 @@ picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== +pify@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" + integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= + pkg-dir@^4.1.0, pkg-dir@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" @@ -6613,6 +6618,15 @@ postcss-image-set-function@^3.0.1: postcss "^7.0.2" postcss-values-parser "^2.0.0" +postcss-import@^13.0.0: + version "13.0.0" + resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-13.0.0.tgz#d6960cd9e3de5464743b04dd8cd9d870662f8b8c" + integrity sha512-LPUbm3ytpYopwQQjqgUH4S3EM/Gb9QsaSPP/5vnoi+oKVy3/mIk2sc0Paqw7RL57GpScm9MdIMUypw2znWiBpg== + dependencies: + postcss-value-parser "^4.0.0" + read-cache "^1.0.0" + resolve "^1.1.7" + postcss-initial@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.2.tgz#f018563694b3c16ae8eaabe3c585ac6319637b2d" @@ -6827,7 +6841,7 @@ postcss-value-parser@^3.3.0: resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== -postcss-value-parser@^4.1.0: +postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== @@ -7139,6 +7153,13 @@ react@^16.14.0: object-assign "^4.1.1" prop-types "^15.6.2" +read-cache@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" + integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q= + dependencies: + pify "^2.3.0" + read-pkg-up@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" @@ -7419,7 +7440,7 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.10.0, resolve@^1.14.2, resolve@^1.3.2, resolve@^1.8.1: +resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.3.2, resolve@^1.8.1: version "1.18.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.18.1.tgz#018fcb2c5b207d2a6424aee361c5a266da8f4130" integrity sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA== From 9e7e5b02a2151cfd79ce5052e273464657264fc6 Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Thu, 22 Oct 2020 16:47:58 -0300 Subject: [PATCH 6/6] Dropdown Menu --- components/core/Footer/Footer.tsx | 21 +++++++++--------- components/icon/DoubleChevron.tsx | 22 +++++++++++++++++++ .../ProductView/ProductView.module.css | 7 +++--- .../product/ProductView/ProductView.tsx | 10 ++++----- 4 files changed, 41 insertions(+), 19 deletions(-) create mode 100644 components/icon/DoubleChevron.tsx diff --git a/components/core/Footer/Footer.tsx b/components/core/Footer/Footer.tsx index ebe137856..83bde14b0 100644 --- a/components/core/Footer/Footer.tsx +++ b/components/core/Footer/Footer.tsx @@ -21,7 +21,7 @@ const Footer: FC = ({ className, pages }) => { return (