Skip to content

Commit

Permalink
🎨 Fix details
Browse files Browse the repository at this point in the history
  • Loading branch information
jyboy committed Apr 13, 2024
1 parent f40b095 commit 2b7efce
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 21 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: Cypress Tests

on: [push]
on:
push:
branches:
- main

jobs:
cypress-run:
Expand Down
26 changes: 12 additions & 14 deletions .prettierrc.cjs
Original file line number Diff line number Diff line change
@@ -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'
]
}
};
8 changes: 7 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<title>Little Lemon Restaurant</title>
<meta name="description"
content="We are a family owned Mediterranean restaurant, focused on traditional recipes served with a modern twist." />
<meta name="author" content="github.com/jyboy" />
<meta name="author" content="@jyboy" />
<meta name="og:title" content="Little Lemon Restaurant" />
<meta name="og:description"
content="We are a family owned Mediterranean restaurant, focused on traditional recipes served with a modern twist." />
Expand Down
2 changes: 1 addition & 1 deletion src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
3 changes: 1 addition & 2 deletions vitest-setup.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import '@testing-library/jest-dom/vitest';
import { cleanup } from '@testing-library/react';
import { afterEach } from 'vitest';

afterEach(() => {
cleanup();
cleanup();
});

0 comments on commit 2b7efce

Please sign in to comment.