Merge branch 'original-main'

This commit is contained in:
Björn Meyer 2023-09-04 16:41:24 +02:00
commit a249d48926
3 changed files with 20 additions and 20 deletions

View File

@ -17,8 +17,8 @@ export default async function Footer() {
const copyrightName = COMPANY_NAME || SITE_NAME || ''; const copyrightName = COMPANY_NAME || SITE_NAME || '';
return ( return (
<footer className="text-sm text-neutral-400 dark:text-neutral-600"> <footer className="text-sm text-neutral-500 dark:text-neutral-400">
<div className="mx-auto flex w-full max-w-7xl flex-col gap-6 border-t border-neutral-200 px-6 py-12 text-sm dark:border-neutral-700 md:flex-row md:gap-12 md:px-4 xl:px-0"> <div className="mx-auto flex w-full max-w-7xl flex-col gap-6 border-t border-neutral-200 px-6 py-12 text-sm dark:border-neutral-700 md:flex-row md:gap-12 md:px-4 min-[1320px]:px-0">
<div className="grid grid-cols-1 gap-8 transition-colors duration-150 lg:grid-cols-12"> <div className="grid grid-cols-1 gap-8 transition-colors duration-150 lg:grid-cols-12">
<div className="col-span-1 lg:col-span-3"> <div className="col-span-1 lg:col-span-3">
<Link className="flex items-center gap-2 text-black dark:text-white md:pt-1" href="/"> <Link className="flex items-center gap-2 text-black dark:text-white md:pt-1" href="/">
@ -53,7 +53,7 @@ export default async function Footer() {
</div> </div>
</div> </div>
<div className="border-t border-neutral-200 py-6 text-sm dark:border-neutral-700"> <div className="border-t border-neutral-200 py-6 text-sm dark:border-neutral-700">
<div className="mx-auto flex w-full max-w-7xl flex-col items-center gap-1 px-4 md:flex-row md:gap-0 md:px-4 xl:px-0"> <div className="mx-auto flex w-full max-w-7xl flex-col items-center gap-1 px-4 md:flex-row md:gap-0 md:px-4 min-[1320px]:px-0">
<p> <p>
&copy; {copyrightDate} {copyrightName} &copy; {copyrightDate} {copyrightName}
{copyrightName.length && !copyrightName.endsWith('.') ? '.' : ''} All rights reserved. {copyrightName.length && !copyrightName.endsWith('.') ? '.' : ''} All rights reserved.

View File

@ -21,7 +21,7 @@
"dependencies": { "dependencies": {
"@headlessui/react": "^1.7.15", "@headlessui/react": "^1.7.15",
"@heroicons/react": "^2.0.18", "@heroicons/react": "^2.0.18",
"@shopware/api-client": "0.0.0-canary-20230801081457", "@shopware/api-client": "0.0.0-canary-20230904132316",
"clsx": "^2.0.0", "clsx": "^2.0.0",
"next": "13.4.13-canary.15", "next": "13.4.13-canary.15",
"react": "18.2.0", "react": "18.2.0",

32
pnpm-lock.yaml generated
View File

@ -12,8 +12,8 @@ dependencies:
specifier: ^2.0.18 specifier: ^2.0.18
version: 2.0.18(react@18.2.0) version: 2.0.18(react@18.2.0)
'@shopware/api-client': '@shopware/api-client':
specifier: 0.0.0-canary-20230801081457 specifier: 0.0.0-canary-20230904132316
version: 0.0.0-canary-20230801081457 version: 0.0.0-canary-20230904132316
clsx: clsx:
specifier: ^2.0.0 specifier: ^2.0.0
version: 2.0.0 version: 2.0.0
@ -365,10 +365,10 @@ packages:
resolution: {integrity: sha512-V+MvGwaHH03hYhY+k6Ef/xKd6RYlc4q8WBx+2ANmipHJcKuktNcI/NgEsJgdSUF6Lw32njT6OnrRsKYCdgHjYw==} resolution: {integrity: sha512-V+MvGwaHH03hYhY+k6Ef/xKd6RYlc4q8WBx+2ANmipHJcKuktNcI/NgEsJgdSUF6Lw32njT6OnrRsKYCdgHjYw==}
dev: true dev: true
/@shopware/api-client@0.0.0-canary-20230801081457: /@shopware/api-client@0.0.0-canary-20230904132316:
resolution: {integrity: sha512-YlHBa0eTYeFQg1QlBIcIWfy6x9KAmksJsmqpvEF5FQGJtUMcOvn4t6Q9tTrB4itV/8137xw2xo27sZn+JNxgOg==} resolution: {integrity: sha512-vE3RSoYhGkgSLozRy93aVOyUjQPrqUMliyo7zdJULJfcOYrtA4sNRq5gEINWo2GoJLkSMDirl3ZYJR//DqswFw==}
dependencies: dependencies:
ofetch: 1.1.1 ofetch: 1.3.3
dev: false dev: false
/@swc/helpers@0.5.1: /@swc/helpers@0.5.1:
@ -827,7 +827,7 @@ packages:
normalize-path: 3.0.0 normalize-path: 3.0.0
readdirp: 3.6.0 readdirp: 3.6.0
optionalDependencies: optionalDependencies:
fsevents: 2.3.2 fsevents: 2.3.3
dev: true dev: true
/ci-info@3.8.0: /ci-info@3.8.0:
@ -1574,8 +1574,8 @@ packages:
resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
dev: true dev: true
/fsevents@2.3.2: /fsevents@2.3.3:
resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==} resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
os: [darwin] os: [darwin]
requiresBuild: true requiresBuild: true
@ -2308,8 +2308,8 @@ packages:
- babel-plugin-macros - babel-plugin-macros
dev: false dev: false
/node-fetch-native@1.2.0: /node-fetch-native@1.4.0:
resolution: {integrity: sha512-5IAMBTl9p6PaAjYCnMv5FmqIF6GcZnawAVnzaCG0rX2aYZJ4CxEkZNtVPuTRug7fL7wyM5BQYTlAzcyMPi6oTQ==} resolution: {integrity: sha512-F5kfEj95kX8tkDhUCYdV8dg3/8Olx/94zB8+ZNthFs6Bz31UpUi8Xh40TN3thLwXgrwXry1pEg9lJ++tLWTcqA==}
dev: false dev: false
/node-releases@2.0.13: /node-releases@2.0.13:
@ -2420,12 +2420,12 @@ packages:
es-abstract: 1.22.1 es-abstract: 1.22.1
dev: true dev: true
/ofetch@1.1.1: /ofetch@1.3.3:
resolution: {integrity: sha512-SSMoktrp9SNLi20BWfB/BnnKcL0RDigXThD/mZBeQxkIRv1xrd9183MtLdsqRYLYSqW0eTr5t8w8MqjNhvoOQQ==} resolution: {integrity: sha512-s1ZCMmQWXy4b5K/TW9i/DtiN8Ku+xCiHcjQ6/J/nDdssirrQNOoB165Zu8EqLMA2lln1JUth9a0aW9Ap2ctrUg==}
dependencies: dependencies:
destr: 2.0.1 destr: 2.0.1
node-fetch-native: 1.2.0 node-fetch-native: 1.4.0
ufo: 1.2.0 ufo: 1.3.0
dev: false dev: false
/once@1.4.0: /once@1.4.0:
@ -3382,8 +3382,8 @@ packages:
hasBin: true hasBin: true
dev: true dev: true
/ufo@1.2.0: /ufo@1.3.0:
resolution: {integrity: sha512-RsPyTbqORDNDxqAdQPQBpgqhWle1VcTSou/FraClYlHf6TZnQcGslpLcAphNR+sQW4q5lLWLbOsRlh9j24baQg==} resolution: {integrity: sha512-bRn3CsoojyNStCZe0BG0Mt4Nr/4KF+rhFlnNXybgqt5pXHNFRlqinSoQaTrGyzE4X8aHplSb+TorH+COin9Yxw==}
dev: false dev: false
/unbox-primitive@1.0.2: /unbox-primitive@1.0.2: