diff --git a/.husky/pre-commit b/.husky/pre-commit index d0a7784..bc3ab45 100644 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1 +1,4 @@ -npx lint-staged \ No newline at end of file +npx lint-staged + +echo "Running test build..." +npm run build \ No newline at end of file diff --git a/package.json b/package.json index 5e15dfb..7b1b1da 100644 --- a/package.json +++ b/package.json @@ -31,8 +31,8 @@ }, "lint-staged": { "*.{js,jsx,ts,tsx}": [ - "eslint --fix", - "prettier --write" + "prettier --write", + "eslint --fix" ] } } diff --git a/public/images/bg-form.jpg b/public/images/bg-form.jpg new file mode 100644 index 0000000..e9e9b6b Binary files /dev/null and b/public/images/bg-form.jpg differ diff --git a/public/images/bogatyr.png b/public/images/bogatyr.png new file mode 100644 index 0000000..498db38 Binary files /dev/null and b/public/images/bogatyr.png differ diff --git a/public/images/chateau-de-talu.png b/public/images/chateau-de-talu.png new file mode 100644 index 0000000..58d0e50 Binary files /dev/null and b/public/images/chateau-de-talu.png differ diff --git a/public/images/school-20.png b/public/images/school-20.png new file mode 100644 index 0000000..3f837ed Binary files /dev/null and b/public/images/school-20.png differ diff --git a/src/core/styles/variables.scss b/src/core/styles/variables.scss index f4e84b3..309f036 100644 --- a/src/core/styles/variables.scss +++ b/src/core/styles/variables.scss @@ -8,8 +8,9 @@ $desktop: 1440px; //fonts $font-open-sans: var(--open-sans), sans-serif; +$font-light: 300; $font-regular: 400; -$font-medium: 400; +$font-medium: 500; $font-semi-bold: 600; // colors diff --git a/src/views/home/ui/home.tsx b/src/views/home/ui/home.tsx index 8b0497d..63ade2b 100644 --- a/src/views/home/ui/home.tsx +++ b/src/views/home/ui/home.tsx @@ -1,6 +1,6 @@ import Main from './main/main'; import Offer from './offer/offer'; -// import Result from './result/result'; +import Result from './result/result'; // import License from './license/license'; // import Contacts from './contacts/contacts'; // import Footer from './footer/footer'; @@ -10,7 +10,7 @@ export default function HomePage() { <>
- {/**/} + {/**/} {/**/} {/*