diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3c6e77f..001379c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,6 +1,9 @@ name: Cypress Tests -on: [push] +on: + push: + branches: + - main jobs: cypress-run: diff --git a/.prettierrc.cjs b/.prettierrc.cjs index 7967c6b..d0afabd 100644 --- a/.prettierrc.cjs +++ b/.prettierrc.cjs @@ -1,16 +1,14 @@ module.exports = { - "useTabs": false, - "tabWidth": 2, - "endOfLine": "lf", - "trailingComma": "none", - "semi": true, - "singleQuote": true, - "bracketSpacing": true, - "importOrder": ["^@core/(.*)$", "^[./]"], - "cssDeclarationSorterKeepOverrides": false, - "plugins": [ - "@trivago/prettier-plugin-sort-imports", - "prettier-plugin-css-order", - "prettier-plugin-tailwindcss" + useTabs: false, + tabWidth: 2, + endOfLine: 'lf', + trailingComma: 'none', + semi: true, + singleQuote: true, + cssDeclarationSorterKeepOverrides: false, + plugins: [ + '@trivago/prettier-plugin-sort-imports', + 'prettier-plugin-css-order', + 'prettier-plugin-tailwindcss' ] -} +}; diff --git a/.vscode/settings.json b/.vscode/settings.json index 1b6457c..a9dc161 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,10 @@ { "editor.formatOnSave": true, - "editor.defaultFormatter": "esbenp.prettier-vscode" + "editor.defaultFormatter": "esbenp.prettier-vscode", + "files.associations": { + "*.css": "tailwindcss" + }, + "editor.quickSuggestions": { + "strings": "on" + } } diff --git a/index.html b/index.html index 49ff2fa..0312ff6 100644 --- a/index.html +++ b/index.html @@ -8,7 +8,7 @@ Little Lemon Restaurant - + diff --git a/src/index.css b/src/index.css index c1d9611..ad6e150 100644 --- a/src/index.css +++ b/src/index.css @@ -8,7 +8,7 @@ body { min-height: 100vh; font-size: 16px; line-height: 1.5; - font-family: Karla, Helvetica, Arial, sans-serif; + font-family: Karla, 'Helvetica Neue', Arial, sans-serif; } #root { diff --git a/tailwind.config.js b/tailwind.config.js index 803db16..54ec0ca 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -3,7 +3,7 @@ export default { content: ['./index.html', './src/**/*.{js,jsx}'], theme: { fontFamily: { - sans: ['Karla', 'Helvetica', 'Arial', 'sans-serif'], + sans: ['Karla', 'Helvetica Neue', 'Arial', 'sans-serif'], serif: ['Markazi Text', 'Georgia', 'Times New Roman', 'serif'] }, colors: { diff --git a/vitest-setup.js b/vitest-setup.js index c1bcfb9..c26ac59 100644 --- a/vitest-setup.js +++ b/vitest-setup.js @@ -1,7 +1,6 @@ import '@testing-library/jest-dom/vitest'; import { cleanup } from '@testing-library/react'; -import { afterEach } from 'vitest'; afterEach(() => { - cleanup(); + cleanup(); });