diff --git a/package-lock.json b/package-lock.json index 90f3bc77..4a4efebf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,6 @@ "@mui/styles": "^5.10.8", "@mui/x-data-grid": "^6.12.1", "@mui/x-date-pickers": "^6.1.0", - "@mui/x-date-pickers-pro": "^6.2.0", "axios": "0.27.2", "classnames": "2.3.2", "date-fns": "^2.29.3", @@ -4059,92 +4058,6 @@ } } }, - "node_modules/@mui/x-date-pickers-pro": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/@mui/x-date-pickers-pro/-/x-date-pickers-pro-6.2.0.tgz", - "integrity": "sha512-lb9UDVvMdEjKWLqv/e/spbwgKZO6UIKjo0xYgCag9cfr7S+fSyaBVGsYwDjykwropBr7lRfyc2Gs0XCIPjuRqQ==", - "dependencies": { - "@babel/runtime": "^7.21.0", - "@date-io/date-fns": "^2.16.0", - "@date-io/luxon": "^2.16.1", - "@date-io/moment": "^2.16.1", - "@mui/utils": "^5.11.13", - "@mui/x-date-pickers": "6.2.0", - "@mui/x-license-pro": "6.0.4", - "clsx": "^1.2.1", - "prop-types": "^15.8.1", - "react-transition-group": "^4.4.5" - }, - "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "@emotion/react": "^11.9.0", - "@emotion/styled": "^11.8.1", - "@mui/base": "^5.0.0-alpha.87", - "@mui/material": "^5.8.6", - "@mui/system": "^5.8.0", - "date-fns": "^2.25.0", - "date-fns-jalali": "^2.13.0-0", - "dayjs": "^1.10.7", - "luxon": "^3.0.2", - "moment": "^2.29.4", - "moment-hijri": "^2.1.2", - "moment-jalaali": "^0.7.4 || ^0.8.0 || ^0.9.0", - "react": "^17.0.2 || ^18.0.0", - "react-dom": "^17.0.2 || ^18.0.0" - }, - "peerDependenciesMeta": { - "@emotion/react": { - "optional": true - }, - "@emotion/styled": { - "optional": true - }, - "date-fns": { - "optional": true - }, - "date-fns-jalali": { - "optional": true - }, - "dayjs": { - "optional": true - }, - "luxon": { - "optional": true - }, - "moment": { - "optional": true - }, - "moment-hijri": { - "optional": true - }, - "moment-jalaali": { - "optional": true - } - } - }, - "node_modules/@mui/x-date-pickers-pro/node_modules/@date-io/core": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/@date-io/core/-/core-2.16.0.tgz", - "integrity": "sha512-DYmSzkr+jToahwWrsiRA2/pzMEtz9Bq1euJwoOuYwuwIYXnZFtHajY2E6a1VNVDc9jP8YUXK1BvnZH9mmT19Zg==" - }, - "node_modules/@mui/x-date-pickers-pro/node_modules/@date-io/date-fns": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/@date-io/date-fns/-/date-fns-2.16.0.tgz", - "integrity": "sha512-bfm5FJjucqlrnQcXDVU5RD+nlGmL3iWgkHTq3uAZWVIuBu6dDmGa3m8a6zo2VQQpu8ambq9H22UyUpn7590joA==", - "dependencies": { - "@date-io/core": "^2.16.0" - }, - "peerDependencies": { - "date-fns": "^2.0.0" - }, - "peerDependenciesMeta": { - "date-fns": { - "optional": true - } - } - }, "node_modules/@mui/x-date-pickers/node_modules/@date-io/core": { "version": "2.16.0", "resolved": "https://registry.npmjs.org/@date-io/core/-/core-2.16.0.tgz", @@ -4166,21 +4079,6 @@ } } }, - "node_modules/@mui/x-license-pro": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/@mui/x-license-pro/-/x-license-pro-6.0.4.tgz", - "integrity": "sha512-4E9TRDb0Enc7OngSz/Lx34++WdiD95tsYuFCdhicq/FImahgLEg799qUj+il5UQJ5mxQP/pKdVqv0T8FZg2JPA==", - "dependencies": { - "@babel/runtime": "^7.21.0", - "@mui/utils": "^5.11.13" - }, - "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "react": "^17.0.2 || ^18.0.0" - } - }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -23237,47 +23135,6 @@ } } }, - "@mui/x-date-pickers-pro": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/@mui/x-date-pickers-pro/-/x-date-pickers-pro-6.2.0.tgz", - "integrity": "sha512-lb9UDVvMdEjKWLqv/e/spbwgKZO6UIKjo0xYgCag9cfr7S+fSyaBVGsYwDjykwropBr7lRfyc2Gs0XCIPjuRqQ==", - "requires": { - "@babel/runtime": "^7.21.0", - "@date-io/date-fns": "^2.16.0", - "@date-io/luxon": "^2.16.1", - "@date-io/moment": "^2.16.1", - "@mui/utils": "^5.11.13", - "@mui/x-date-pickers": "6.2.0", - "@mui/x-license-pro": "6.0.4", - "clsx": "^1.2.1", - "prop-types": "^15.8.1", - "react-transition-group": "^4.4.5" - }, - "dependencies": { - "@date-io/core": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/@date-io/core/-/core-2.16.0.tgz", - "integrity": "sha512-DYmSzkr+jToahwWrsiRA2/pzMEtz9Bq1euJwoOuYwuwIYXnZFtHajY2E6a1VNVDc9jP8YUXK1BvnZH9mmT19Zg==" - }, - "@date-io/date-fns": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/@date-io/date-fns/-/date-fns-2.16.0.tgz", - "integrity": "sha512-bfm5FJjucqlrnQcXDVU5RD+nlGmL3iWgkHTq3uAZWVIuBu6dDmGa3m8a6zo2VQQpu8ambq9H22UyUpn7590joA==", - "requires": { - "@date-io/core": "^2.16.0" - } - } - } - }, - "@mui/x-license-pro": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/@mui/x-license-pro/-/x-license-pro-6.0.4.tgz", - "integrity": "sha512-4E9TRDb0Enc7OngSz/Lx34++WdiD95tsYuFCdhicq/FImahgLEg799qUj+il5UQJ5mxQP/pKdVqv0T8FZg2JPA==", - "requires": { - "@babel/runtime": "^7.21.0", - "@mui/utils": "^5.11.13" - } - }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", diff --git a/src/components/Header/Header.module.css b/src/components/Header/Header.module.css index bf6284d3..583473a5 100644 --- a/src/components/Header/Header.module.css +++ b/src/components/Header/Header.module.css @@ -28,19 +28,21 @@ } .menuLink { - + padding: 0.2rem 0.5rem; + margin-top: 0.5rem; display: flex; align-items: center; justify-content: space-between; - width: 90vw; + width: 100%; box-shadow: rgba(0, 0, 0, 0.4) 0px 2px 3px 0px; } -.menuLink > * { - margin: 0 0.5rem; +.menuLink:hover { + scale: 1.01; } + .navContainer { font-size: 1.5rem; display: none; diff --git a/src/forms/PhotoUploadForm.tsx b/src/forms/PhotoUploadForm.tsx index 66e7eea9..9cdf8589 100644 --- a/src/forms/PhotoUploadForm.tsx +++ b/src/forms/PhotoUploadForm.tsx @@ -303,21 +303,19 @@ const PhotoUploadForm: FC = ({ initialValues }) => { display: "flex", flexDirection: "column", alignItems: "center", - justifyContent: "center", - width: "20rem", - paddingX: 8, + justifyContent: "space-around", + paddingX: 3, }} > - {progress === 100 ? "Velykket!" : "Send en vits til Endre 🦙"} + {progress === 100 ? "Velykket!" : "Laster opp! 🦙"}