From 803aaccffa65e496f19c3bd9553cdc87de57fa92 Mon Sep 17 00:00:00 2001 From: Yvonne Tang Date: Thu, 7 Sep 2023 17:32:20 -0700 Subject: [PATCH 01/25] use node v18; update browserslistrc to match MyAccount etc; reinstall packages; update decanter --- .browserslistrc | 5 +- .nvmrc | 2 +- package-lock.json | 663 ++++++++++++++++++++++++++++------------------ package.json | 3 +- 4 files changed, 412 insertions(+), 261 deletions(-) diff --git a/.browserslistrc b/.browserslistrc index 5a9dea4eb..7a4ee6176 100644 --- a/.browserslistrc +++ b/.browserslistrc @@ -1 +1,4 @@ -last 2 versions +> 0.5%, +last 2 versions, +Firefox ESR, +not dead diff --git a/.nvmrc b/.nvmrc index b6a7d89c6..3c032078a 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -16 +18 diff --git a/package-lock.json b/package-lock.json index 2778d7e90..5ed6f0795 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,14 +20,12 @@ "@fortawesome/react-fontawesome": "^0.1.15", "@heroicons/react": "^1.0.4", "@netlify/plugin-gatsby": "^3.0.0", - "@tailwindcss/aspect-ratio": "^0.4.0", "@tailwindcss/forms": "^0.3.4", "adapt-auth-sdk": "^1.0.10", "algoliasearch": "^4.9.3", "body-parser": "^1.19.1", "cnbuilder": "^3.1.0", "cookie-parser": "^1.4.6", - "decanter": "^7.0.0-rc.2", "gatsby": "^4.14.0", "gatsby-link": "^4.14.0", "gatsby-plugin-fontawesome-css": "^1.2.0", @@ -86,6 +84,7 @@ "axios-mock-adapter": "^1.21.2", "cross-env": "^7.0.2", "cypress": "^10.3.0", + "decanter": "^7.1.1", "dotenv": "^16.0.0", "eslint": "^7.26.0", "eslint-config-airbnb": "^18.2.1", @@ -224,6 +223,17 @@ "@algolia/requester-common": "4.14.2" } }, + "node_modules/@alloc/quick-lru": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz", + "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@ampproject/remapping": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", @@ -4200,6 +4210,7 @@ "version": "0.4.2", "resolved": "https://registry.npmjs.org/@tailwindcss/aspect-ratio/-/aspect-ratio-0.4.2.tgz", "integrity": "sha512-8QPrypskfBa7QIMuKHg2TA7BqES6vhBrDLOv8Unb6FcFyd3TjKbc6lcmb9UPQHxfl24sXoJ41ux/H7qQQvfaSQ==", + "dev": true, "peerDependencies": { "tailwindcss": ">=2.0.0 || >=3.0.0 || >=3.0.0-alpha.1" } @@ -4216,9 +4227,10 @@ } }, "node_modules/@tailwindcss/line-clamp": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/@tailwindcss/line-clamp/-/line-clamp-0.4.2.tgz", - "integrity": "sha512-HFzAQuqYCjyy/SX9sLGB1lroPzmcnWv1FHkIpmypte10hptf4oPUfucryMKovZh2u0uiS9U5Ty3GghWfEJGwVw==", + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/@tailwindcss/line-clamp/-/line-clamp-0.4.4.tgz", + "integrity": "sha512-5U6SY5z8N42VtrCrKlsTAA35gy2VSyYtHWCsg1H87NU1SXnEfekTVlrga9fzUDrrHcGi2Lb5KenUWb4lRQT5/g==", + "dev": true, "peerDependencies": { "tailwindcss": ">=2.0.0 || >=3.0.0 || >=3.0.0-alpha.1" } @@ -4970,24 +4982,6 @@ "node": ">=0.4.0" } }, - "node_modules/acorn-node": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz", - "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==", - "dependencies": { - "acorn": "^7.0.0", - "acorn-walk": "^7.0.0", - "xtend": "^4.0.2" - } - }, - "node_modules/acorn-node/node_modules/acorn-walk": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", - "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/acorn-walk": { "version": "8.2.0", "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", @@ -5139,6 +5133,11 @@ "node": ">=4" } }, + "node_modules/any-promise": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", + "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==" + }, "node_modules/anymatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", @@ -7826,20 +7825,22 @@ } }, "node_modules/decanter": { - "version": "7.0.0-rc.2", - "resolved": "https://registry.npmjs.org/decanter/-/decanter-7.0.0-rc.2.tgz", - "integrity": "sha512-lT7rxlZK5nG5k87S8guj0cYXscAEXvEMVZhp4lUXoL8008WeKqD9l4PVBbB/MNbw0oCFC2khYmec2oySfOMB9w==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/decanter/-/decanter-7.1.1.tgz", + "integrity": "sha512-rmR8+OgjkLM8ondaBG8L/+zZVhJBcmavu3y/OxAt/vy0eKc1ICPK+QVcC+C52q0ltS4Jt9yfWDq50+J2xMzK3w==", + "dev": true, "dependencies": { - "@tailwindcss/aspect-ratio": "^0.4.0", - "@tailwindcss/forms": "^0.5.1", - "@tailwindcss/line-clamp": "^0.4.0", - "tailwindcss": "^3.0.24" + "@tailwindcss/aspect-ratio": "^0.4.2", + "@tailwindcss/forms": "^0.5.3", + "@tailwindcss/line-clamp": "^0.4.4", + "tailwindcss": "^3.3.2" } }, "node_modules/decanter/node_modules/@tailwindcss/forms": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.3.tgz", - "integrity": "sha512-y5mb86JUoiUgBjY/o6FJSFZSEttfb3Q5gllE4xoKjAAD+vBrnIhE4dViwUuow3va8mpH4s9jyUbUbrRGoRdc2Q==", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.6.tgz", + "integrity": "sha512-Fw+2BJ0tmAwK/w01tEFL5TiaJBX1NLT1/YbWgvm7ws3Qcn11kiXxzNTEQDMs5V3mQemhB56l3u0i9dwdzSQldA==", + "dev": true, "dependencies": { "mini-svg-data-uri": "^1.2.3" }, @@ -8070,14 +8071,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/defined": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz", - "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/defu": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.0.tgz", @@ -8203,22 +8196,6 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" }, - "node_modules/detective": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz", - "integrity": "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==", - "dependencies": { - "acorn-node": "^1.8.2", - "defined": "^1.0.0", - "minimist": "^1.2.6" - }, - "bin": { - "detective": "bin/detective.js" - }, - "engines": { - "node": ">=0.8.0" - } - }, "node_modules/devcert": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/devcert/-/devcert-1.2.2.tgz", @@ -13564,9 +13541,9 @@ } }, "node_modules/is-core-module": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz", - "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==", + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", + "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==", "dependencies": { "has": "^1.0.3" }, @@ -14054,6 +14031,14 @@ "resolved": "https://registry.npmjs.org/jimp-compact/-/jimp-compact-0.16.1-2.tgz", "integrity": "sha512-b2A3rRT1TITzqmaO70U2/uunCh43BQVq7BfRwGPkD5xj8/WZsR3sPTy9DENt+dNZGsel3zBEm1UtYegUxjZW7A==" }, + "node_modules/jiti": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.20.0.tgz", + "integrity": "sha512-3TV69ZbrvV6U5DfQimop50jE9Dl6J8O1ja1dvBbMba/sZ3YBEQqJ2VZRoQPVnhlzjNtU1vaXRZVrVjU4qtm8yA==", + "bin": { + "jiti": "bin/jiti.js" + } + }, "node_modules/joi": { "version": "17.9.2", "resolved": "https://registry.npmjs.org/joi/-/joi-17.9.2.tgz", @@ -14277,9 +14262,9 @@ } }, "node_modules/lilconfig": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz", - "integrity": "sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz", + "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==", "engines": { "node": ">=10" } @@ -15385,10 +15370,26 @@ "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" }, + "node_modules/mz": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", + "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", + "dependencies": { + "any-promise": "^1.0.0", + "object-assign": "^4.0.1", + "thenify-all": "^1.0.0" + } + }, "node_modules/nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", + "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -42456,6 +42457,14 @@ "node": ">=0.10.0" } }, + "node_modules/pirates": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", + "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", + "engines": { + "node": ">= 6" + } + }, "node_modules/pkg-dir": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", @@ -42540,9 +42549,9 @@ "integrity": "sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==" }, "node_modules/postcss": { - "version": "8.4.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz", - "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==", + "version": "8.4.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.29.tgz", + "integrity": "sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw==", "funding": [ { "type": "opencollective", @@ -42551,10 +42560,14 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "nanoid": "^3.3.4", + "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" }, @@ -42659,25 +42672,25 @@ } }, "node_modules/postcss-import": { - "version": "14.1.0", - "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-14.1.0.tgz", - "integrity": "sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==", + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz", + "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==", "dependencies": { "postcss-value-parser": "^4.0.0", "read-cache": "^1.0.0", "resolve": "^1.1.7" }, "engines": { - "node": ">=10.0.0" + "node": ">=14.0.0" }, "peerDependencies": { "postcss": "^8.0.0" } }, "node_modules/postcss-js": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.0.tgz", - "integrity": "sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz", + "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==", "dependencies": { "camelcase-css": "^2.0.1" }, @@ -42689,35 +42702,7 @@ "url": "https://opencollective.com/postcss/" }, "peerDependencies": { - "postcss": "^8.3.3" - } - }, - "node_modules/postcss-load-config": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz", - "integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==", - "dependencies": { - "lilconfig": "^2.0.5", - "yaml": "^1.10.2" - }, - "engines": { - "node": ">= 10" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - "peerDependencies": { - "postcss": ">=8.0.9", - "ts-node": ">=9.0.0" - }, - "peerDependenciesMeta": { - "postcss": { - "optional": true - }, - "ts-node": { - "optional": true - } + "postcss": "^8.4.21" } }, "node_modules/postcss-loader": { @@ -42919,11 +42904,11 @@ } }, "node_modules/postcss-nested": { - "version": "5.0.6", - "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-5.0.6.tgz", - "integrity": "sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz", + "integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==", "dependencies": { - "postcss-selector-parser": "^6.0.6" + "postcss-selector-parser": "^6.0.11" }, "engines": { "node": ">=12.0" @@ -43117,9 +43102,9 @@ } }, "node_modules/postcss-selector-parser": { - "version": "6.0.10", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz", - "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==", + "version": "6.0.13", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz", + "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==", "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" @@ -44391,11 +44376,11 @@ "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==" }, "node_modules/resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", + "version": "1.22.4", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz", + "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==", "dependencies": { - "is-core-module": "^2.9.0", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -45861,6 +45846,67 @@ "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.13.tgz", "integrity": "sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==" }, + "node_modules/sucrase": { + "version": "3.34.0", + "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.34.0.tgz", + "integrity": "sha512-70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw==", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.2", + "commander": "^4.0.0", + "glob": "7.1.6", + "lines-and-columns": "^1.1.6", + "mz": "^2.7.0", + "pirates": "^4.0.1", + "ts-interface-checker": "^0.1.9" + }, + "bin": { + "sucrase": "bin/sucrase", + "sucrase-node": "bin/sucrase-node" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/sucrase/node_modules/@jridgewell/gen-mapping": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", + "dependencies": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/sucrase/node_modules/commander": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", + "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", + "engines": { + "node": ">= 6" + } + }, + "node_modules/sucrase/node_modules/glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/sudo-prompt": { "version": "8.2.5", "resolved": "https://registry.npmjs.org/sudo-prompt/-/sudo-prompt-8.2.5.tgz", @@ -45965,42 +46011,39 @@ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" }, "node_modules/tailwindcss": { - "version": "3.1.8", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.1.8.tgz", - "integrity": "sha512-YSneUCZSFDYMwk+TGq8qYFdCA3yfBRdBlS7txSq0LUmzyeqRe3a8fBQzbz9M3WS/iFT4BNf/nmw9mEzrnSaC0g==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz", + "integrity": "sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==", "dependencies": { + "@alloc/quick-lru": "^5.2.0", "arg": "^5.0.2", "chokidar": "^3.5.3", - "color-name": "^1.1.4", - "detective": "^5.2.1", "didyoumean": "^1.2.2", "dlv": "^1.1.3", - "fast-glob": "^3.2.11", + "fast-glob": "^3.2.12", "glob-parent": "^6.0.2", "is-glob": "^4.0.3", - "lilconfig": "^2.0.6", + "jiti": "^1.18.2", + "lilconfig": "^2.1.0", + "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "object-hash": "^3.0.0", "picocolors": "^1.0.0", - "postcss": "^8.4.14", - "postcss-import": "^14.1.0", - "postcss-js": "^4.0.0", - "postcss-load-config": "^3.1.4", - "postcss-nested": "5.0.6", - "postcss-selector-parser": "^6.0.10", - "postcss-value-parser": "^4.2.0", - "quick-lru": "^5.1.1", - "resolve": "^1.22.1" + "postcss": "^8.4.23", + "postcss-import": "^15.1.0", + "postcss-js": "^4.0.1", + "postcss-load-config": "^4.0.1", + "postcss-nested": "^6.0.1", + "postcss-selector-parser": "^6.0.11", + "resolve": "^1.22.2", + "sucrase": "^3.32.0" }, "bin": { "tailwind": "lib/cli.js", "tailwindcss": "lib/cli.js" }, "engines": { - "node": ">=12.13.0" - }, - "peerDependencies": { - "postcss": "^8.0.9" + "node": ">=14.0.0" } }, "node_modules/tailwindcss-interaction-variants": { @@ -46013,11 +46056,6 @@ "postcss-selector-parser": "^6.0.2" } }, - "node_modules/tailwindcss/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, "node_modules/tailwindcss/node_modules/glob-parent": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", @@ -46029,15 +46067,40 @@ "node": ">=10.13.0" } }, - "node_modules/tailwindcss/node_modules/quick-lru": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", - "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", + "node_modules/tailwindcss/node_modules/postcss-load-config": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.1.tgz", + "integrity": "sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==", + "dependencies": { + "lilconfig": "^2.0.5", + "yaml": "^2.1.1" + }, "engines": { - "node": ">=10" + "node": ">= 14" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + "peerDependencies": { + "postcss": ">=8.0.9", + "ts-node": ">=9.0.0" + }, + "peerDependenciesMeta": { + "postcss": { + "optional": true + }, + "ts-node": { + "optional": true + } + } + }, + "node_modules/tailwindcss/node_modules/yaml": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.2.tgz", + "integrity": "sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==", + "engines": { + "node": ">= 14" } }, "node_modules/tapable": { @@ -46298,6 +46361,25 @@ "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" }, + "node_modules/thenify": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", + "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", + "dependencies": { + "any-promise": "^1.0.0" + } + }, + "node_modules/thenify-all": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", + "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==", + "dependencies": { + "thenify": ">= 3.1.0 < 4" + }, + "engines": { + "node": ">=0.8" + } + }, "node_modules/throttleit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz", @@ -46476,6 +46558,11 @@ "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-2.2.1.tgz", "integrity": "sha512-0z3j8R7MCjy10kc/g+qg7Ln3alJTodw9aDuVWZa3uiWqfuBMKeAeP2ocWcxoyM3D73yz3Jt/Pu4qPr4wHSdB/Q==" }, + "node_modules/ts-interface-checker": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz", + "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==" + }, "node_modules/tsconfig-paths": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", @@ -48120,6 +48207,11 @@ "@algolia/requester-common": "4.14.2" } }, + "@alloc/quick-lru": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz", + "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==" + }, "@ampproject/remapping": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz", @@ -50880,6 +50972,7 @@ "version": "0.4.2", "resolved": "https://registry.npmjs.org/@tailwindcss/aspect-ratio/-/aspect-ratio-0.4.2.tgz", "integrity": "sha512-8QPrypskfBa7QIMuKHg2TA7BqES6vhBrDLOv8Unb6FcFyd3TjKbc6lcmb9UPQHxfl24sXoJ41ux/H7qQQvfaSQ==", + "dev": true, "requires": {} }, "@tailwindcss/forms": { @@ -50891,9 +50984,10 @@ } }, "@tailwindcss/line-clamp": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/@tailwindcss/line-clamp/-/line-clamp-0.4.2.tgz", - "integrity": "sha512-HFzAQuqYCjyy/SX9sLGB1lroPzmcnWv1FHkIpmypte10hptf4oPUfucryMKovZh2u0uiS9U5Ty3GghWfEJGwVw==", + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/@tailwindcss/line-clamp/-/line-clamp-0.4.4.tgz", + "integrity": "sha512-5U6SY5z8N42VtrCrKlsTAA35gy2VSyYtHWCsg1H87NU1SXnEfekTVlrga9fzUDrrHcGi2Lb5KenUWb4lRQT5/g==", + "dev": true, "requires": {} }, "@tokenizer/token": { @@ -51517,23 +51611,6 @@ } } }, - "acorn-node": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz", - "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==", - "requires": { - "acorn": "^7.0.0", - "acorn-walk": "^7.0.0", - "xtend": "^4.0.2" - }, - "dependencies": { - "acorn-walk": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", - "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==" - } - } - }, "acorn-walk": { "version": "8.2.0", "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", @@ -51651,6 +51728,11 @@ "color-convert": "^1.9.0" } }, + "any-promise": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", + "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==" + }, "anymatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz", @@ -53661,20 +53743,22 @@ } }, "decanter": { - "version": "7.0.0-rc.2", - "resolved": "https://registry.npmjs.org/decanter/-/decanter-7.0.0-rc.2.tgz", - "integrity": "sha512-lT7rxlZK5nG5k87S8guj0cYXscAEXvEMVZhp4lUXoL8008WeKqD9l4PVBbB/MNbw0oCFC2khYmec2oySfOMB9w==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/decanter/-/decanter-7.1.1.tgz", + "integrity": "sha512-rmR8+OgjkLM8ondaBG8L/+zZVhJBcmavu3y/OxAt/vy0eKc1ICPK+QVcC+C52q0ltS4Jt9yfWDq50+J2xMzK3w==", + "dev": true, "requires": { - "@tailwindcss/aspect-ratio": "^0.4.0", - "@tailwindcss/forms": "^0.5.1", - "@tailwindcss/line-clamp": "^0.4.0", - "tailwindcss": "^3.0.24" + "@tailwindcss/aspect-ratio": "^0.4.2", + "@tailwindcss/forms": "^0.5.3", + "@tailwindcss/line-clamp": "^0.4.4", + "tailwindcss": "^3.3.2" }, "dependencies": { "@tailwindcss/forms": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.3.tgz", - "integrity": "sha512-y5mb86JUoiUgBjY/o6FJSFZSEttfb3Q5gllE4xoKjAAD+vBrnIhE4dViwUuow3va8mpH4s9jyUbUbrRGoRdc2Q==", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.6.tgz", + "integrity": "sha512-Fw+2BJ0tmAwK/w01tEFL5TiaJBX1NLT1/YbWgvm7ws3Qcn11kiXxzNTEQDMs5V3mQemhB56l3u0i9dwdzSQldA==", + "dev": true, "requires": { "mini-svg-data-uri": "^1.2.3" } @@ -53850,11 +53934,6 @@ "object-keys": "^1.1.1" } }, - "defined": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz", - "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==" - }, "defu": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.0.tgz", @@ -53943,16 +54022,6 @@ } } }, - "detective": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz", - "integrity": "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==", - "requires": { - "acorn-node": "^1.8.2", - "defined": "^1.0.0", - "minimist": "^1.2.6" - } - }, "devcert": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/devcert/-/devcert-1.2.2.tgz", @@ -57843,9 +57912,9 @@ } }, "is-core-module": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz", - "integrity": "sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==", + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", + "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==", "requires": { "has": "^1.0.3" } @@ -58184,6 +58253,11 @@ "resolved": "https://registry.npmjs.org/jimp-compact/-/jimp-compact-0.16.1-2.tgz", "integrity": "sha512-b2A3rRT1TITzqmaO70U2/uunCh43BQVq7BfRwGPkD5xj8/WZsR3sPTy9DENt+dNZGsel3zBEm1UtYegUxjZW7A==" }, + "jiti": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.20.0.tgz", + "integrity": "sha512-3TV69ZbrvV6U5DfQimop50jE9Dl6J8O1ja1dvBbMba/sZ3YBEQqJ2VZRoQPVnhlzjNtU1vaXRZVrVjU4qtm8yA==" + }, "joi": { "version": "17.9.2", "resolved": "https://registry.npmjs.org/joi/-/joi-17.9.2.tgz", @@ -58363,9 +58437,9 @@ } }, "lilconfig": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz", - "integrity": "sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz", + "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==" }, "lines-and-columns": { "version": "1.2.4", @@ -59233,10 +59307,20 @@ "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==" }, + "mz": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", + "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", + "requires": { + "any-promise": "^1.0.0", + "object-assign": "^4.0.1", + "thenify-all": "^1.0.0" + } + }, "nanoid": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", - "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==" + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", + "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==" }, "napi-build-utils": { "version": "1.0.2", @@ -79617,6 +79701,11 @@ "pinkie": "^2.0.0" } }, + "pirates": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", + "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==" + }, "pkg-dir": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", @@ -79679,11 +79768,11 @@ "integrity": "sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==" }, "postcss": { - "version": "8.4.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz", - "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==", + "version": "8.4.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.29.tgz", + "integrity": "sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw==", "requires": { - "nanoid": "^3.3.4", + "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" } @@ -79748,9 +79837,9 @@ "requires": {} }, "postcss-import": { - "version": "14.1.0", - "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-14.1.0.tgz", - "integrity": "sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==", + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz", + "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==", "requires": { "postcss-value-parser": "^4.0.0", "read-cache": "^1.0.0", @@ -79758,22 +79847,13 @@ } }, "postcss-js": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.0.tgz", - "integrity": "sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz", + "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==", "requires": { "camelcase-css": "^2.0.1" } }, - "postcss-load-config": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz", - "integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==", - "requires": { - "lilconfig": "^2.0.5", - "yaml": "^1.10.2" - } - }, "postcss-loader": { "version": "5.3.0", "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-5.3.0.tgz", @@ -79896,11 +79976,11 @@ } }, "postcss-nested": { - "version": "5.0.6", - "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-5.0.6.tgz", - "integrity": "sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz", + "integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==", "requires": { - "postcss-selector-parser": "^6.0.6" + "postcss-selector-parser": "^6.0.11" } }, "postcss-normalize-charset": { @@ -80009,9 +80089,9 @@ } }, "postcss-selector-parser": { - "version": "6.0.10", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz", - "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==", + "version": "6.0.13", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz", + "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==", "requires": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" @@ -80967,11 +81047,11 @@ "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==" }, "resolve": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", - "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", + "version": "1.22.4", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz", + "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==", "requires": { - "is-core-module": "^2.9.0", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" } @@ -82077,6 +82157,50 @@ "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.13.tgz", "integrity": "sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==" }, + "sucrase": { + "version": "3.34.0", + "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.34.0.tgz", + "integrity": "sha512-70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw==", + "requires": { + "@jridgewell/gen-mapping": "^0.3.2", + "commander": "^4.0.0", + "glob": "7.1.6", + "lines-and-columns": "^1.1.6", + "mz": "^2.7.0", + "pirates": "^4.0.1", + "ts-interface-checker": "^0.1.9" + }, + "dependencies": { + "@jridgewell/gen-mapping": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", + "requires": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + } + }, + "commander": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", + "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==" + }, + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + } + } + }, "sudo-prompt": { "version": "8.2.5", "resolved": "https://registry.npmjs.org/sudo-prompt/-/sudo-prompt-8.2.5.tgz", @@ -82160,39 +82284,34 @@ } }, "tailwindcss": { - "version": "3.1.8", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.1.8.tgz", - "integrity": "sha512-YSneUCZSFDYMwk+TGq8qYFdCA3yfBRdBlS7txSq0LUmzyeqRe3a8fBQzbz9M3WS/iFT4BNf/nmw9mEzrnSaC0g==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz", + "integrity": "sha512-A0KgSkef7eE4Mf+nKJ83i75TMyq8HqY3qmFIJSWy8bNt0v1lG7jUcpGpoTFxAwYcWOphcTBLPPJg+bDfhDf52w==", "requires": { + "@alloc/quick-lru": "^5.2.0", "arg": "^5.0.2", "chokidar": "^3.5.3", - "color-name": "^1.1.4", - "detective": "^5.2.1", "didyoumean": "^1.2.2", "dlv": "^1.1.3", - "fast-glob": "^3.2.11", + "fast-glob": "^3.2.12", "glob-parent": "^6.0.2", "is-glob": "^4.0.3", - "lilconfig": "^2.0.6", + "jiti": "^1.18.2", + "lilconfig": "^2.1.0", + "micromatch": "^4.0.5", "normalize-path": "^3.0.0", "object-hash": "^3.0.0", "picocolors": "^1.0.0", - "postcss": "^8.4.14", - "postcss-import": "^14.1.0", - "postcss-js": "^4.0.0", - "postcss-load-config": "^3.1.4", - "postcss-nested": "5.0.6", - "postcss-selector-parser": "^6.0.10", - "postcss-value-parser": "^4.2.0", - "quick-lru": "^5.1.1", - "resolve": "^1.22.1" + "postcss": "^8.4.23", + "postcss-import": "^15.1.0", + "postcss-js": "^4.0.1", + "postcss-load-config": "^4.0.1", + "postcss-nested": "^6.0.1", + "postcss-selector-parser": "^6.0.11", + "resolve": "^1.22.2", + "sucrase": "^3.32.0" }, "dependencies": { - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, "glob-parent": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", @@ -82201,10 +82320,19 @@ "is-glob": "^4.0.3" } }, - "quick-lru": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", - "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==" + "postcss-load-config": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.1.tgz", + "integrity": "sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==", + "requires": { + "lilconfig": "^2.0.5", + "yaml": "^2.1.1" + } + }, + "yaml": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.2.tgz", + "integrity": "sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==" } } }, @@ -82394,6 +82522,22 @@ "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" }, + "thenify": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", + "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", + "requires": { + "any-promise": "^1.0.0" + } + }, + "thenify-all": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", + "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==", + "requires": { + "thenify": ">= 3.1.0 < 4" + } + }, "throttleit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz", @@ -82536,6 +82680,11 @@ "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-2.2.1.tgz", "integrity": "sha512-0z3j8R7MCjy10kc/g+qg7Ln3alJTodw9aDuVWZa3uiWqfuBMKeAeP2ocWcxoyM3D73yz3Jt/Pu4qPr4wHSdB/Q==" }, + "ts-interface-checker": { + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz", + "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==" + }, "tsconfig-paths": { "version": "3.14.1", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", diff --git a/package.json b/package.json index ecf127113..f5d5a42e7 100644 --- a/package.json +++ b/package.json @@ -15,14 +15,12 @@ "@fortawesome/react-fontawesome": "^0.1.15", "@heroicons/react": "^1.0.4", "@netlify/plugin-gatsby": "^3.0.0", - "@tailwindcss/aspect-ratio": "^0.4.0", "@tailwindcss/forms": "^0.3.4", "adapt-auth-sdk": "^1.0.10", "algoliasearch": "^4.9.3", "body-parser": "^1.19.1", "cnbuilder": "^3.1.0", "cookie-parser": "^1.4.6", - "decanter": "^7.0.0-rc.2", "gatsby": "^4.14.0", "gatsby-link": "^4.14.0", "gatsby-plugin-fontawesome-css": "^1.2.0", @@ -113,6 +111,7 @@ "axios-mock-adapter": "^1.21.2", "cross-env": "^7.0.2", "cypress": "^10.3.0", + "decanter": "^7.1.1", "dotenv": "^16.0.0", "eslint": "^7.26.0", "eslint-config-airbnb": "^18.2.1", From 50a2d0665029b06f4f09d45b9dc3b426e8c26854 Mon Sep 17 00:00:00 2001 From: Yvonne Tang Date: Thu, 7 Sep 2023 17:33:19 -0700 Subject: [PATCH 02/25] Replace su-flex-grow with su-grow, su-flex-shrink-0 with su-shrink-0 --- src/components/cards/GradientCard/GradientCard.styles.js | 6 +++--- src/components/composite/Alert/Alert.styles.js | 4 ++-- src/components/composite/hero.js | 2 +- src/components/composite/itineraryItem.js | 4 ++-- src/components/composite/poster.js | 4 ++-- src/components/content-types/event/event.js | 2 +- src/components/content-types/story/storyPageView.js | 2 +- src/components/cta/SAACtaLink.styles.js | 2 +- .../identity/GlobalFooter/GlobalFooter.styles.js | 2 +- .../identity/GlobalHeader/GlobalHeader.styles.js | 4 ++-- src/components/identity/masthead.js | 8 ++++---- src/components/navigation/MainNav/mainNav.styles.js | 4 ++-- .../page-types/TripFilterPage/TripFilterPage.styles.js | 2 +- src/components/page-types/TripPage/TripPage.styles.js | 2 +- src/components/page-types/basicPage.js | 2 +- src/components/page-types/darkPage.js | 2 +- src/components/page-types/formPage/formPage.styles.js | 2 +- .../membershipFormPage/membershipForm.styles.js | 2 +- .../membershipFormPage/membershipFormPage.styles.js | 2 +- .../membershipFormPage/relatedContactSelection.styles.js | 2 +- src/components/page-types/protectedPage.js | 2 +- .../registrationFormPage/interstitialPage.styles.js | 2 +- .../registrationFormPage/registrationFormPage.styles.js | 2 +- .../page-types/registrationFormPage/tripTravelerCard.js | 2 +- src/components/page-types/searchPage.js | 2 +- src/components/page.js | 2 +- src/components/partials/footer.js | 2 +- src/components/search/searchField.js | 2 +- .../simple/FilterCheckbox/FilterCheckbox.styles.js | 2 +- src/styles/forms.css | 8 ++++---- src/styles/localist.css | 2 +- 31 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/components/cards/GradientCard/GradientCard.styles.js b/src/components/cards/GradientCard/GradientCard.styles.js index b91d5cb64..bf99e64c3 100644 --- a/src/components/cards/GradientCard/GradientCard.styles.js +++ b/src/components/cards/GradientCard/GradientCard.styles.js @@ -14,7 +14,7 @@ export const root = ({ orientation, isDark }) => ); export const imageWrapper = ({ orientation }) => dcnb('su-relative su-overflow-hidden', { - 'su-w-full su-mb-[-4em] md:su-mb-0 md:su-w-1/2 su-h-[60vw] sm:su-h-[50vw] lg:su-h-[40vw] xl:su-h-500 su-flex-shrink-0 su-h-full': + 'su-w-full su-mb-[-4em] md:su-mb-0 md:su-w-1/2 su-h-[60vw] sm:su-h-[50vw] lg:su-h-[40vw] xl:su-h-500 su-shrink-0 su-h-full': orientation === 'horizontal', 'su-aspect-w-3 su-aspect-h-2 su-mb-[-3em]': orientation !== 'horizontal', }); @@ -31,7 +31,7 @@ export const contentWrapper = ({ orientation }) => dcnb('su-rs-px-2 su-rs-pb-3', { 'su-w-full md:su-w-9/12 lg:su-w-7/12 lg:su-max-w-[72rem] md:su-self-end md:su-rs-pt-3 md:su-pl-0 md:su-ml-[-7em]': orientation === 'horizontal', - 'su-flex-grow': orientation !== 'horizontal', + 'su-grow': orientation !== 'horizontal', }); export const link = ({ orientation }) => dcnb( @@ -45,6 +45,6 @@ export const heading = 'su-relative su-inline su-type-0'; export const icon = 'su-relative su-inline-block su-text-digital-red-xlight group-hover:su-text-white group-focus:su-text-white'; export const description = ({ orientation }) => - dcnb('su-relative su-text-black-20 su-flex-grow su-mb-0 su-card-paragraph', { + dcnb('su-relative su-text-black-20 su-grow su-mb-0 su-card-paragraph', { 'xl:su-big-paragraph xl:su-leading-snug': orientation === 'horizontal', }); diff --git a/src/components/composite/Alert/Alert.styles.js b/src/components/composite/Alert/Alert.styles.js index 2e52550c1..27b36731d 100644 --- a/src/components/composite/Alert/Alert.styles.js +++ b/src/components/composite/Alert/Alert.styles.js @@ -14,8 +14,8 @@ export const dismissButton = 'su-text-17 su-uppercase su-font-bold su-inline-block su-tracking-widest su-mr-0 su-ml-auto'; export const dismissIcon = 'su-ml-02em'; export const labelWrapper = - 'su-order-1 su-mb-15 md:su-mb-0 su-flex su-flex-shrink-0 su-rs-mr-1 su-w-full md:su-w-max'; + 'su-order-1 su-mb-15 md:su-mb-0 su-flex su-shrink-0 su-rs-mr-1 su-w-full md:su-w-max'; export const label = 'su-text-17 su-mb-0'; export const iconWrapper = 'su-inline-block su-mr-5'; -export const contentWrapper = 'su-order-2 su-flex-1 su-flex-grow su-w-full'; +export const contentWrapper = 'su-order-2 su-flex-1 su-grow su-w-full'; export const heading = 'su-rs-mb-neg1'; diff --git a/src/components/composite/hero.js b/src/components/composite/hero.js index c042f6af3..146cb61e7 100644 --- a/src/components/composite/hero.js +++ b/src/components/composite/hero.js @@ -104,7 +104,7 @@ const Hero = ({ )} {!isHideScroll && ( -
+

Scroll to explore

{ alignItems="start" className="su-mb-04em last:su-mb-0" > -
+
{ alignItems="start" className="su-mb-04em last:su-mb-0" > -
+
)} @@ -101,20 +101,20 @@ const Masthead = ({ - + - + diff --git a/src/components/navigation/MainNav/mainMenuGroup.styles.js b/src/components/navigation/MainNav/mainMenuGroup.styles.js index 4942cec2c..29b245415 100644 --- a/src/components/navigation/MainNav/mainMenuGroup.styles.js +++ b/src/components/navigation/MainNav/mainMenuGroup.styles.js @@ -43,9 +43,9 @@ export const parentTextLinebreak = 'su-hidden xl:su-inline 2xl:su-hidden'; // Styles for the down chevron, same for shared SAA and Homesite Main Nav const chevronMobile = - 'su-absolute su-right-0 su-w-[3.4rem] su-pt-6 su-pb-5 su-px-5 su-bg-digital-red su-rounded-full group-hover:!su-bg-digital-red-light group-focus:!su-bg-digital-red-light su-mr-20'; + 'su-absolute su-right-0 su-w-34 su-pt-6 su-pb-5 su-px-5 su-bg-digital-red su-rounded-full group-hover:!su-bg-digital-red-light group-focus:!su-bg-digital-red-light su-mr-20'; const chevronDesktop = - 'lg:su-relative lg:su--top-3 lg:su-mr-0 lg:su-ml-02em lg:su-w-[0.9em] lg:su-pt-0 lg:su-pb-0 lg:su-px-0 lg:su-bg-transparent lg:group-hover:su-text-digital-red-xlight lg:group-focus:su-text-digital-red-xlight lg:group-hover:!su-bg-transparent lg:group-focus:!su-bg-transparent'; + 'lg:su-relative lg:su--top-3 lg:su-mr-0 lg:su-ml-02em lg:su-w-09em lg:su-pt-0 lg:su-pb-0 lg:su-px-0 lg:su-bg-transparent lg:group-hover:su-text-digital-red-xlight lg:group-focus:su-text-digital-red-xlight lg:group-hover:!su-bg-transparent lg:group-focus:!su-bg-transparent'; export const chevron = ({ panelOpened, isActiveButton } = {}) => dcnb( 'su-inline-block su-text-white su-transition group-focus:su-text-white', @@ -62,7 +62,7 @@ export const chevron = ({ panelOpened, isActiveButton } = {}) => const topLinkMobile = 'su-flex su-items-center su-font-semibold hocus:su-underline hocus:su-text-white hocus:su-bg-black-90 su-py-20 su-px-26 su-text-20'; const topLinkDesktop = - 'lg:su-items-end lg:su-px-15 xl:su-pt-20 lg:su-pb-18 xl:su-pb-[3rem] lg:hocus:su-bg-transparent lg:su-whitespace-pre lg:su-font-bold lg:hocus:su-text-digital-red-xlight lg:hocus:su-no-underline lg:su-border-b-[5px] lg:su-border-transparent lg:hocus:su-border-digital-red-xlight lg:su-text-20 2xl:su-text-22'; + 'lg:su-items-end lg:su-px-15 xl:su-pt-20 lg:su-pb-18 xl:su-pb-30 lg:hocus:su-bg-transparent lg:su-whitespace-pre lg:su-font-bold lg:hocus:su-text-digital-red-xlight lg:hocus:su-no-underline lg:su-border-b-[5px] lg:su-border-transparent lg:hocus:su-border-digital-red-xlight lg:su-text-20 2xl:su-text-22'; export const topLink = dcnb( 'su-group su-text-white su-transition-colors su-text-left su-leading-snug su-no-underline focus:su-outline-none su-underline-offset-[3px]', topLinkMobile, diff --git a/src/components/navigation/MainNav/mainNav.styles.js b/src/components/navigation/MainNav/mainNav.styles.js index 817367721..60afb6e8f 100644 --- a/src/components/navigation/MainNav/mainNav.styles.js +++ b/src/components/navigation/MainNav/mainNav.styles.js @@ -12,7 +12,7 @@ export const headerUserCircle = 'su-flex su-justify-center su-transition su-leading su-text-center su-w-40 su-h-40 su-text-24 su-border-2 su-border-digital-red-xlight su-rounded-full group-hover:su-bg-cardinal-red-xdark group-focus:su-bg-cardinal-red-xdark'; export const burgerIconMobile = - 'su-transition-colors su-w-[2.2rem] group-hover:su-text-digital-red-xlight group-focus:su-text-digital-red-xlight'; + 'su-transition-colors su-w-22 group-hover:su-text-digital-red-xlight group-focus:su-text-digital-red-xlight'; const menuMobileCommon = 'su-w-full su-border-t su-border-digital-red-light su-flex su-flex-col su-list-unstyled children:su-mb-0'; diff --git a/src/components/navigation/MainNav/userNavItems.jsx b/src/components/navigation/MainNav/userNavItems.jsx index c15b5d64a..31c5b64ba 100644 --- a/src/components/navigation/MainNav/userNavItems.jsx +++ b/src/components/navigation/MainNav/userNavItems.jsx @@ -66,7 +66,7 @@ const UserNavItems = ({ expanded, userProfile }) => { )} > {key !== 0 && ( - + )} {link.text} @@ -86,7 +86,7 @@ const UserNavItems = ({ expanded, userProfile }) => { alignItems="center" className="su-px-26 lg:su-px-18 su-rs-pb-1 su-pt-18" > -
+
diff --git a/src/components/navigation/MainNav/userNavItems.styles.js b/src/components/navigation/MainNav/userNavItems.styles.js index c9bd31db4..0f906e92c 100644 --- a/src/components/navigation/MainNav/userNavItems.styles.js +++ b/src/components/navigation/MainNav/userNavItems.styles.js @@ -7,11 +7,11 @@ export const utilityNav2Link = export const link = 'su-flex su-items-baseline su-justify-between su-group su-w-full su-px-20 su-py-12 su-no-underline su-leading-display su-text-white hocus:su-text-white hocus:su-bg-cardinal-red-xxdark su-font-semibold !su-underline-offset-[3px] lg:!su-decoration-digital-red-xlight su-text-20'; export const heroicon = - 'su-relative su-inline-block su-mt-0 su-text-digital-red-xlight group-hocus:su-text-white su-text-[2.6rem] su-relative su-top-[0.15em]'; + 'su-relative su-inline-block su-mt-0 su-text-digital-red-xlight group-hocus:su-text-white su-text-26 su-relative su-top-[0.15em]'; export const menuWrapper = (expanded) => dcnb( - 'su-transform-gpu su-transition su-origin-top lg:su-origin-top-right lg:su-bg-cardinal-red-xdark lg:su-z-10 lg:su-absolute lg:su-shadow-lg lg:su-rounded-[4px] lg:su-rs-px-1 su-rs-pt-0 su-rs-pb-1 children:su-mb-02em su-w-screen su-mr-[-2rem] sm:su-mr-[-3rem] lg:su-w-[38rem] su-right-0 su-mt-8 su-text-left', + 'su-transform-gpu su-transition su-origin-top lg:su-origin-top-right lg:su-bg-cardinal-red-xdark lg:su-z-10 lg:su-absolute lg:su-shadow-lg lg:su-rounded-[4px] lg:su-rs-px-1 su-rs-pt-0 su-rs-pb-1 children:su-mb-02em su-w-screen su--mr-20 sm:su--mr-30 lg:su-w-[38rem] su-right-0 su-mt-8 su-text-left', { 'lg:su-scale-y-0 lg:su-scale-x-0 lg:su-opacity-0 lg:su-invisible': !expanded, diff --git a/src/components/navigation/MegaMenu/megaMenu.styles.js b/src/components/navigation/MegaMenu/megaMenu.styles.js index 8bb4203b6..0df855c5f 100644 --- a/src/components/navigation/MegaMenu/megaMenu.styles.js +++ b/src/components/navigation/MegaMenu/megaMenu.styles.js @@ -8,7 +8,7 @@ export const headerUserCircle = 'su-flex su-justify-center su-transition su-leading su-text-center su-w-40 su-h-40 su-text-24 su-border-2 su-border-digital-red-xlight su-rounded-full group-hover:su-bg-cardinal-red-xdark group-focus:su-bg-cardinal-red-xdark'; export const burgerIconMobile = - 'su-transition-colors su-w-[2.2rem] group-hover:su-text-digital-red-xlight group-focus:su-text-digital-red-xlight'; + 'su-transition-colors su-w-22 group-hover:su-text-digital-red-xlight group-focus:su-text-digital-red-xlight'; const menuMobileCommon = 'su-w-full su-border-t su-border-black-20 su-flex su-flex-col su-list-unstyled children:su-mb-0'; diff --git a/src/components/navigation/MegaMenu/megaMenuCard.styles.js b/src/components/navigation/MegaMenu/megaMenuCard.styles.js index 63fba84de..ca10fd58a 100644 --- a/src/components/navigation/MegaMenu/megaMenuCard.styles.js +++ b/src/components/navigation/MegaMenu/megaMenuCard.styles.js @@ -3,4 +3,4 @@ export const cardImageWrapper = export const cardImageStyles = 'su-w-full su-object-cover su-w-full su-h-full su-transition-transform su-transform-gpu group-hover:su-scale-[1.03] group-focus-within:su-scale-[1.03] su-object-center'; export const cardContent = - '!su-mt-[-1px] su-text-white su-rs-px-2 su-rs-pt-2 su-rs-pb-3 lg:su-rs-px-1 lg:su-rs-pt-1 lg:su-rs-pb-2 su-break-words su-bg-digital-red group-hover:su-bg-cardinal-red group-focus:su-bg-cardinal-red'; + '!su--mt-1 su-text-white su-rs-px-2 su-rs-pt-2 su-rs-pb-3 lg:su-rs-px-1 lg:su-rs-pt-1 lg:su-rs-pb-2 su-break-words su-bg-digital-red group-hover:su-bg-cardinal-red group-focus:su-bg-cardinal-red'; diff --git a/src/components/navigation/MegaMenu/megaMenuPanel.styles.js b/src/components/navigation/MegaMenu/megaMenuPanel.styles.js index 0c574278b..9e48b1c8c 100644 --- a/src/components/navigation/MegaMenu/megaMenuPanel.styles.js +++ b/src/components/navigation/MegaMenu/megaMenuPanel.styles.js @@ -11,7 +11,7 @@ export const root = const buttonMobile = 'su-text-black hocus:su-text-digital-red-light !su-z-[100] su-flex su-items-center su-font-semibold su-w-full hocus:su-shadow-none hocus:su-underline su-py-20 su-pl-26 su-pr-80 su-text-20'; const buttonDesktop = - 'lg:su-text-white lg:su-items-end lg:su-px-15 xl:su-pt-20 lg:su-pb-18 xl:su-pb-[3rem] lg:su-bg-transparent lg:hocus:su-bg-transparent lg:su-whitespace-pre lg:su-font-bold lg:hocus:su-text-digital-red-xlight lg:hocus:su-no-underline lg:su-border-b-[5px] lg:su-border-transparent lg:hocus:su-border-digital-red-xlight'; + 'lg:su-text-white lg:su-items-end lg:su-px-15 xl:su-pt-20 lg:su-pb-18 xl:su-pb-30 lg:su-bg-transparent lg:hocus:su-bg-transparent lg:su-whitespace-pre lg:su-font-bold lg:hocus:su-text-digital-red-xlight lg:hocus:su-no-underline lg:su-border-b-[5px] lg:su-border-transparent lg:hocus:su-border-digital-red-xlight'; export const parentButton = ({ panelOpened, isActiveButton } = {}) => dcnb( 'su-group su-transition-colors su-text-left su-leading-snug su-bg-white focus:su-outline-none su-underline-offset-[3px] hocus:su-underline lg:su-text-19 2xl:su-text-21', @@ -29,9 +29,9 @@ export const parentTextLinebreak = 'su-hidden xl:su-inline 2xl:su-hidden'; // Styles for the down chevron, same for shared SAA and Homesite Main Nav const chevronMobile = - 'su-absolute su-right-0 su-w-[3.4rem] su-pt-6 su-pb-5 su-px-5 su-bg-digital-red su-rounded-full group-hover:!su-bg-black group-focus:!su-bg-black su-mr-20'; + 'su-absolute su-right-0 su-w-34 su-pt-6 su-pb-5 su-px-5 su-bg-digital-red su-rounded-full group-hover:!su-bg-black group-focus:!su-bg-black su-mr-20'; const chevronDesktop = - 'lg:su-relative lg:su--top-3 lg:su-mr-0 lg:su-ml-02em lg:su-w-[0.9em] lg:su-pt-0 lg:su-pb-0 lg:su-px-0 lg:su-bg-transparent lg:group-hover:su-text-digital-red-xlight lg:group-focus:su-text-digital-red-xlight lg:group-hover:!su-bg-transparent lg:group-focus:!su-bg-transparent'; + 'lg:su-relative lg:su--top-3 lg:su-mr-0 lg:su-ml-02em lg:su-w-09em lg:su-pt-0 lg:su-pb-0 lg:su-px-0 lg:su-bg-transparent lg:group-hover:su-text-digital-red-xlight lg:group-focus:su-text-digital-red-xlight lg:group-hover:!su-bg-transparent lg:group-focus:!su-bg-transparent'; export const chevron = ({ panelOpened, isActiveButton } = {}) => dcnb( 'su-inline-block su-text-white su-transition group-focus:su-text-white', diff --git a/src/components/navigation/accountLinks.js b/src/components/navigation/accountLinks.js index 1bd99f594..6995c1c40 100644 --- a/src/components/navigation/accountLinks.js +++ b/src/components/navigation/accountLinks.js @@ -92,7 +92,7 @@ const AccountLinks = ({ mainLinkClasses }) => { className={dcnb( showDesktop ? mainLinkClasses - : `su-border-t su-border-t-digital-red-xlight su-transition su-text-20 children:su-px-20 children:su-py-32 children:su-flex su-leading-display children:su-text-white hocus:children:su-text-white hocus:su-bg-cardinal-red-xxdark hocus:children:su-decoration-digital-red-xlight su-underline-offset-2 children:su-w-full su-mt-[7rem]` + : `su-border-t su-border-t-digital-red-xlight su-transition su-text-20 children:su-px-20 children:su-py-32 children:su-flex su-leading-display children:su-text-white hocus:children:su-text-white hocus:su-bg-cardinal-red-xxdark hocus:children:su-decoration-digital-red-xlight su-underline-offset-2 children:su-w-full su-mt-70` )} blok={{ link: { diff --git a/src/components/navigation/verticalNav.js b/src/components/navigation/verticalNav.js index 1018843d1..c39c3e948 100644 --- a/src/components/navigation/verticalNav.js +++ b/src/components/navigation/verticalNav.js @@ -57,7 +57,7 @@ const VerticalNav = ({ blok: { verticalNav }, className, id, pageLink }) => { {navOpened ? 'Close' : 'Section menu'} dcnb( - 'su-block su-text-white su-transition-colors su-font-bold su-leading-snug su-no-underline focus:su-outline-none su-underline-offset-[3px] hocus:su-text-digital-red-xlight su-px-20 su-py-[4rem] su-border-b-[5px] su-border-transparent hocus:su-border-digital-red-xlight su-text-21', + 'su-block su-text-white su-transition-colors su-font-bold su-leading-snug su-no-underline focus:su-outline-none su-underline-offset-[3px] hocus:su-text-digital-red-xlight su-px-20 su-py-40 su-border-b-5 su-border-transparent hocus:su-border-digital-red-xlight su-text-21', { 'su-text-digital-red-xlight !su-border-digital-red-xlight': isActive, } ); -export const button = 'su-ml-[6rem] xl:su-ml-[8rem] su-mt-[-0.5rem]'; +export const button = 'su-ml-60 xl:su-ml-80 su--mt-5'; // Mobile styles export const navWrapperMobile = @@ -27,7 +27,7 @@ export const burger = ({ navOpened }) => } ); export const burgerIcon = ({ navOpened }) => - dcnb('su-transition-colors su-w-[2.4rem] group-hocus:su-text-white', { + dcnb('su-transition-colors su-w-24 group-hocus:su-text-white', { 'su-text-white': navOpened, 'su-text-digital-red-xlight': !navOpened, }); @@ -47,6 +47,6 @@ export const linkMobile = export const buttonWrapperMobile = 'su-px-20 md:su-px-30 su-rs-py-2'; export const buttonMobile = '!su-w-full su-text-center su-text-21'; export const reserveBtn = - 'su-inline-block children:su-inline-block su-w-fit su-group su-border-3 su-transition-colors su-no-underline su-underline-offset-[3px] su-font-regular hocus:su-underline su-border-digital-red su-bg-digital-red su-text-white hocus:su-bg-cardinal-red-xdark hocus:su-text-white hocus:su-border-cardinal-red-xdark hocus:su-shadow-md su-px-20 su-pt-7 su-pb-8 md:su-px-26 md:su-pt-8 md:su-pb-10 su-text-18 md:su-text-20 su-ml-[6rem] xl:su-ml-[8rem] su-mt-[-0.5rem]'; + 'su-inline-block children:su-inline-block su-w-fit su-group su-border-3 su-transition-colors su-no-underline su-underline-offset-[3px] su-font-regular hocus:su-underline su-border-digital-red su-bg-digital-red su-text-white hocus:su-bg-cardinal-red-xdark hocus:su-text-white hocus:su-border-cardinal-red-xdark hocus:su-shadow-md su-px-20 su-pt-7 su-pb-8 md:su-px-26 md:su-pt-8 md:su-pb-10 su-text-18 md:su-text-20 su-ml-60 xl:su-ml-80 su--mt-5'; export const reserveMobileBtn = 'su-inline-block children:su-inline-block su-w-fit su-group su-border-3 su-transition-colors su-no-underline su-underline-offset-[3px] su-font-regular hocus:su-underline su-border-digital-red su-bg-digital-red su-text-white hocus:su-bg-cardinal-red-xdark hocus:su-text-white hocus:su-border-cardinal-red-xdark hocus:su-shadow-md su-px-20 su-pt-10 su-pb-11 md:su-px-26 md:su-pt-14 md:su-pb-16 su-text-18 md:su-text-20 !su-w-full su-text-center su-text-21'; diff --git a/src/components/page-types/associatesDirectoryPage/Directory/Directory.jsx b/src/components/page-types/associatesDirectoryPage/Directory/Directory.jsx index fe524c9f8..8db539713 100644 --- a/src/components/page-types/associatesDirectoryPage/Directory/Directory.jsx +++ b/src/components/page-types/associatesDirectoryPage/Directory/Directory.jsx @@ -75,7 +75,7 @@ const Directory = () => { checked={onlyNewMembers} value={onlyNewMembers} onChange={handleNewMembersToggle} - className="su-peer su-form-checkbox su-text-digital-red-light su-mr-10 su-w-[1.5rem] su-h-[1.5rem] su-cursor-pointer su-rounded su-border-black-40 hocus:su-border-none hocus:su-ring hocus:su-ring-digital-red-light hocus:su-ring-offset-0" + className="su-peer su-form-checkbox su-text-digital-red-light su-mr-10 su-w-15 su-h-15 su-cursor-pointer su-rounded su-border-black-40 hocus:su-border-none hocus:su-ring hocus:su-ring-digital-red-light hocus:su-ring-offset-0" />{' '} View Only New Members diff --git a/src/components/page-types/basicPage.js b/src/components/page-types/basicPage.js index e4eef07a5..e8f4b9a64 100644 --- a/src/components/page-types/basicPage.js +++ b/src/components/page-types/basicPage.js @@ -57,8 +57,7 @@ const BasicPage = (props) => { 'lg:su-hidden su-block su-mx-auto su-max-w-[35rem]', { 'su-rs-my-2': hasHeroBanner, - 'su-rs-mt-2 su-mb-[-1.6rem] md:su-mb-[-5rem]': - !hasHeroBanner, + 'su-rs-mt-2 su--mb-16 md:su--mb-50': !hasHeroBanner, } )} /> @@ -81,7 +80,7 @@ const BasicPage = (props) => { font="serif" srOnly={isSrOnlyTitle} id="page-title" - className="su-max-w-900 su-mb-0 su-rs-py-5 xl:su-rs-py-7 su-type-6 su-mx-auto su-max-w-1200" + className="su-mb-0 su-rs-py-5 xl:su-rs-py-7 su-type-6 su-mx-auto su-max-w-1200" > {title} diff --git a/src/components/page-types/gsbCardPage.js b/src/components/page-types/gsbCardPage.js index 6198d31b8..83eadeb02 100644 --- a/src/components/page-types/gsbCardPage.js +++ b/src/components/page-types/gsbCardPage.js @@ -71,15 +71,15 @@ const GsbCardPage = (props) => { {isGsbMember ? ( -
+

Your card

-
+
-
+
{
GSBAA Membership
-
+
{ userProfile?.contact?.name?.fullNameParsed diff --git a/src/components/page-types/membershipFormPage/MembershipCard.styles.js b/src/components/page-types/membershipFormPage/MembershipCard.styles.js index 9f7be8fdf..d33593468 100644 --- a/src/components/page-types/membershipFormPage/MembershipCard.styles.js +++ b/src/components/page-types/membershipFormPage/MembershipCard.styles.js @@ -13,9 +13,9 @@ export const initialAndSelectionWrapper = export const initialWrapper = 'su-leading su-text-center su-w-50 su-h-50 su-text-24 su-border-2 su-rounded-full su-text-saa-grey children:su-text-digital-red'; export const selectionWrapper = - 'sm:su-absolute su-self-end sm:su-self-auto su-right-0 md:su-right-[-20px] lg:su-right-0 su-text-16 su-font-semibold'; + 'sm:su-absolute su-self-end sm:su-self-auto su-right-0 md:su--right-20 lg:su-right-0 su-text-16 su-font-semibold'; export const checkLinkIcon = - 'su-inline-block su-text-digital-red-light su-w-[1.4em] su-mt-[-2px] su-mr-[2px]'; + 'su-inline-block su-text-digital-red-light su-w-[1.4em] su--mt-2 su-mr-2'; export const subheading = 'su-text-center su-rs-mb-1 su-text-18 su-leading-tight su-mt-6'; export const membershipCardLink = diff --git a/src/components/page-types/membershipFormPage/membershipFormPage.styles.js b/src/components/page-types/membershipFormPage/membershipFormPage.styles.js index 0c4e45fa3..8d669304e 100644 --- a/src/components/page-types/membershipFormPage/membershipFormPage.styles.js +++ b/src/components/page-types/membershipFormPage/membershipFormPage.styles.js @@ -12,7 +12,7 @@ export const heading = 'su-text-white su-rs-mb-5'; export const formWrapper = 'su-basefont-23 su-w-full su-cc su-bg-white su-border su-border-saa-grey su-rs-p-2 sm:su-rs-p-6'; export const logoWrapper = 'su-rs-mb-5'; -export const logo = 'su-w-200 md:su-w-300 2xl:su-w-[350px]'; +export const logo = 'su-w-200 md:su-w-300 2xl:su-w-[35rem]'; export const purchaseWrapper = '2xl:su-col-start-2'; export const cardGridHeading = 'su-rs-mb-4'; export const cardGridWrapper = 'su-rs-pb-3 su-gap-y-xl'; diff --git a/src/components/page-types/membershipFormPage/membershipPaymentCard.styles.js b/src/components/page-types/membershipFormPage/membershipPaymentCard.styles.js index ffc56ec0a..c2719fbde 100644 --- a/src/components/page-types/membershipFormPage/membershipPaymentCard.styles.js +++ b/src/components/page-types/membershipFormPage/membershipPaymentCard.styles.js @@ -14,7 +14,7 @@ export const membershipPaymentCardSelectedLink = export const selectionWrapper = 'su-absolute su-top-0 su-right-0 su-text-16 su-font-semibold'; export const checkLinkIcon = - 'su-inline-block su-right su-text-digital-red-light su-w-[1.4em] su-mt-[-2px] su-mr-[5px]'; + 'su-inline-block su-right su-text-digital-red-light su-w-[1.4em] su--mt-2 su-mr-5'; export const caption = 'su-text-digital-red-light su-mb-0'; export const subheadingAndCaptionWrapper = 'su-rs-mb-1'; export const membershipType = 'su-mb-0'; diff --git a/src/components/page-types/protectedPage.js b/src/components/page-types/protectedPage.js index 709b2aa26..57a4413ef 100644 --- a/src/components/page-types/protectedPage.js +++ b/src/components/page-types/protectedPage.js @@ -59,8 +59,7 @@ const ProtectedPage = (props) => { 'lg:su-hidden su-block su-mx-auto su-max-w-[35rem]', { 'su-rs-my-2': hasHeroBanner, - 'su-rs-mt-2 su-mb-[-1.6rem] md:su-mb-[-5rem]': - !hasHeroBanner, + 'su-rs-mt-2 su--mb-16 md:su--mb-50': !hasHeroBanner, } )} /> diff --git a/src/components/page-types/searchPage.js b/src/components/page-types/searchPage.js index 7f4850329..4158e5a2a 100644 --- a/src/components/page-types/searchPage.js +++ b/src/components/page-types/searchPage.js @@ -233,7 +233,7 @@ const SearchPage = (props) => { facetValues={siteNameValues} selectedOptions={selectedFacets.siteName} onChange={(values) => updateSiteFacet(values)} - className={!!selectedFacets.siteName.length && 'su-mb-[16px]'} + className={!!selectedFacets.siteName.length && 'su-mb-16'} exclude={['YouTube', 'SoundCloud', 'Apple Podcasts']} /> )} @@ -245,7 +245,7 @@ const SearchPage = (props) => { selectedOptions={selectedFacets.fileType} onChange={(values) => updateFileTypeFacet(values)} optionClasses="su-capitalize" - className="su-mb-[16px]" + className="su-mb-16" exclude={['html', 'pdf']} /> )} @@ -311,14 +311,14 @@ const SearchPage = (props) => {
); diff --git a/src/components/search/searchFacet.js b/src/components/search/searchFacet.js index 3a24a5de0..e342fe8fb 100644 --- a/src/components/search/searchFacet.js +++ b/src/components/search/searchFacet.js @@ -61,7 +61,7 @@ const SearchFacet = ({ value={option.name} name={attribute} defaultChecked={selectedOptions.includes(option.name)} - className="su-peer su-form-checkbox su-text-digital-red-light su-mr-10 su-w-[1.5rem] su-h-[1.5rem] su-cursor-pointer su-rounded su-border-black-40 hocus:su-border-none hocus:su-ring hocus:su-ring-digital-red-light hocus:su-ring-offset-0" + className="su-peer su-form-checkbox su-text-digital-red-light su-mr-10 su-w-15 su-h-15 su-cursor-pointer su-rounded su-border-black-40 hocus:su-border-none hocus:su-ring hocus:su-ring-digital-red-light hocus:su-ring-offset-0" onChange={(e) => handleCheckboxChange(e)} /> { size={3} level={2} align="center" - className="su-text-white su-mt-[8rem] su-mb-61 md:su-rs-mb-4" + className="su-text-white su-mt-80 su-mb-61 md:su-rs-mb-4" aria-label="Search Stanford Alumni websites" > {introduction} diff --git a/src/components/search/searchPager.js b/src/components/search/searchPager.js index 06e6c2fa0..70dc77364 100644 --- a/src/components/search/searchPager.js +++ b/src/components/search/searchPager.js @@ -21,7 +21,7 @@ const SearchPager = ({ activePage, nbPages, maxLinks, selectPage }) => { const Pager = ({ pagerLinks, className }) => ( - + - - + + + +
)} diff --git a/src/components/layout/Modal/Modal.styles.js b/src/components/layout/Modal/Modal.styles.js index 04621325b..1f8632638 100644 --- a/src/components/layout/Modal/Modal.styles.js +++ b/src/components/layout/Modal/Modal.styles.js @@ -29,7 +29,7 @@ export const closeButtonWrapper = ({ type }) => }); export const closeButton = ({ type }) => dcnb( - 'su-group su-bg-transparent su-text-white su-font-semibold hocus:su-underline su-text-m1 su-flex su-items-end su-absolute su-top-[2.2rem] su-right-20 su-z-10', + 'su-group su-bg-transparent su-text-white su-font-semibold hocus:su-underline su-text-m1 su-flex su-items-end su-absolute su-top-22 su-right-20 su-z-10', { 'hover:su-bg-digital-red-xlight hocus:su-rounded-full': type === 'main-menu', diff --git a/src/components/navigation/MainNav/SAAMainNav.jsx b/src/components/navigation/MainNav/SAAMainNav.jsx index 994e6be41..a90369fd9 100644 --- a/src/components/navigation/MainNav/SAAMainNav.jsx +++ b/src/components/navigation/MainNav/SAAMainNav.jsx @@ -105,7 +105,7 @@ const SAAMainNav = ({ menuItems, ariaLabel }) => { Menu diff --git a/src/components/navigation/MainNav/mainMenuGroup.styles.js b/src/components/navigation/MainNav/mainMenuGroup.styles.js index 29b245415..d86792752 100644 --- a/src/components/navigation/MainNav/mainMenuGroup.styles.js +++ b/src/components/navigation/MainNav/mainMenuGroup.styles.js @@ -71,7 +71,7 @@ export const topLink = dcnb( export const activeTopLink = 'su-bg-black-90 lg:su-bg-cardinal-red-xxdark lg:su-text-digital-red-xlight lg:!su-bg-transparent lg:!su-border-digital-red-xlight'; export const topLinkIcon = - 'su-top-2 lg:su-top-[-0.2rem] su-text-white group-hover:su-text-digital-red-xlight group-focus:su-text-digital-red-xlight'; + 'su-top-2 lg:su--top-2 su-text-white group-hover:su-text-digital-red-xlight group-focus:su-text-digital-red-xlight'; export const childMenu = ({ panelFacing, panelOpened, isHomesite } = {}) => dcnb( 'su-list-unstyled su-transform-gpu su-transition su-ease-linear lg:su-ease-out su-origin-top lg:su-shadow-md lg:su-w-[29rem] su-px-20 lg:su-py-10 su-relative lg:su-absolute children:su-mb-0', diff --git a/src/components/navigation/MainNav/mainNav.jsx b/src/components/navigation/MainNav/mainNav.jsx index ead54fc50..4aecc8f3b 100644 --- a/src/components/navigation/MainNav/mainNav.jsx +++ b/src/components/navigation/MainNav/mainNav.jsx @@ -96,7 +96,7 @@ const MainNav = ({ blok: { mainMenuGroups }, blok, className }) => { Menu diff --git a/src/components/navigation/MainNav/mainNav.styles.js b/src/components/navigation/MainNav/mainNav.styles.js index 60afb6e8f..7de94c516 100644 --- a/src/components/navigation/MainNav/mainNav.styles.js +++ b/src/components/navigation/MainNav/mainNav.styles.js @@ -7,7 +7,7 @@ export const menu = // Mobile styles export const rootMobile = 'lg:su-hidden su-shrink-0'; export const menuCircles = - 'su-shrink-0 su-w-34 su-h-34 su-ml-auto su-items-center su-flex su-justify-center su-justify-content-center lg:su-w-auto lg:su-h-[3.4rem] lg:su-pl-16 lg:su-pr-13 su-rounded-full lg:su-text-18 su-text-white su-leading-none su-border-2 su-border-digital-red-xlight su-transition-colors hocus:su-bg-cardinal-red-xxdark xl:hocus:su-bg-cardinal-red-xdark lg:hocus:su-no-underline su-self-center'; + 'su-shrink-0 su-w-34 su-h-34 su-items-center su-flex su-justify-center su-justify-content-center lg:su-w-auto lg:su-h-34 lg:su-pl-16 lg:su-pr-13 su-rounded-full lg:su-text-18 su-text-white su-leading-none su-border-2 su-border-digital-red-xlight su-transition-colors hocus:su-bg-cardinal-red-xxdark xl:hocus:su-bg-cardinal-red-xdark lg:hocus:su-no-underline su-self-center'; export const headerUserCircle = 'su-flex su-justify-center su-transition su-leading su-text-center su-w-40 su-h-40 su-text-24 su-border-2 su-border-digital-red-xlight su-rounded-full group-hover:su-bg-cardinal-red-xdark group-focus:su-bg-cardinal-red-xdark'; diff --git a/src/components/navigation/MegaMenu/megaMenu.js b/src/components/navigation/MegaMenu/megaMenu.js index 609cb1145..1df597266 100644 --- a/src/components/navigation/MegaMenu/megaMenu.js +++ b/src/components/navigation/MegaMenu/megaMenu.js @@ -94,7 +94,7 @@ const MegaMenu = ({ blok: { topLevelLinks }, blok, className }) => { Menu diff --git a/src/components/navigation/MegaMenu/megaMenu.styles.js b/src/components/navigation/MegaMenu/megaMenu.styles.js index 0df855c5f..31558d9ad 100644 --- a/src/components/navigation/MegaMenu/megaMenu.styles.js +++ b/src/components/navigation/MegaMenu/megaMenu.styles.js @@ -3,7 +3,7 @@ import { dcnb } from 'cnbuilder'; // Mobile styles export const rootMobile = 'lg:su-hidden su-flex-shrink-0'; export const menuCircles = - 'su-flex-shrink-0 su-w-34 su-h-34 su-ml-auto su-items-center su-flex su-justify-center su-justify-content-center lg:su-w-auto lg:su-h-[3.4rem] lg:su-pl-16 lg:su-pr-13 su-rounded-full lg:su-text-18 su-text-white su-leading-none su-border-2 su-border-digital-red-xlight su-transition-colors hocus:su-bg-cardinal-red-xxdark xl:hocus:su-bg-cardinal-red-xdark lg:hocus:su-no-underline su-self-center'; + 'su-flex-shrink-0 su-w-34 su-h-34 su-items-center su-flex su-justify-center su-justify-content-center lg:su-w-auto lg:su-h-34 lg:su-pl-16 lg:su-pr-13 su-rounded-full lg:su-text-18 su-text-white su-leading-none su-border-2 su-border-digital-red-xlight su-transition-colors hocus:su-bg-cardinal-red-xxdark xl:hocus:su-bg-cardinal-red-xdark lg:hocus:su-no-underline su-self-center'; export const headerUserCircle = 'su-flex su-justify-center su-transition su-leading su-text-center su-w-40 su-h-40 su-text-24 su-border-2 su-border-digital-red-xlight su-rounded-full group-hover:su-bg-cardinal-red-xdark group-focus:su-bg-cardinal-red-xdark'; diff --git a/src/components/page-types/TripFilterPage/TripFilterModal.styles.js b/src/components/page-types/TripFilterPage/TripFilterModal.styles.js index a1f70f571..e10ee6496 100644 --- a/src/components/page-types/TripFilterPage/TripFilterModal.styles.js +++ b/src/components/page-types/TripFilterPage/TripFilterModal.styles.js @@ -13,6 +13,6 @@ export const footer = export const clearAllBtn = 'su-group su-flex-row su-items-center su-block'; export const clearAllText = 'su-relative su-text-white su-text-18'; export const clearAllHover = - 'su-absolute su-bottom-[-0.5rem] su-left-0 su-w-full su-pt-3 group-hover:su-bg-gradient-to-r group-focus:su-bg-gradient-to-r su-from-palo-verde-dark su-to-saa-electric-blue'; + 'su-absolute su--bottom-5 su-left-0 su-w-full su-pt-3 group-hover:su-bg-gradient-to-r group-focus:su-bg-gradient-to-r su-from-palo-verde-dark su-to-saa-electric-blue'; export const clearAllIcon = 'su-text-saa-electric-blue-light su-ml-8'; export const viewResultsBtn = 'su-text-white su-ml-36'; diff --git a/src/components/page-types/TripFilterPage/TripFilterPage.styles.js b/src/components/page-types/TripFilterPage/TripFilterPage.styles.js index 78658c085..32598b8bc 100644 --- a/src/components/page-types/TripFilterPage/TripFilterPage.styles.js +++ b/src/components/page-types/TripFilterPage/TripFilterPage.styles.js @@ -22,7 +22,7 @@ export const clearAllBtn = 'su-group su-flex-row su-items-center su-block su--mt-15'; export const clearAllText = 'su-relative'; export const clearAllHover = - 'su-absolute su-bottom-[-0.5rem] su-left-0 su-w-full su-pt-3 group-hover:su-bg-gradient-to-r group-focus:su-bg-gradient-to-r su-from-palo-verde-dark su-to-saa-electric-blue'; + 'su-absolute su--bottom-5 su-left-0 su-w-full su-pt-3 group-hover:su-bg-gradient-to-r group-focus:su-bg-gradient-to-r su-from-palo-verde-dark su-to-saa-electric-blue'; export const clearAllIcon = 'su-text-saa-electric-blue-light su-ml-8'; export const filteredContent = 'su-text-white su-col-span-3'; export const trips = diff --git a/src/components/page-types/protectedPage.js b/src/components/page-types/protectedPage.js index 57a4413ef..76d74ee9e 100644 --- a/src/components/page-types/protectedPage.js +++ b/src/components/page-types/protectedPage.js @@ -82,7 +82,7 @@ const ProtectedPage = (props) => { font="serif" srOnly={isSrOnlyTitle} id="page-title" - className="su-max-w-900 su-mb-0 su-rs-py-5 xl:su-rs-py-7 su-type-6 su-mx-auto su-max-w-1200" + className="su-mb-0 su-rs-py-5 xl:su-rs-py-7 su-type-6 su-mx-auto su-max-w-1200" > {title} diff --git a/src/components/simple/tabLabel.js b/src/components/simple/tabLabel.js index c85745d10..0211c5535 100644 --- a/src/components/simple/tabLabel.js +++ b/src/components/simple/tabLabel.js @@ -10,7 +10,7 @@ const TabLabel = ({ text, srText, classes, ...props }) => { return (
Date: Thu, 4 Jan 2024 17:30:45 -0800 Subject: [PATCH 17/25] avatars fixup --- src/components/navigation/MainNav/userNavItems.jsx | 2 +- src/components/navigation/accountLinks.styles.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/navigation/MainNav/userNavItems.jsx b/src/components/navigation/MainNav/userNavItems.jsx index 31c5b64ba..cddddb90b 100644 --- a/src/components/navigation/MainNav/userNavItems.jsx +++ b/src/components/navigation/MainNav/userNavItems.jsx @@ -86,7 +86,7 @@ const UserNavItems = ({ expanded, userProfile }) => { alignItems="center" className="su-px-26 lg:su-px-18 su-rs-pb-1 su-pt-18" > -
+
diff --git a/src/components/navigation/accountLinks.styles.js b/src/components/navigation/accountLinks.styles.js index 4f24f113e..f4975a5fc 100644 --- a/src/components/navigation/accountLinks.styles.js +++ b/src/components/navigation/accountLinks.styles.js @@ -3,7 +3,7 @@ import { dcnb } from 'cnbuilder'; export const initialCircleWrapper = 'su-w-38 su-h-38 su-text-24'; export const initialCircle = - 'su-w-full su-h-full su-transition su-leading su-text-center su-text-white su-border-2 su-border-digital-red-xlight su-rounded-full lg:group-hocus:su-bg-cardinal-red-xxdark xl:group-hocus:su-bg-cardinal-red-dark su-uppercase su-overflow-hidden'; + 'su-transition su-leading su-text-center su-text-white su-border-2 su-border-digital-red-xlight su-rounded-full lg:group-hocus:su-bg-cardinal-red-xxdark xl:group-hocus:su-bg-cardinal-red-dark su-uppercase su-overflow-hidden'; export const greeting = (showDesktopXl) => dcnb( From ee10a5575979195208b1f27447d852afd7d20f56 Mon Sep 17 00:00:00 2001 From: Yvonne Tang Date: Thu, 4 Jan 2024 17:52:54 -0800 Subject: [PATCH 18/25] decanter and Tw plugin can be dev dependencies --- package-lock.json | 100 ++++++++++++++++++++++++++++++++++++---------- package.json | 4 +- 2 files changed, 82 insertions(+), 22 deletions(-) diff --git a/package-lock.json b/package-lock.json index 19ae25107..7b820bc3a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,13 +19,11 @@ "@fortawesome/pro-solid-svg-icons": "^5.15.4", "@fortawesome/react-fontawesome": "^0.2.0", "@heroicons/react": "^1.0.6", - "@tailwindcss/forms": "^0.5.7", "adapt-auth-sdk": "^1.0.20", "algoliasearch": "^4.20.0", "body-parser": "^1.20.2", "cnbuilder": "^3.1.0", "cookie-parser": "^1.4.6", - "decanter": "^7.1.2", "fast-sort": "^3.4.0", "gatsby": "^4.25.7", "gatsby-link": "^4.25.0", @@ -80,10 +78,12 @@ "@babel/plugin-transform-runtime": "^7.23.4", "@babel/preset-env": "^7.23.5", "@babel/preset-react": "^7.23.3", + "@tailwindcss/forms": "^0.5.7", "autoprefixer": "^10.4.16", "axios-mock-adapter": "^1.22.0", "cross-env": "^7.0.3", "cypress": "^13.6.0", + "decanter": "^7.1.2", "dotenv": "^16.3.1", "eslint": "^7.32.0", "eslint-config-airbnb": "^18.2.1", @@ -226,6 +226,7 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz", "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==", + "dev": true, "engines": { "node": ">=10" }, @@ -4944,6 +4945,7 @@ "version": "0.4.2", "resolved": "https://registry.npmjs.org/@tailwindcss/aspect-ratio/-/aspect-ratio-0.4.2.tgz", "integrity": "sha512-8QPrypskfBa7QIMuKHg2TA7BqES6vhBrDLOv8Unb6FcFyd3TjKbc6lcmb9UPQHxfl24sXoJ41ux/H7qQQvfaSQ==", + "dev": true, "peerDependencies": { "tailwindcss": ">=2.0.0 || >=3.0.0 || >=3.0.0-alpha.1" } @@ -4952,6 +4954,7 @@ "version": "0.5.7", "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.7.tgz", "integrity": "sha512-QE7X69iQI+ZXwldE+rzasvbJiyV/ju1FGHH0Qn2W3FKbuYtqp8LKcy6iSw79fVUT5/Vvf+0XgLCeYVG+UV6hOw==", + "dev": true, "dependencies": { "mini-svg-data-uri": "^1.2.3" }, @@ -5838,7 +5841,8 @@ "node_modules/any-promise": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", - "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==" + "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==", + "dev": true }, "node_modules/anymatch": { "version": "3.1.3", @@ -6904,6 +6908,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz", "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==", + "dev": true, "engines": { "node": ">= 6" } @@ -8510,6 +8515,7 @@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/decanter/-/decanter-7.1.2.tgz", "integrity": "sha512-TxhNhB2PtcT4V2SveCjAMhCpIP6XfmYwaNROG1kRZqeHgHarktXI/Clk6sEiY8MQ5/t0pDL+I8dFhAMAQmLI1g==", + "dev": true, "dependencies": { "@tailwindcss/aspect-ratio": "^0.4.2", "@tailwindcss/forms": "^0.5.3", @@ -8771,7 +8777,8 @@ "node_modules/didyoumean": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", - "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==" + "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==", + "dev": true }, "node_modules/dir-glob": { "version": "3.0.1", @@ -8787,7 +8794,8 @@ "node_modules/dlv": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", - "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==" + "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", + "dev": true }, "node_modules/doctrine": { "version": "3.0.0", @@ -14639,6 +14647,7 @@ "version": "1.21.0", "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz", "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==", + "dev": true, "bin": { "jiti": "bin/jiti.js" } @@ -15748,6 +15757,7 @@ "version": "1.4.4", "resolved": "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz", "integrity": "sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==", + "dev": true, "bin": { "mini-svg-data-uri": "cli.js" } @@ -15862,6 +15872,7 @@ "version": "2.7.0", "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", + "dev": true, "dependencies": { "any-promise": "^1.0.0", "object-assign": "^4.0.1", @@ -42046,6 +42057,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==", + "dev": true, "engines": { "node": ">= 6" } @@ -42857,6 +42869,7 @@ "version": "4.0.6", "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", + "dev": true, "engines": { "node": ">= 6" } @@ -43071,6 +43084,7 @@ "version": "15.1.0", "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz", "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==", + "dev": true, "dependencies": { "postcss-value-parser": "^4.0.0", "read-cache": "^1.0.0", @@ -43087,6 +43101,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz", "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==", + "dev": true, "dependencies": { "camelcase-css": "^2.0.1" }, @@ -43303,6 +43318,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz", "integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==", + "dev": true, "dependencies": { "postcss-selector-parser": "^6.0.11" }, @@ -44352,6 +44368,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==", + "dev": true, "dependencies": { "pify": "^2.3.0" } @@ -44360,6 +44377,7 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", + "dev": true, "engines": { "node": ">=0.10.0" } @@ -46408,6 +46426,7 @@ "version": "3.34.0", "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.34.0.tgz", "integrity": "sha512-70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw==", + "dev": true, "dependencies": { "@jridgewell/gen-mapping": "^0.3.2", "commander": "^4.0.0", @@ -46429,6 +46448,7 @@ "version": "0.3.3", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", + "dev": true, "dependencies": { "@jridgewell/set-array": "^1.0.1", "@jridgewell/sourcemap-codec": "^1.4.10", @@ -46442,6 +46462,7 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", + "dev": true, "engines": { "node": ">= 6" } @@ -46450,6 +46471,7 @@ "version": "7.1.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -46572,6 +46594,7 @@ "version": "3.3.5", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.5.tgz", "integrity": "sha512-5SEZU4J7pxZgSkv7FP1zY8i2TIAOooNZ1e/OGtxIEv6GltpoiXUqWvLy89+a10qYTB1N5Ifkuw9lqQkN9sscvA==", + "dev": true, "dependencies": { "@alloc/quick-lru": "^5.2.0", "arg": "^5.0.2", @@ -46608,6 +46631,7 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, "dependencies": { "is-glob": "^4.0.3" }, @@ -46619,6 +46643,7 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz", "integrity": "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==", + "dev": true, "funding": [ { "type": "opencollective", @@ -46653,6 +46678,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz", "integrity": "sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==", + "dev": true, "engines": { "node": ">=14" } @@ -46661,6 +46687,7 @@ "version": "2.3.4", "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz", "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==", + "dev": true, "engines": { "node": ">= 14" } @@ -46814,6 +46841,7 @@ "version": "3.3.1", "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", + "dev": true, "dependencies": { "any-promise": "^1.0.0" } @@ -46822,6 +46850,7 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==", + "dev": true, "dependencies": { "thenify": ">= 3.1.0 < 4" }, @@ -46978,7 +47007,8 @@ "node_modules/ts-interface-checker": { "version": "0.1.13", "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz", - "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==" + "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==", + "dev": true }, "node_modules/tsconfig-paths": { "version": "3.14.2", @@ -48648,7 +48678,8 @@ "@alloc/quick-lru": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz", - "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==" + "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==", + "dev": true }, "@ampproject/remapping": { "version": "2.2.0", @@ -51678,12 +51709,14 @@ "version": "0.4.2", "resolved": "https://registry.npmjs.org/@tailwindcss/aspect-ratio/-/aspect-ratio-0.4.2.tgz", "integrity": "sha512-8QPrypskfBa7QIMuKHg2TA7BqES6vhBrDLOv8Unb6FcFyd3TjKbc6lcmb9UPQHxfl24sXoJ41ux/H7qQQvfaSQ==", + "dev": true, "requires": {} }, "@tailwindcss/forms": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.7.tgz", "integrity": "sha512-QE7X69iQI+ZXwldE+rzasvbJiyV/ju1FGHH0Qn2W3FKbuYtqp8LKcy6iSw79fVUT5/Vvf+0XgLCeYVG+UV6hOw==", + "dev": true, "requires": { "mini-svg-data-uri": "^1.2.3" } @@ -52409,7 +52442,8 @@ "any-promise": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", - "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==" + "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==", + "dev": true }, "anymatch": { "version": "3.1.3", @@ -53184,7 +53218,8 @@ "camelcase-css": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz", - "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==" + "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==", + "dev": true }, "camelcase-keys": { "version": "6.2.2", @@ -54379,6 +54414,7 @@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/decanter/-/decanter-7.1.2.tgz", "integrity": "sha512-TxhNhB2PtcT4V2SveCjAMhCpIP6XfmYwaNROG1kRZqeHgHarktXI/Clk6sEiY8MQ5/t0pDL+I8dFhAMAQmLI1g==", + "dev": true, "requires": { "@tailwindcss/aspect-ratio": "^0.4.2", "@tailwindcss/forms": "^0.5.3", @@ -54578,7 +54614,8 @@ "didyoumean": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", - "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==" + "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==", + "dev": true }, "dir-glob": { "version": "3.0.1", @@ -54591,7 +54628,8 @@ "dlv": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", - "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==" + "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", + "dev": true }, "doctrine": { "version": "3.0.0", @@ -58799,7 +58837,8 @@ "jiti": { "version": "1.21.0", "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz", - "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==" + "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==", + "dev": true }, "joi": { "version": "17.11.0", @@ -59672,7 +59711,8 @@ "mini-svg-data-uri": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz", - "integrity": "sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==" + "integrity": "sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==", + "dev": true }, "minimatch": { "version": "3.1.2", @@ -59762,6 +59802,7 @@ "version": "2.7.0", "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", + "dev": true, "requires": { "any-promise": "^1.0.0", "object-assign": "^4.0.1", @@ -79306,7 +79347,8 @@ "object-hash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", - "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==" + "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==", + "dev": true }, "object-inspect": { "version": "1.13.1", @@ -79913,7 +79955,8 @@ "pirates": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", - "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==" + "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", + "dev": true }, "pkg-dir": { "version": "4.2.0", @@ -80049,6 +80092,7 @@ "version": "15.1.0", "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz", "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==", + "dev": true, "requires": { "postcss-value-parser": "^4.0.0", "read-cache": "^1.0.0", @@ -80059,6 +80103,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz", "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==", + "dev": true, "requires": { "camelcase-css": "^2.0.1" } @@ -80188,6 +80233,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz", "integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==", + "dev": true, "requires": { "postcss-selector-parser": "^6.0.11" } @@ -80930,6 +80976,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==", + "dev": true, "requires": { "pify": "^2.3.0" }, @@ -80937,7 +80984,8 @@ "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==" + "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", + "dev": true } } }, @@ -82494,6 +82542,7 @@ "version": "3.34.0", "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.34.0.tgz", "integrity": "sha512-70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw==", + "dev": true, "requires": { "@jridgewell/gen-mapping": "^0.3.2", "commander": "^4.0.0", @@ -82508,6 +82557,7 @@ "version": "0.3.3", "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", + "dev": true, "requires": { "@jridgewell/set-array": "^1.0.1", "@jridgewell/sourcemap-codec": "^1.4.10", @@ -82517,12 +82567,14 @@ "commander": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", - "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==" + "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", + "dev": true }, "glob": { "version": "7.1.6", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "dev": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -82620,6 +82672,7 @@ "version": "3.3.5", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.5.tgz", "integrity": "sha512-5SEZU4J7pxZgSkv7FP1zY8i2TIAOooNZ1e/OGtxIEv6GltpoiXUqWvLy89+a10qYTB1N5Ifkuw9lqQkN9sscvA==", + "dev": true, "requires": { "@alloc/quick-lru": "^5.2.0", "arg": "^5.0.2", @@ -82649,6 +82702,7 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, "requires": { "is-glob": "^4.0.3" } @@ -82657,6 +82711,7 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz", "integrity": "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==", + "dev": true, "requires": { "lilconfig": "^3.0.0", "yaml": "^2.3.4" @@ -82665,14 +82720,16 @@ "lilconfig": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz", - "integrity": "sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==" + "integrity": "sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==", + "dev": true } } }, "yaml": { "version": "2.3.4", "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz", - "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==" + "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==", + "dev": true } } }, @@ -82768,6 +82825,7 @@ "version": "3.3.1", "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", + "dev": true, "requires": { "any-promise": "^1.0.0" } @@ -82776,6 +82834,7 @@ "version": "1.6.0", "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==", + "dev": true, "requires": { "thenify": ">= 3.1.0 < 4" } @@ -82900,7 +82959,8 @@ "ts-interface-checker": { "version": "0.1.13", "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz", - "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==" + "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==", + "dev": true }, "tsconfig-paths": { "version": "3.14.2", diff --git a/package.json b/package.json index 4e9bdafc0..833a01a79 100644 --- a/package.json +++ b/package.json @@ -14,13 +14,11 @@ "@fortawesome/pro-solid-svg-icons": "^5.15.4", "@fortawesome/react-fontawesome": "^0.2.0", "@heroicons/react": "^1.0.6", - "@tailwindcss/forms": "^0.5.7", "adapt-auth-sdk": "^1.0.20", "algoliasearch": "^4.20.0", "body-parser": "^1.20.2", "cnbuilder": "^3.1.0", "cookie-parser": "^1.4.6", - "decanter": "^7.1.2", "fast-sort": "^3.4.0", "gatsby": "^4.25.7", "gatsby-link": "^4.25.0", @@ -108,10 +106,12 @@ "@babel/plugin-transform-runtime": "^7.23.4", "@babel/preset-env": "^7.23.5", "@babel/preset-react": "^7.23.3", + "@tailwindcss/forms": "^0.5.7", "autoprefixer": "^10.4.16", "axios-mock-adapter": "^1.22.0", "cross-env": "^7.0.3", "cypress": "^13.6.0", + "decanter": "^7.1.2", "dotenv": "^16.3.1", "eslint": "^7.32.0", "eslint-config-airbnb": "^18.2.1", From 0a4fc478da706c0fe6cd8f8b1031bdd691bba495 Mon Sep 17 00:00:00 2001 From: Yvonne Tang Date: Thu, 4 Jan 2024 18:03:10 -0800 Subject: [PATCH 19/25] Fix mega menu 2nd level menu padding --- src/components/navigation/MegaMenu/megaMenuPanel.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/navigation/MegaMenu/megaMenuPanel.js b/src/components/navigation/MegaMenu/megaMenuPanel.js index 207eb0f01..588691c69 100644 --- a/src/components/navigation/MegaMenu/megaMenuPanel.js +++ b/src/components/navigation/MegaMenu/megaMenuPanel.js @@ -99,7 +99,7 @@ const MegaMenuPanel = ({ aria-hidden={!panelOpened} >
- +
0 ? 8 : 12}> @@ -115,7 +115,7 @@ const MegaMenuPanel = ({ )} - +
From 0228f8befe48a2bfce74cf780fd18fb88c277bf5 Mon Sep 17 00:00:00 2001 From: Yvonne Tang Date: Thu, 4 Jan 2024 18:35:25 -0800 Subject: [PATCH 20/25] Modal close button fixups --- src/components/layout/Modal/Modal.styles.js | 6 ++++-- .../page-types/TripFilterPage/TripFilterModal.styles.js | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/components/layout/Modal/Modal.styles.js b/src/components/layout/Modal/Modal.styles.js index 1f8632638..57bb42c62 100644 --- a/src/components/layout/Modal/Modal.styles.js +++ b/src/components/layout/Modal/Modal.styles.js @@ -29,14 +29,16 @@ export const closeButtonWrapper = ({ type }) => }); export const closeButton = ({ type }) => dcnb( - 'su-group su-bg-transparent su-text-white su-font-semibold hocus:su-underline su-text-m1 su-flex su-items-end su-absolute su-top-22 su-right-20 su-z-10', + 'su-group su-bg-transparent su-font-semibold hocus:su-underline su-text-m1 su-flex su-items-end su-absolute su-top-22 su-right-20 su-z-10', { - 'hover:su-bg-digital-red-xlight hocus:su-rounded-full': + 'su-text-white hocus:su-text-white hocus:su-bg-digital-red-xlight hocus:su-rounded-full': type === 'main-menu', 'hocus:su-bg-transparent': type !== 'main-menu', 'su-text-black': type === 'timeout', 'su-text-black hocus:su-bg-white hocus:su-text-digital-red': type === 'mega-menu', + 'su-text-white hocus:su-text-digital-red-xlight': + type !== 'mega-menu' && type !== 'timeout', } ); export const closeIcon = ({ type }) => diff --git a/src/components/page-types/TripFilterPage/TripFilterModal.styles.js b/src/components/page-types/TripFilterPage/TripFilterModal.styles.js index e10ee6496..1d7e2a530 100644 --- a/src/components/page-types/TripFilterPage/TripFilterModal.styles.js +++ b/src/components/page-types/TripFilterPage/TripFilterModal.styles.js @@ -3,13 +3,13 @@ export const filterModalButton = export const filterIcon = 'su-text-saa-electric-blue-light group-hocus:su-text-white'; export const modalHeading = - 'su-fixed su-top-0 su-left-0 su-z-20 su-w-full su-cc su-mb-0 su-rs-py-1 su-text-black-20 su-bg-saa-black-dark su-border-b su-border-black-80'; + 'su-fixed !su-pl-20 sm:!su-pl-30 md:!su-pl-50 su-top-0 su-left-0 su-z-20 su-w-full su-cc su-mb-0 su-rs-py-1 su-text-black-20 su-bg-saa-black-dark su-border-b su-border-black-80'; export const modalBody = 'su-mt-[6.2rem] md:su-mt-[7.7rem] su-pb-[10.1rem] md:su-pb-[11.9rem] su-bg-saa-black-dark'; export const chipsWrapper = 'su-pt-20 su-py-7 su-cc children:su-mr-13 children:su-mb-13'; export const footer = - 'su-fixed su-overflow-hidden su-bottom-0 su-right-0 su-flex su-items-center su-justify-end su-rs-py-2 su-bg-gradient-to-b su-from-saa-black-dark su-to-palo-alto-dark su-w-full su-cc su-border-t su-border-black-80'; + '!su-pr-20 sm:!su-pr-30 su-fixed su-overflow-hidden su-bottom-0 su-right-0 su-flex su-items-center su-justify-end su-rs-py-2 su-bg-gradient-to-b su-from-saa-black-dark su-to-palo-alto-dark su-w-full su-cc su-border-t su-border-black-80'; export const clearAllBtn = 'su-group su-flex-row su-items-center su-block'; export const clearAllText = 'su-relative su-text-white su-text-18'; export const clearAllHover = From 959bfef677c869387129b1e224fdd694296abaae Mon Sep 17 00:00:00 2001 From: Yvonne Tang Date: Fri, 5 Jan 2024 01:15:13 -0800 Subject: [PATCH 21/25] Fix vertical position of CTA link heroicon when placed on the left; remove class that's not valid and not needed --- src/components/cta/SAACtaLink.styles.js | 2 +- src/components/simple/heroIcon.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/cta/SAACtaLink.styles.js b/src/components/cta/SAACtaLink.styles.js index deb48ad8b..415f07484 100644 --- a/src/components/cta/SAACtaLink.styles.js +++ b/src/components/cta/SAACtaLink.styles.js @@ -3,7 +3,7 @@ import { dcnb } from 'cnbuilder'; export const root = 'su-block print:su-hidden'; export const link = 'su-flex su-w-fit su-group su-transition-colors su-no-underline su-underline-offset-[3px] hocus:su-underline'; -export const leadingIconWrapper = 'su-w-fit su-max-w-3rem su-shrink-0'; +export const leadingIconWrapper = 'su-w-fit su-shrink-0'; export const leadingIcon = 'su-mr-06em su-backface-hidden su-text-black-80'; export const trailingIcon = ({ textColor }) => dcnb('su-inline-block', { diff --git a/src/components/simple/heroIcon.js b/src/components/simple/heroIcon.js index b6d25b19a..785f35900 100644 --- a/src/components/simple/heroIcon.js +++ b/src/components/simple/heroIcon.js @@ -44,7 +44,7 @@ const HeroIcon = ({ iconType, srText, isAnimate, className, ...props }) => { }, 'arrow-left': { heroicon: ArrowLeftIcon, - baseStyle: 'su-w-08em su-mr-03em su-mt-02em', + baseStyle: 'su-w-08em su-mr-03em su--mt-02em', animate: 'group-hocus:su--translate-x-02em', }, 'arrow-right': { From 9c644431b1a84c47fa109ca26796b7b31b4566cb Mon Sep 17 00:00:00 2001 From: Yvonne Tang Date: Fri, 5 Jan 2024 11:17:22 -0800 Subject: [PATCH 22/25] T/S mobile section menu background color fix --- src/components/page-types/TripPage/TripPageSectionNav.styles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/page-types/TripPage/TripPageSectionNav.styles.js b/src/components/page-types/TripPage/TripPageSectionNav.styles.js index a08974548..021277f7d 100644 --- a/src/components/page-types/TripPage/TripPageSectionNav.styles.js +++ b/src/components/page-types/TripPage/TripPageSectionNav.styles.js @@ -33,7 +33,7 @@ export const burgerIcon = ({ navOpened }) => }); export const menuMobile = ({ navOpened }) => dcnb( - 'su-flex su-flex-col su-absolute su-z-20 su-bg-saa-black su-shadow-xl su-bg-white su-w-full', + 'su-flex su-flex-col su-absolute su-z-20 su-bg-saa-black su-shadow-xl su-w-full', 'su-border-l su-border-r su-border-b su-border-black-80', { 'su-block': navOpened, From b25521a64e594c4479aa86716e98fb2451869872 Mon Sep 17 00:00:00 2001 From: Yvonne Tang Date: Fri, 5 Jan 2024 11:31:27 -0800 Subject: [PATCH 23/25] TS trip filter modal fix for mobile --- src/components/layout/Modal/Modal.styles.js | 4 +++- .../page-types/TripFilterPage/TripFilterModal.styles.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/layout/Modal/Modal.styles.js b/src/components/layout/Modal/Modal.styles.js index 57bb42c62..82a522648 100644 --- a/src/components/layout/Modal/Modal.styles.js +++ b/src/components/layout/Modal/Modal.styles.js @@ -29,7 +29,7 @@ export const closeButtonWrapper = ({ type }) => }); export const closeButton = ({ type }) => dcnb( - 'su-group su-bg-transparent su-font-semibold hocus:su-underline su-text-m1 su-flex su-items-end su-absolute su-top-22 su-right-20 su-z-10', + 'su-group su-bg-transparent su-font-semibold hocus:su-underline su-text-m1 su-flex su-items-end su-absolute su-top-22 su-z-10', { 'su-text-white hocus:su-text-white hocus:su-bg-digital-red-xlight hocus:su-rounded-full': type === 'main-menu', @@ -39,6 +39,8 @@ export const closeButton = ({ type }) => type === 'mega-menu', 'su-text-white hocus:su-text-digital-red-xlight': type !== 'mega-menu' && type !== 'timeout', + 'su-right-0': type === 'trip-filter', + 'su-right-20': type !== 'trip-filter', } ); export const closeIcon = ({ type }) => diff --git a/src/components/page-types/TripFilterPage/TripFilterModal.styles.js b/src/components/page-types/TripFilterPage/TripFilterModal.styles.js index 1d7e2a530..8184857fc 100644 --- a/src/components/page-types/TripFilterPage/TripFilterModal.styles.js +++ b/src/components/page-types/TripFilterPage/TripFilterModal.styles.js @@ -9,7 +9,7 @@ export const modalBody = export const chipsWrapper = 'su-pt-20 su-py-7 su-cc children:su-mr-13 children:su-mb-13'; export const footer = - '!su-pr-20 sm:!su-pr-30 su-fixed su-overflow-hidden su-bottom-0 su-right-0 su-flex su-items-center su-justify-end su-rs-py-2 su-bg-gradient-to-b su-from-saa-black-dark su-to-palo-alto-dark su-w-full su-cc su-border-t su-border-black-80'; + '!su-pr-20 sm:!su-pr-30 md:!su-pr-50 su-fixed su-overflow-hidden su-bottom-0 su-right-0 su-flex su-items-center su-justify-end su-rs-py-2 su-bg-gradient-to-b su-from-saa-black-dark su-to-palo-alto-dark su-w-full su-cc su-border-t su-border-black-80'; export const clearAllBtn = 'su-group su-flex-row su-items-center su-block'; export const clearAllText = 'su-relative su-text-white su-text-18'; export const clearAllHover = From c5820b3ef0f3d5d046a66880871fd5bcce87ac4c Mon Sep 17 00:00:00 2001 From: Yvonne Tang Date: Fri, 5 Jan 2024 11:43:03 -0800 Subject: [PATCH 24/25] chips wrapper padding --- .../page-types/TripFilterPage/TripFilterModal.styles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/page-types/TripFilterPage/TripFilterModal.styles.js b/src/components/page-types/TripFilterPage/TripFilterModal.styles.js index 8184857fc..70062f3e5 100644 --- a/src/components/page-types/TripFilterPage/TripFilterModal.styles.js +++ b/src/components/page-types/TripFilterPage/TripFilterModal.styles.js @@ -7,7 +7,7 @@ export const modalHeading = export const modalBody = 'su-mt-[6.2rem] md:su-mt-[7.7rem] su-pb-[10.1rem] md:su-pb-[11.9rem] su-bg-saa-black-dark'; export const chipsWrapper = - 'su-pt-20 su-py-7 su-cc children:su-mr-13 children:su-mb-13'; + 'su-pt-20 su-py-7 px-20 sm:px-30 md:px-50 children:su-mr-13 children:su-mb-13'; export const footer = '!su-pr-20 sm:!su-pr-30 md:!su-pr-50 su-fixed su-overflow-hidden su-bottom-0 su-right-0 su-flex su-items-center su-justify-end su-rs-py-2 su-bg-gradient-to-b su-from-saa-black-dark su-to-palo-alto-dark su-w-full su-cc su-border-t su-border-black-80'; export const clearAllBtn = 'su-group su-flex-row su-items-center su-block'; From 6f97cbf4c836cc26b69c6614d922a8b6904bd43f Mon Sep 17 00:00:00 2001 From: Sherakama Date: Fri, 5 Jan 2024 13:34:00 -0800 Subject: [PATCH 25/25] Update .browserslistrc