diff --git a/.github/workflows/test.yml-template b/.github/workflows/test.yml-template new file mode 100644 index 000000000..8b5743ecb --- /dev/null +++ b/.github/workflows/test.yml-template @@ -0,0 +1,29 @@ +name: Test + +on: + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [20.x] + + steps: + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + - run: npm install + - run: npm test + - name: Upload HTML report(backstop data) + if: ${{ always() }} + uses: actions/upload-artifact@v2 + with: + name: report + path: backstop_data diff --git a/README.md b/README.md index 5f9e97051..2b143290e 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Check font styles. Use [IBM Plex Sans](https://fonts.google.com/specimen/IBM+Ple 11. `git push origin develop` - to send you code for PR. 12. Create a Pull Request (PR) from your branch `develop` to branch `master` of original repo. 13. Replace `` with your Github username in the - [DEMO LINK](https://.github.io/Museum/). + [DEMO LINK](https://devsync25.github.io/Museum/). 14. Copy `DEMO LINK` to the PR description. > To update you PR repeat steps 7-11. diff --git a/index.html b/index.html index d339e6856..e547206ea 100644 --- a/index.html +++ b/index.html @@ -1,3 +1,4 @@ + @@ -6,14 +7,261 @@ name="viewport" content="width=device-width, initial-scale=1.0" /> - Title + Національний художній музей України - -

Hello Mate Academy

+ + + + +
+
+
+
+ + + +
+ +
+ ХУДОЖНІЙ МУЗЕЙ +
+ +
+

ХУДОЖНІЙ МУЗЕЙ

+ + КВИТКИ + + + + + + + + + ПОДІЇ + +
+
+
+
+ + + + + + +
+ +
+
+

Актуальні події

+ +
+
+
+
+ Йду і повертаюсь +
+
+
+ ВИСТАВКА + + 26.08-29.11.2019 + +
+

Йду і повертаюсь

+

+ Національний Художній Музей України презентує унікальну + частину колекції Градобанку - українське мистецтво другої + половини 1980-1995 років. +

+
+
+
+ +
+
+
+ І спогади і мрії +
+
+
+ ВИСТАВКА + + 26.08-29.11.2019 + +
+

І спогади і мрії

+

+ Національний художній музей України до 100 річчя від дня + народження видатної української художниці Тетяни Яблонської + відкриває ретроспективну ювілейну виставку «І спогади і + мрії». +

+
+
+
+ +
+
+ Від класицизму до романтизму +
+
+
+ ЛЕКЦІЯ + + 26/08/2019 - 11:00 + +
+

+ Від класицизму до романтизму +

+
+
+
+
+
+ + +
+ diff --git a/package-lock.json b/package-lock.json index fbfeb1428..1e3cacffb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@mate-academy/eslint-config": "latest", "@mate-academy/jest-mochawesome-reporter": "^1.0.0", "@mate-academy/linthtml-config": "latest", - "@mate-academy/scripts": "^2.1.1", + "@mate-academy/scripts": "^2.1.3", "@mate-academy/stylelint-config": "latest", "cypress": "^13.13.0", "eslint": "^8.57.0", @@ -60,6 +60,7 @@ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.5.tgz", "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==", "dev": true, + "peer": true, "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.5", @@ -544,6 +545,7 @@ "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.5.4.tgz", "integrity": "sha512-eohl3hKTiVyD1ilYdw9T0OiB4hnjef89e3dMYKz+mVKDzj+5IteTseASUsOB+EU9Tf6VNTCjDePcP6wkDGmLKQ==", "dev": true, + "peer": true, "dependencies": { "@keyv/serialize": "^1.1.1" } @@ -592,6 +594,7 @@ "url": "https://opencollective.com/csstools" } ], + "peer": true, "engines": { "node": ">=18" }, @@ -633,6 +636,7 @@ "url": "https://opencollective.com/csstools" } ], + "peer": true, "engines": { "node": ">=18" } @@ -1315,7 +1319,6 @@ "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", "dev": true, - "peer": true, "dependencies": { "string-width": "^5.1.2", "string-width-cjs": "npm:string-width@^4.2.0", @@ -1333,7 +1336,6 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", "dev": true, - "peer": true, "engines": { "node": ">=12" }, @@ -1346,7 +1348,6 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", "dev": true, - "peer": true, "engines": { "node": ">=12" }, @@ -1358,15 +1359,13 @@ "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true, - "peer": true + "dev": true }, "node_modules/@isaacs/cliui/node_modules/string-width": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", "dev": true, - "peer": true, "dependencies": { "eastasianwidth": "^0.2.0", "emoji-regex": "^9.2.2", @@ -1384,7 +1383,6 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", "dev": true, - "peer": true, "dependencies": { "ansi-regex": "^6.0.1" }, @@ -1400,7 +1398,6 @@ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", "dev": true, - "peer": true, "dependencies": { "ansi-styles": "^6.1.0", "string-width": "^5.0.1", @@ -1875,10 +1872,11 @@ "dev": true }, "node_modules/@mate-academy/scripts": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-2.1.2.tgz", - "integrity": "sha512-gUXFdqqOfYzF9R3RSx2pCa5GLdOkxB9bFbF+dpUpzucdgGAANqOGdqpmNnMj+e3xA9YHraUWq3xo9cwe5vD9pQ==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@mate-academy/scripts/-/scripts-2.1.3.tgz", + "integrity": "sha512-a07wHTj/1QUK2Aac5zHad+sGw4rIvcNl5lJmJpAD7OxeSbnCdyI6RXUHwXhjF5MaVo9YHrJ0xVahyERS2IIyBQ==", "dev": true, + "license": "MIT", "dependencies": { "@octokit/rest": "^17.11.2", "@types/get-port": "^4.2.0", @@ -1955,7 +1953,6 @@ "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-6.0.0.tgz", "integrity": "sha512-P4YJBPdPSpWTQ1NU4XYdvHvXJJDxM6YwpS0FZHRgP7YFkdVxsWcpWGy/NVqlAA7PcPCnMacXlRm1y2PFZRWL/w==", "dev": true, - "peer": true, "engines": { "node": ">= 20" } @@ -1984,7 +1981,6 @@ "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-11.0.2.tgz", "integrity": "sha512-4zCpzP1fWc7QlqunZ5bSEjxc6yLAlRTnDwKtgXfcI/FxxGoqedDG8V2+xJ60bV2kODqcGB+nATdtap/XYq2NZQ==", "dev": true, - "peer": true, "dependencies": { "@octokit/types": "^16.0.0", "universal-user-agent": "^7.0.2" @@ -1998,7 +1994,6 @@ "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-9.0.3.tgz", "integrity": "sha512-grAEuupr/C1rALFnXTv6ZQhFuL1D8G5y8CN04RgrO4FIPMrtm+mcZzFG7dcBm+nq+1ppNixu+Jd78aeJOYxlGA==", "dev": true, - "peer": true, "dependencies": { "@octokit/request": "^10.0.6", "@octokit/types": "^16.0.0", @@ -2012,8 +2007,7 @@ "version": "27.0.0", "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-27.0.0.tgz", "integrity": "sha512-whrdktVs1h6gtR+09+QsNk2+FO+49j6ga1c55YZudfEG+oKJVvJLQi3zkOm5JjiUXAagWK2tI2kTGKJ2Ys7MGA==", - "dev": true, - "peer": true + "dev": true }, "node_modules/@octokit/plugin-paginate-rest": { "version": "2.21.3", @@ -2075,7 +2069,6 @@ "resolved": "https://registry.npmjs.org/@octokit/request/-/request-10.0.7.tgz", "integrity": "sha512-v93h0i1yu4idj8qFPZwjehoJx4j3Ntn+JhXsdJrG9pYaX6j/XRz2RmasMUHtNgQD39nrv/VwTWSqK0RNXR8upA==", "dev": true, - "peer": true, "dependencies": { "@octokit/endpoint": "^11.0.2", "@octokit/request-error": "^7.0.2", @@ -2092,7 +2085,6 @@ "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-7.1.0.tgz", "integrity": "sha512-KMQIfq5sOPpkQYajXHwnhjCC0slzCNScLHs9JafXc4RAJI+9f+jNDlBNaIMTvazOPLgb4BnlhGJOTbnN0wIjPw==", "dev": true, - "peer": true, "dependencies": { "@octokit/types": "^16.0.0" }, @@ -2280,7 +2272,6 @@ "resolved": "https://registry.npmjs.org/@octokit/types/-/types-16.0.0.tgz", "integrity": "sha512-sKq+9r1Mm4efXW1FCk7hFSeJo4QKreL/tTbR0rz/qx/r1Oa2VV83LTA/H/MuCOX7uCIJmQVRKBcbmWoySjAnSg==", "dev": true, - "peer": true, "dependencies": { "@octokit/openapi-types": "^27.0.0" } @@ -2587,7 +2578,6 @@ "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", "dev": true, "optional": true, - "peer": true, "engines": { "node": ">=14" } @@ -3073,6 +3063,7 @@ "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz", "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==", "dev": true, + "peer": true, "dependencies": { "undici-types": "~7.16.0" } @@ -3156,6 +3147,7 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -3725,8 +3717,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-4.0.0.tgz", "integrity": "sha512-q6tR3RPqIB1pMiTRMFcZwuG5T8vwp+vUvEG0vuI6B+Rikh5BfPp2fQ82c925FOs+b0lcFQ8CFrL+KbilfZFhOQ==", - "dev": true, - "peer": true + "dev": true }, "node_modules/bl": { "version": "4.1.0", @@ -3777,8 +3768,7 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", - "dev": true, - "peer": true + "dev": true }, "node_modules/browserslist": { "version": "4.28.0", @@ -3799,6 +3789,7 @@ "url": "https://github.com/sponsors/ai" } ], + "peer": true, "dependencies": { "baseline-browser-mapping": "^2.8.25", "caniuse-lite": "^1.0.30001754", @@ -4797,7 +4788,6 @@ "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz", "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==", "dev": true, - "peer": true, "engines": { "node": ">=0.3.1" } @@ -4939,8 +4929,7 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true, - "peer": true + "dev": true }, "node_modules/ecc-jsbn": { "version": "0.1.2", @@ -4990,6 +4979,7 @@ "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz", "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==", "dev": true, + "peer": true, "dependencies": { "ansi-colors": "^4.1.1", "strip-ansi": "^6.0.1" @@ -5274,6 +5264,7 @@ "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", "dev": true, + "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -5329,6 +5320,7 @@ "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.2.tgz", "integrity": "sha512-iI1f+D2ViGn+uvv5HuHVUamg8ll4tN+JRHGc6IJi4TP9Kl976C57fzPXgseXNs8v0iA8aSJpHsTWjDb9QJamGQ==", "dev": true, + "peer": true, "bin": { "eslint-config-prettier": "bin/cli.js" }, @@ -5431,6 +5423,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz", "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==", "dev": true, + "peer": true, "dependencies": { "@rtsao/scc": "^1.1.0", "array-includes": "^3.1.9", @@ -5485,6 +5478,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz", "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==", "dev": true, + "peer": true, "dependencies": { "eslint-plugin-es": "^3.0.0", "eslint-utils": "^2.0.0", @@ -5535,6 +5529,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-4.3.1.tgz", "integrity": "sha512-bY2sGqyptzFBDLh/GMbAxfdJC+b0f23ME63FOE4+Jao0oZ3E1LEwFtWJX/1pGMJLiTtrSSern2CRM/g+dfc0eQ==", "dev": true, + "peer": true, "engines": { "node": ">=6" } @@ -5558,6 +5553,7 @@ "url": "https://feross.org/support" } ], + "peer": true, "peerDependencies": { "eslint": ">=5.0.0" } @@ -5926,8 +5922,7 @@ "type": "opencollective", "url": "https://opencollective.com/fastify" } - ], - "peer": true + ] }, "node_modules/fast-deep-equal": { "version": "3.1.3", @@ -6099,7 +6094,6 @@ "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", "dev": true, - "peer": true, "bin": { "flat": "cli.js" } @@ -6144,7 +6138,6 @@ "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", "dev": true, - "peer": true, "dependencies": { "cross-spawn": "^7.0.6", "signal-exit": "^4.0.1" @@ -6161,7 +6154,6 @@ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "dev": true, - "peer": true, "engines": { "node": ">=14" }, @@ -6697,7 +6689,6 @@ "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", "dev": true, - "peer": true, "bin": { "he": "bin/he" } @@ -7620,7 +7611,6 @@ "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", "dev": true, - "peer": true, "dependencies": { "@isaacs/cliui": "^8.0.2" }, @@ -8987,7 +8977,6 @@ "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", "dev": true, - "peer": true, "engines": { "node": ">=16 || 14 >=14.17" } @@ -8997,7 +8986,6 @@ "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.5.tgz", "integrity": "sha512-mTT6RgopEYABzXWFx+GcJ+ZQ32kp4fMf0xvpZIIfSq9Z8lC/++MtcCnQ9t5FP2veYEP95FIYSvW+U9fV4xrlig==", "dev": true, - "peer": true, "dependencies": { "browser-stdout": "^1.3.1", "chokidar": "^4.0.1", @@ -9033,15 +9021,13 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true, - "peer": true + "dev": true }, "node_modules/mocha/node_modules/brace-expansion": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", "dev": true, - "peer": true, "dependencies": { "balanced-match": "^1.0.0" } @@ -9051,7 +9037,6 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, - "peer": true, "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -9068,7 +9053,6 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz", "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==", "dev": true, - "peer": true, "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", @@ -9089,7 +9073,6 @@ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", "dev": true, - "peer": true, "dependencies": { "argparse": "^2.0.1" }, @@ -9102,7 +9085,6 @@ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, - "peer": true, "dependencies": { "p-locate": "^5.0.0" }, @@ -9118,7 +9100,6 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "dev": true, - "peer": true, "dependencies": { "brace-expansion": "^2.0.1" }, @@ -9134,7 +9115,6 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, - "peer": true, "dependencies": { "p-limit": "^3.0.2" }, @@ -9150,7 +9130,6 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", "dev": true, - "peer": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -9166,7 +9145,6 @@ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", "dev": true, - "peer": true, "engines": { "node": ">=12" } @@ -9871,8 +9849,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", - "dev": true, - "peer": true + "dev": true }, "node_modules/parent-module": { "version": "1.0.1", @@ -9966,7 +9943,6 @@ "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", "dev": true, - "peer": true, "dependencies": { "lru-cache": "^10.2.0", "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" @@ -9982,8 +9958,7 @@ "version": "10.4.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "dev": true, - "peer": true + "dev": true }, "node_modules/path-to-regexp": { "version": "1.9.0", @@ -10097,6 +10072,7 @@ "url": "https://github.com/sponsors/ai" } ], + "peer": true, "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", @@ -10175,6 +10151,7 @@ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.1.tgz", "integrity": "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==", "dev": true, + "peer": true, "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" @@ -10212,6 +10189,7 @@ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.7.3.tgz", "integrity": "sha512-QgODejq9K3OzoBbuyobZlUhznP5SKwPqp+6Q6xw6o8gnhr4O85L2U915iM2IDcfF2NPXVaM9zlo9tdwipnYwzg==", "dev": true, + "peer": true, "bin": { "prettier": "bin/prettier.cjs" }, @@ -10431,7 +10409,6 @@ "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", "dev": true, - "peer": true, "dependencies": { "safe-buffer": "^5.1.0" } @@ -10921,6 +10898,7 @@ "resolved": "https://registry.npmjs.org/sass/-/sass-1.94.2.tgz", "integrity": "sha512-N+7WK20/wOr7CzA2snJcUSSNTCzeCGUTFY3OgeQP3mZ1aj9NMQ0mSTXwlrnd89j33zzQJGqIN52GIOmYrfq46A==", "dev": true, + "peer": true, "dependencies": { "chokidar": "^4.0.0", "immutable": "^5.0.2", @@ -10962,7 +10940,6 @@ "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", "dev": true, - "peer": true, "dependencies": { "randombytes": "^2.1.0" } @@ -11360,7 +11337,6 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, - "peer": true, "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -11444,7 +11420,6 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, - "peer": true, "dependencies": { "ansi-regex": "^5.0.1" }, @@ -11518,6 +11493,7 @@ "url": "https://github.com/sponsors/stylelint" } ], + "peer": true, "dependencies": { "@csstools/css-parser-algorithms": "^3.0.5", "@csstools/css-syntax-patches-for-csstree": "^1.0.19", @@ -12058,6 +12034,7 @@ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, + "peer": true, "engines": { "node": ">=12" }, @@ -12353,8 +12330,7 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.3.tgz", "integrity": "sha512-TmnEAEAsBJVZM/AADELsK76llnwcf9vMKuPz8JflO1frO8Lchitr0fNaN9d+Ap0BjKtqWqd/J17qeDnXh8CL2A==", - "dev": true, - "peer": true + "dev": true }, "node_modules/universalify": { "version": "2.0.1", @@ -12576,6 +12552,7 @@ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "dev": true, + "peer": true, "engines": { "node": ">=12" }, @@ -12933,8 +12910,7 @@ "version": "9.3.4", "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-9.3.4.tgz", "integrity": "sha512-TmPRQYYSAnnDiEB0P/Ytip7bFGvqnSU6I2BcuSw7Hx+JSg/DsUi5ebYfc8GYaSdpuvOcEs6dXxPurOYpe9QFwg==", - "dev": true, - "peer": true + "dev": true }, "node_modules/wrap-ansi": { "version": "6.2.0", @@ -12956,7 +12932,6 @@ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, - "peer": true, "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -13039,23 +13014,6 @@ "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true }, - "node_modules/yaml": { - "version": "2.8.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.2.tgz", - "integrity": "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==", - "dev": true, - "optional": true, - "peer": true, - "bin": { - "yaml": "bin.mjs" - }, - "engines": { - "node": ">= 14.6" - }, - "funding": { - "url": "https://github.com/sponsors/eemeli" - } - }, "node_modules/yargs": { "version": "17.7.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", @@ -13088,7 +13046,6 @@ "resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz", "integrity": "sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==", "dev": true, - "peer": true, "dependencies": { "camelcase": "^6.0.0", "decamelize": "^4.0.0", @@ -13104,7 +13061,6 @@ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", "dev": true, - "peer": true, "engines": { "node": ">=10" }, @@ -13117,7 +13073,6 @@ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz", "integrity": "sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==", "dev": true, - "peer": true, "engines": { "node": ">=10" }, @@ -13130,7 +13085,6 @@ "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz", "integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==", "dev": true, - "peer": true, "engines": { "node": ">=8" } diff --git a/package.json b/package.json index ab5f87b9b..d2c5a8560 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "@mate-academy/eslint-config": "latest", "@mate-academy/jest-mochawesome-reporter": "^1.0.0", "@mate-academy/linthtml-config": "latest", - "@mate-academy/scripts": "^2.1.1", + "@mate-academy/scripts": "^2.1.3", "@mate-academy/stylelint-config": "latest", "cypress": "^13.13.0", "eslint": "^8.57.0", diff --git a/src/fonts/IBMPlexSans-Bold.woff2 b/src/fonts/IBMPlexSans-Bold.woff2 new file mode 100644 index 000000000..ab6057b19 Binary files /dev/null and b/src/fonts/IBMPlexSans-Bold.woff2 differ diff --git a/src/fonts/IBMPlexSans-Light.woff2 b/src/fonts/IBMPlexSans-Light.woff2 new file mode 100644 index 000000000..e2e9d1bf0 Binary files /dev/null and b/src/fonts/IBMPlexSans-Light.woff2 differ diff --git a/src/fonts/IBMPlexSans-Medium.woff2 b/src/fonts/IBMPlexSans-Medium.woff2 new file mode 100644 index 000000000..9a1d06397 Binary files /dev/null and b/src/fonts/IBMPlexSans-Medium.woff2 differ diff --git a/src/fonts/IBMPlexSans-Regular.woff2 b/src/fonts/IBMPlexSans-Regular.woff2 new file mode 100644 index 000000000..527c791c1 Binary files /dev/null and b/src/fonts/IBMPlexSans-Regular.woff2 differ diff --git a/src/fonts/Montserrat-Bold.woff2 b/src/fonts/Montserrat-Bold.woff2 new file mode 100644 index 000000000..077c1acc7 Binary files /dev/null and b/src/fonts/Montserrat-Bold.woff2 differ diff --git a/src/fonts/Montserrat-Regular.woff2 b/src/fonts/Montserrat-Regular.woff2 new file mode 100644 index 000000000..69cd58e99 Binary files /dev/null and b/src/fonts/Montserrat-Regular.woff2 differ diff --git a/src/fonts/Roboto-Regular-webfont.woff b/src/fonts/Roboto-Regular-webfont.woff deleted file mode 100755 index 8aa07d731..000000000 Binary files a/src/fonts/Roboto-Regular-webfont.woff and /dev/null differ diff --git a/src/images/current-events/current-event-1.jpg b/src/images/current-events/current-event-1.jpg new file mode 100644 index 000000000..c4d8784d0 Binary files /dev/null and b/src/images/current-events/current-event-1.jpg differ diff --git a/src/images/current-events/current-event-2.jpg b/src/images/current-events/current-event-2.jpg new file mode 100644 index 000000000..228e46ef9 Binary files /dev/null and b/src/images/current-events/current-event-2.jpg differ diff --git a/src/images/current-events/current-event-3.jpg b/src/images/current-events/current-event-3.jpg new file mode 100644 index 000000000..2204c9719 Binary files /dev/null and b/src/images/current-events/current-event-3.jpg differ diff --git a/src/images/hero.jpg b/src/images/hero.jpg new file mode 100644 index 000000000..79b35dcc4 Binary files /dev/null and b/src/images/hero.jpg differ diff --git a/src/scripts/main.js b/src/scripts/main.js index ad9a93a7c..1454d8ca6 100644 --- a/src/scripts/main.js +++ b/src/scripts/main.js @@ -1 +1,13 @@ 'use strict'; + +const burger = document.querySelector('.header__burger'); +const menu = document.querySelector('#menu'); +const closeBtn = document.querySelector('.menu__close'); + +burger.addEventListener('click', () => { + menu.classList.add('is-open'); +}); + +closeBtn.addEventListener('click', () => { + menu.classList.remove('is-open'); +}); diff --git a/src/styles/_fonts.scss b/src/styles/_fonts.scss index 45cdd5400..8e38de569 100644 --- a/src/styles/_fonts.scss +++ b/src/styles/_fonts.scss @@ -1,6 +1,55 @@ @font-face { - font-family: Roboto, Arial, Helvetica, sans-serif; - src: url('../fonts/Roboto-Regular-webfont.woff') format('woff'); + font-family: 'IBM Plex Sans'; + font-weight: 300; + font-style: normal; + font-display: swap; + src: url('/src/fonts/IBMPlexSans-Light.woff2') format('woff2'); +} + +@font-face { + font-family: 'IBM Plex Sans'; font-weight: normal; font-style: normal; + font-display: swap; + src: url('/src/fonts/IBMPlexSans-Regular.woff2') format('woff2'); +} + +@font-face { + font-family: 'IBM Plex Sans'; + font-weight: 500; + font-style: normal; + font-display: swap; + src: url('/src/fonts/IBMPlexSans-Medium.woff2') format('woff2'); +} + +@font-face { + font-family: 'IBM Plex Sans'; + font-weight: bold; + font-style: normal; + font-display: swap; + src: url('/src/fonts/IBMPlexSans-Bold.woff2') format('woff2'); +} + +@font-face { + font-family: Montserrat; + font-weight: normal; + font-style: normal; + font-display: swap; + src: url('/src/fonts/Montserrat-Regular.woff2') format('woff2'); +} + +@font-face { + font-family: Montserrat; + font-weight: bold; + font-style: normal; + font-display: swap; + src: url('/src/fonts/Montserrat-Bold.woff2') format('woff2'); +} + +@font-face { + font-family: Roboto; + font-weight: 500; + font-style: normal; + font-display: swap; + src: url('/src/fonts/Roboto-Medium.woff2') format('woff2'); } diff --git a/src/styles/_typography.scss b/src/styles/_typography.scss index 1837eb46e..bc6bd5b8b 100644 --- a/src/styles/_typography.scss +++ b/src/styles/_typography.scss @@ -1,3 +1,14 @@ +@import 'utils/vars'; +@import 'utils/mixins'; + h1 { @extend %h1; } + +h2 { + @extend %h2; +} + +h3 { + @extend %h3; +} diff --git a/src/styles/blocks/_header.scss b/src/styles/blocks/_header.scss new file mode 100644 index 000000000..d2e6e3cba --- /dev/null +++ b/src/styles/blocks/_header.scss @@ -0,0 +1,284 @@ +.header { + &__content { + @include page-grid; + + position: relative; + align-items: stretch; + + @include tablet-small { + min-height: 384px; + } + + @include desktop { + min-height: 655px; + } + } + + &__top { + @include page-grid; + + position: absolute; + z-index: 1; + top: 0; + right: 0; + left: 0; + + padding-top: 27px; + + @include tablet { + padding-top: 40px; + } + } + + &__burger { + cursor: pointer; + + display: flex; + grid-column: 1; + flex-direction: column; + gap: 4px; + align-items: center; + justify-content: center; + justify-self: start; + + width: 24px; + height: 24px; + padding: 0; + border: none; + + background: none; + + &-line { + width: 18px; + height: 2px; + background-color: $c-black; + } + } + + &__logo { + @include absolute-center; + + display: block; + + margin-top: 9px; + + font-family: $ff-main; + font-size: 30px; + font-weight: 700; + line-height: 1; + color: $c-text-deep-black; + text-align: center; + text-decoration: none; + + @include tablet-small { + grid-column: 4 / 6; + margin-top: 15px; + font-size: 36px; + } + + @include tablet { + grid-column: 4 / 6; + margin-top: 15px; + font-size: 36px; + } + + @include desktop { + grid-column: 6 / 8; + } + } + + &__bottom { + grid-column: 1 / -1; + + @include tablet-small { + grid-column: 1 / 4; + grid-row: 1; + align-items: center; + margin-top: 127px; + } + + @include tablet { + grid-column: 1 / 4; + grid-row: 1; + align-items: center; + margin-top: 127px; + } + + @include desktop { + grid-column: 1 / 6; + place-items: center end; + margin-top: 206px; + } + } + + &__image { + overflow: hidden; + grid-column: 1 / -1; + + aspect-ratio: 320 / 300; + width: 100vw; + width: calc(100% + 2 * $container-padding-mobile); + height: 100%; + margin-right: calc((100vw - 100%) / -2); + margin-inline: -$container-padding-mobile; + + img { + display: block; + + width: 100%; + height: 100%; + + object-fit: cover; + object-position: center top; + } + + @include tablet-small { + position: absolute; + inset: 0 - $container-padding-tablet-small 0 0; + + grid-column: 4 / 7; + grid-row: 1; + + aspect-ratio: auto; + width: auto; + height: auto; + margin: 0; + } + + @include desktop { + right: -$container-padding-desktop; + grid-column: 6 / 13; + aspect-ratio: auto; + } + } + + &__title { + @extend %h1; + + margin: 20px 0; + text-align: center; + + @include tablet-small { + margin: 0 0 38px; + font-size: 44px; + text-align: start; + } + + @include tablet { + font-size: 54px; + line-height: 120%; + } + + @include desktop { + margin: 0 0 89px; + font-size: 72px; + } + } + + &__btn { + display: flex; + align-items: center; + + width: 100%; + height: 50px; + border: 1px solid $c-green; + + text-decoration: none; + + @include hover(opacity, 0.7); + @include hover(background-color, $c-green); + + @include tablet-small { + width: 270px; + height: 70px; + margin-bottom: 20px; + } + } + + &__btn-text { + display: flex; + flex: 1; + align-items: center; + justify-content: center; + + height: 100%; + + font-size: 16px; + font-weight: 500; + line-height: 100%; + color: $c-text-deep-black; + letter-spacing: 0%; + + @include hover(color, $c-white); + } + + &__btn-icon { + display: flex; + align-items: center; + justify-content: center; + + width: 50px; + height: 50px; + + background-color: $c-green; + + svg { + width: 24px; + height: 24px; + color: $c-white; + } + + @include tablet-small { + width: 70px; + height: 70px; + } + } + + &__events { + display: none; + + @include desktop { + position: absolute; + z-index: 2; + bottom: 0; + left: 0; + + display: flex; + flex-direction: column; + gap: 20px; + align-items: center; + + text-decoration: none; + + &::after { + content: ''; + + display: block; + + width: 1px; + height: 70px; + + background-color: $c-green; + } + + span { + transform: rotate(-90deg); + + display: inline-block; + + margin-bottom: 20px; + + font-family: $ff-main; + font-size: 14px; + font-weight: 700; + color: $c-text-dark-gray; + text-transform: uppercase; + letter-spacing: 0.15em; + } + + &:hover { + opacity: 0.6; + } + } + } +} diff --git a/src/styles/blocks/_menu.scss b/src/styles/blocks/_menu.scss new file mode 100644 index 000000000..8e8a5a718 --- /dev/null +++ b/src/styles/blocks/_menu.scss @@ -0,0 +1,186 @@ +.menu { + position: fixed; + z-index: 200; + inset: 0; + transform: translateY(-100%); + + overflow-y: auto; + + transition: transform 0.3s ease; + + &.is-open { + transform: translateY(0); + } + + &__inner { + display: grid; + grid-template-columns: auto 1fr; + column-gap: 28px; + align-items: start; + + @include content-padding-inline; + + padding-top: 27px; + padding-bottom: 27px; + + background-color: $c-green; + + @include tablet-small { + grid-template-columns: auto 1fr 1fr 1fr; + column-gap: 10px; + } + + @include tablet { + column-gap: 38px; + padding-top: 40px; + padding-bottom: 40px; + } + + @include desktop { + grid-template-columns: auto 1fr 1fr 1fr; + column-gap: 102px; + } + } + + &__close { + cursor: pointer; + + grid-column: 1; + grid-row: 1; + + margin: 0; + padding: 0; + border: none; + + color: $c-white; + + background: none; + + @include hover(opacity, 0.6); + + svg { + width: 24px; + height: 24px; + fill: $c-white; + } + } + + &__list { + display: grid; + grid-column: 2; + grid-row: 1; + grid-template-columns: 1fr 1fr; + gap: 24px 28px; + + margin: 0; + padding: 0 0 24px; + + list-style: none; + + @include tablet-small { + grid-column: 2; + } + + @include desktop { + grid-column: 2; + gap: 31px 30px; + } + } + + &__link { + font-family: $ff-main; + font-size: 16px; + font-weight: 500; + line-height: 1; + color: $c-white; + text-decoration: none; + + @include hover(opacity, 0.6); + } + + &__schedule { + grid-column: 1 / -1; + grid-row: 2; + padding-top: 24px; + border-top: 1px solid rgba($c-white, 0.2); + + @include tablet-small { + display: grid; + grid-column: 3 / -1; + grid-row: 1; + grid-template-columns: 1fr 1fr; + + padding-top: 0; + padding-left: 28px; + border-top: none; + border-left: 1px solid rgba($c-white, 0.2); + } + + @include tablet { + padding-left: 38px; + } + + @include desktop { + grid-column: 3 / -1; + grid-template-columns: repeat(2, 170px); + column-gap: 30px; + padding-left: 102px; + } + } + + &__schedule-title { + margin: 0 0 20px; + + font-family: $ff-second; + font-size: 14px; + line-height: 1.4; + color: $c-white; + + @include tablet-small { + grid-column: 1 / -1; + } + } + + &__schedule-list { + margin: 0; + padding: 0; + list-style: none; + } + + &__schedule-time, + &__schedule-day { + margin-bottom: 4px; + + font-family: $ff-second; + font-size: 14px; + line-height: 1.5; + color: $c-white; + } + + &__schedule-time { + font-weight: 700; + } + + &__schedule-day { + font-weight: 400; + } + + &__schedule-note { + margin: 16px 0 0; + + font-family: $ff-second; + font-size: 14px; + font-weight: 400; + line-height: 1.5; + color: $c-white; + + @include tablet-small { + grid-column: 2; + margin: 0; + } + + strong { + font-weight: 700; + } + } +} diff --git a/src/styles/blocks/current-events.scss b/src/styles/blocks/current-events.scss new file mode 100644 index 000000000..f2afcb192 --- /dev/null +++ b/src/styles/blocks/current-events.scss @@ -0,0 +1,234 @@ +.current-events { + @include content-padding-inline; + + padding-top: 70px; + + @include tablet-small { + padding-top: 88px; + } + + @include desktop { + padding-top: 200px; + } + + &__title { + margin: 0 0 40px; + + font-family: $ff-main; + font-size: 36px; + font-weight: 700; + line-height: 1; + color: $c-text-deep-black; + text-align: center; + + @include tablet-small { + margin-bottom: 40px; + font-size: 48px; + } + + @include desktop { + margin-bottom: 48px; + font-size: 48px; + } + } + + &__list { + display: flex; + flex-direction: column; + } +} + +.current-event-card { + padding-bottom: 60px; + + @include tablet-small { + padding-bottom: 64px; + } + + @include desktop { + padding-bottom: 104px; + } + + &__inner { + @include page-grid; + } + + &__image-wrap { + overflow: hidden; + grid-column: 1 / -1; + margin-bottom: 20px; + + @include tablet-small { + grid-column: 1 / 4; + margin-bottom: 0; + } + + @include desktop { + grid-column: 1 / 6; + } + } + + &__img { + display: block; + aspect-ratio: 4 / 3; + width: 100%; + object-fit: cover; + + @include tablet-small { + aspect-ratio: unset; + height: 100%; + } + + @include hover(transform, scale(1.03)); + } + + &__body { + display: flex; + grid-column: 1 / -1; + flex-direction: column; + justify-content: center; + + @include tablet-small { + grid-column: 4 / 7; + padding-left: 24px; + } + + @include desktop { + grid-column: 6 / 13; + padding-left: 40px; + } + } + + &__meta { + display: flex; + gap: 20px; + align-items: center; + margin-bottom: 12px; + } + + &__tag { + font-family: $ff-second; + font-size: 11px; + font-weight: 500; + color: $c-text-dark-gray; + text-transform: uppercase; + letter-spacing: 0.1em; + } + + &__date { + font-family: $ff-second; + font-size: 11px; + color: $c-text-dark-gray; + letter-spacing: 0.05em; + } + + &__title { + display: flex; + gap: 10px; + align-items: center; + + margin: 0 0 16px; + + font-family: $ff-main; + font-size: 24px; + font-weight: 700; + line-height: 1.1; + color: $c-text-deep-black; + + &::after { + content: ''; + + display: inline-block; + flex-shrink: 0; + + width: 10px; + height: 10px; + + background-color: $c-red; + } + + @include tablet-small { + font-size: 28px; + } + + @include desktop { + font-size: 36px; + } + } + + &__text { + margin: 0; + + font-family: $ff-second; + font-size: 14px; + line-height: 1.65; + color: $c-text-charcoal; + + @include tablet-small { + font-size: 15px; + } + } + + &--wide { + position: relative; + margin-bottom: 0; + padding-bottom: 0; + border-bottom: none; + + .current-event-card__inner { + display: block; + } + + .current-event-card__image-wrap { + grid-column: unset; + margin-bottom: 0; + } + + .current-event-card__img { + aspect-ratio: unset; + width: 100%; + height: 280px; + object-fit: cover; + + @include tablet-small { + height: 400px; + } + + @include desktop { + height: 500px; + } + } + + .current-event-card__body { + grid-column: unset; + + padding: 20px $container-padding-mobile; + padding-left: 0; + + background-color: $c-white; + box-shadow: 0 8px 24px rgba(0, 0, 0, 0.15); + + @include tablet-small { + position: absolute; + bottom: 0; + left: 0; + + width: 50%; + padding: 24px $container-padding-tablet-small; + } + + @include desktop { + width: 40%; + padding: 32px $container-padding-desktop; + } + } + + .current-event-card__title { + margin-bottom: 0; + + &::after { + display: none; + } + } + } +} diff --git a/src/styles/main.scss b/src/styles/main.scss index fb9195d12..c0bafa658 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -1,7 +1,25 @@ @import 'utils'; @import 'fonts'; @import 'typography'; +@import 'blocks/header'; +@import 'blocks/menu'; +@import 'blocks/current-events'; body { - background: $c-gray; + scroll-behavior: smooth; + margin: 0; + font-family: $ff-second; + background: $c-white; +} + +* { + box-sizing: border-box; +} + +.container { + width: 100%; + max-width: $container-max-width; + margin-inline: auto; + + @include content-padding-inline; } diff --git a/src/styles/utils/_extends.scss b/src/styles/utils/_extends.scss index d7201e7b3..6586c4229 100644 --- a/src/styles/utils/_extends.scss +++ b/src/styles/utils/_extends.scss @@ -1,4 +1,24 @@ %h1 { - font-family: Roboto, sans-serif; + font-family: $ff-main; + font-size: 45px; + font-weight: 700; + line-height: 100%; + text-transform: uppercase; + letter-spacing: 0%; +} + +%h2 { + font-family: $ff-main; + font-size: 36px; + font-weight: 700; + line-height: 100%; + letter-spacing: 0%; +} + +%h3 { + font-family: $ff-main; + font-size: 28px; font-weight: 400; + line-height: 100%; + letter-spacing: 0%; } diff --git a/src/styles/utils/_mixins.scss b/src/styles/utils/_mixins.scss index 80c79780d..384ba13c9 100644 --- a/src/styles/utils/_mixins.scss +++ b/src/styles/utils/_mixins.scss @@ -1,6 +1,76 @@ @mixin hover($_property, $_toValue) { - transition: #{$_property} 0.3s; + transition: #{$_property} $transition; &:hover { #{$_property}: $_toValue; } } + +@mixin tablet-small { + @media (min-width: $bp-tablet-small) { + @content; + } +} + +@mixin tablet { + @media (min-width: $bp-tablet) { + @content; + } +} + +@mixin desktop { + @media (min-width: $bp-desktop) { + @content; + } +} + +@mixin design { + @media (min-width: $bp-design) { + @content; + } +} + +@mixin content-padding-inline { + padding-inline: $container-padding-mobile; + + @include tablet-small { + padding-inline: $container-padding-tablet-small; + } + + @include tablet { + padding-inline: $container-padding-tablet; + } + + @include desktop { + max-width: $container-max-width; + margin-inline: auto; + padding-inline: $container-padding-desktop; + } +} + +@mixin page-grid { + display: grid; + grid-template-columns: repeat(2, 1fr); + column-gap: 20px; + + @include tablet-small { + grid-template-columns: repeat(6, 1fr); + column-gap: 20px; + } + + @include tablet { + grid-template-columns: repeat(6, 1fr); + column-gap: 30px; + } + + @include desktop { + grid-template-columns: repeat(12, 1fr); + column-gap: 30px; + } +} + +@mixin absolute-center { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); +} diff --git a/src/styles/utils/_vars.scss b/src/styles/utils/_vars.scss index aeb006ffb..ee6148aab 100644 --- a/src/styles/utils/_vars.scss +++ b/src/styles/utils/_vars.scss @@ -1 +1,34 @@ -$c-gray: #eee; +// ---------- Colors ---------------- +$c-green: #1a5a4c; +$c-green-opacity-50: rgba(26, 90, 76, 0.5); +$c-red: #f14a27; +$c-black: #000; +$c-black-opacity-75: rgba(0, 0, 0, 0.75); +$c-gray: #c4c4c4; +$c-gray-light: #d7dde3; +$c-white: #fff; +$c-text-deep-black: #0f0e08; +$c-text-dark-gray: #687480; +$c-text-charcoal: #4e4e4e; + +// ---------- Fonts ---------------- + +$ff-main: 'Montserrat', sans-serif; +$ff-second: 'IBM Plex Sans', sans-serif; + +// ---------- Breakpoints ---------------- +$bp-mobile: 320px; +$bp-tablet-small: 640px; +$bp-tablet: 768px; +$bp-desktop: 1280px; +$bp-design: 1440px; + +// ---------- Spacing ---------------- +$container-max-width: 1280px; +$container-padding-mobile: 20px; +$container-padding-tablet-small: 40px; +$container-padding-tablet: 40px; +$container-padding-desktop: 55px; + +// ---------- Transitions ---------------- +$transition: 0.3s ease;