From 42899bf54a1902918bb13c5af003c95c7fa9a1fb Mon Sep 17 00:00:00 2001 From: Alina Yamchuk Date: Wed, 27 Nov 2024 16:35:07 +0200 Subject: [PATCH] fixed mistakes --- package-lock.json | 184 ++++++++++++++++++++++++++++++++++- package.json | 3 +- src/images/icons/favicon.png | Bin 0 -> 1752 bytes src/images/icons/favicon.svg | 6 -- src/index.html | 8 +- src/styles/footer.scss | 32 +++++- src/styles/header.scss | 6 +- src/styles/main.scss | 19 +++- 8 files changed, 243 insertions(+), 15 deletions(-) create mode 100644 src/images/icons/favicon.png delete mode 100644 src/images/icons/favicon.svg diff --git a/package-lock.json b/package-lock.json index 08a626c82..104b87d26 100644 --- a/package-lock.json +++ b/package-lock.json @@ -440,7 +440,8 @@ "parcel": "^2.13.1", "prettier": "^3.3.2", "stylelint": "^16.7.0", - "stylelint-scss": "^6.4.1" + "stylelint-scss": "^6.4.1", + "svgo": "^3.3.2" } }, "node_modules/@ampproject/remapping": { @@ -4506,6 +4507,16 @@ "node": ">= 10" } }, + "node_modules/@trysound/sax": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", + "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10.13.0" + } + }, "node_modules/@types/babel__core": { "version": "7.20.5", "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", @@ -5000,6 +5011,13 @@ "readable-stream": "^3.4.0" } }, + "node_modules/boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", + "dev": true, + "license": "ISC" + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -5429,6 +5447,82 @@ "node": ">=12 || >=16" } }, + "node_modules/css-select": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz", + "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "boolbase": "^1.0.0", + "css-what": "^6.1.0", + "domhandler": "^5.0.2", + "domutils": "^3.0.1", + "nth-check": "^2.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, + "node_modules/css-select/node_modules/dom-serializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", + "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", + "dev": true, + "license": "MIT", + "dependencies": { + "domelementtype": "^2.3.0", + "domhandler": "^5.0.2", + "entities": "^4.2.0" + }, + "funding": { + "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" + } + }, + "node_modules/css-select/node_modules/domhandler": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", + "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "domelementtype": "^2.3.0" + }, + "engines": { + "node": ">= 4" + }, + "funding": { + "url": "https://github.com/fb55/domhandler?sponsor=1" + } + }, + "node_modules/css-select/node_modules/domutils": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz", + "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "dom-serializer": "^2.0.0", + "domelementtype": "^2.3.0", + "domhandler": "^5.0.3" + }, + "funding": { + "url": "https://github.com/fb55/domutils?sponsor=1" + } + }, + "node_modules/css-select/node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, "node_modules/css-tree": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz", @@ -5441,6 +5535,19 @@ "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0" } }, + "node_modules/css-what": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", + "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">= 6" + }, + "funding": { + "url": "https://github.com/sponsors/fb55" + } + }, "node_modules/cssesc": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", @@ -5452,6 +5559,42 @@ "node": ">=4" } }, + "node_modules/csso": { + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz", + "integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "css-tree": "~2.2.0" + }, + "engines": { + "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0", + "npm": ">=7.0.0" + } + }, + "node_modules/csso/node_modules/css-tree": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz", + "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==", + "dev": true, + "license": "MIT", + "dependencies": { + "mdn-data": "2.0.28", + "source-map-js": "^1.0.1" + }, + "engines": { + "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0", + "npm": ">=7.0.0" + } + }, + "node_modules/csso/node_modules/mdn-data": { + "version": "2.0.28", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz", + "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==", + "dev": true, + "license": "CC0-1.0" + }, "node_modules/cssom": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz", @@ -8299,6 +8442,19 @@ "node": ">=8" } }, + "node_modules/nth-check": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", + "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "boolbase": "^1.0.0" + }, + "funding": { + "url": "https://github.com/fb55/nth-check?sponsor=1" + } + }, "node_modules/nullthrows": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/nullthrows/-/nullthrows-1.1.1.tgz", @@ -9917,6 +10073,32 @@ "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz", "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==" }, + "node_modules/svgo": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-3.3.2.tgz", + "integrity": "sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@trysound/sax": "0.2.0", + "commander": "^7.2.0", + "css-select": "^5.1.0", + "css-tree": "^2.3.1", + "css-what": "^6.1.0", + "csso": "^5.0.5", + "picocolors": "^1.0.0" + }, + "bin": { + "svgo": "bin/svgo" + }, + "engines": { + "node": ">=14.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/svgo" + } + }, "node_modules/symbol-tree": { "version": "3.2.4", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", diff --git a/package.json b/package.json index 00e36aa72..4482ffdbb 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,8 @@ "parcel": "^2.13.1", "prettier": "^3.3.2", "stylelint": "^16.7.0", - "stylelint-scss": "^6.4.1" + "stylelint-scss": "^6.4.1", + "svgo": "^3.3.2" }, "mateAcademy": { "projectType": "layout", diff --git a/src/images/icons/favicon.png b/src/images/icons/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..dcac5fcec35eaab9035bb2fcea33535e245a937d GIT binary patch literal 1752 zcmV;}1}FK6P)frCrEsPL?^Iw0?Q|Gast~Yh<$>vC#V-qou(VM zlJmOMs_v^qPG?9_0w~Jj2jpnM-+N9>7$iXq{(~6+01XWd4Gj$q4Gj$qn+2*D58FG( z1khE>oYu`=5CkJANvFN@cK#CUY;gVV6iU$P{OBQtPq{rFBDzGhHT}~i5Cn+UMcy-u zzE`a`1MQ>X@K+xU@bJOTGeX$c3JFHTk5_xJqCHjmYxZ8%hB@zZ^!CIRJ+&+xe|gCN zy@c|3v*#lHT=XXCDE{JOqR^%Eej>F>m;c@+h@SDsaoen;Oy_t7-|H=uP$>WUU;_RI z{@2xt5CSOBo-+NFMYUnx`>fRuhz?>StQpsJw`7#FD&A10qn07{xP2!N+mDaI44!xv zs0p{{MbU4#YgQUuU?ZHk?zRhSLY^It@BacB)v+rdu~K|)E9MVeB1uvfY3ga`JI4X zu(C#Me5gsR@~U%rqVC9r4P~jqrwa0wBCq|;&H)&v^I-c>HFlzE+8thB9jpo#|GNJD zl|6}`q-qzXLp6Nus)owB4bRixbNcX;bE`{tLh8i^n1U7@x7&}qV2F5{KF>+#J$&1`P8fUO40K&16w?T#1ZLr6wUi=lPDCWJI=lSLR4HcRTKB81!@Er zu}7%^x2s+!>nh)xOui_r@{G3{wTMc4s=J_&!Gqv(WP`P*DyVL%W)W(!06))%`uI=- zQMo#>dBtbHh|06-=Beqt?%-V)g$ynP*Y7Sf^JJQ;RU$&vIug;ogqk>$TUW9Q!3I~o zL?M-DW05*j)4C~aa6#rtFqEnxkqd?~p(?9&?^KHgR;WDja`RY30?$oVw@}L9g44RU zr@B4UsoJMTrmsvaur(gvf3d87G{$FYEV9Y!7D^jD?hpg18X*SiHAZ3WRL^z4H!|=X z=W{LM=T6#RR+p5&ZMwRJ(gqje6sBgXMx+~@gEkLp5{8Zo2FR*hzAtZ6CA&#NXq|xx z=3BwWsbp|rIK1My8)t!5*;K6+hJL2#C#Xw=Pr(pbmFF+FDw`ynWz^YA*H$zEzk;eL z!7#z%xO7S!owak=DMfx;Y4~rEb#JIjGVaN8I;B z^J$If&upDq2G3d2ES0M9%P+J73M=nxXHz2+@EUzzE6`LvSGSpE)JW}%Eg4WylF5JY zT)jqIT>PnJaACTnsXn-Hsurg}pykfpDu)@89XE68PFd!K7FG!jY?3$>W{eXZmRZ=! zZbV7H+O2=h8(grR&wANZt;l_O5r1-+;qh_Ns9%hoerRU!m?5*N0#UfnbC+Rt%fi+l zm#T1*Kp5W^F}llXvD8(|I14(<+g>(e@I1p6C5ia;P8Fle2^eu}d4`XVLy6Ml;Gep^ zN@10=cdOf{svJS)S8ra!+!kn7IH}Q-epobo+z$^P9fnBS0TOw}aQIt4?;S-?ysShz zhF#r}I{Hi8+vj^hy*K%Q=wvd!f5L{9Y+xj(F!^iTaDp71=y^L@)Ef*woO4|;jtodb zZ=qP+W@zq!g9wM!x)&R8nwrh~0U_=ON)LNLcQWR`Ax~zMZ4)g$nPf!aDPlONxPc+} zB2aIMTTV`5ChF=cN0t*ej_`>#OhN`-;RR zQb)wXYa_d>2B7ZJLpmbcjz0`3s$?{IVdv}ZJ${axmbC~9?}SYoESog1Bp8Vx@*;L? zXeEmg?7ld+jC|X}B7>3l3})9B_fH{p*XYx!$Lz;PrwB#av&AVM u@BvXIdA2{eg8|>r(9qD((9qCuhx`vp) - - - - - diff --git a/src/index.html b/src/index.html index 57e9e4a14..8d70ed57e 100644 --- a/src/index.html +++ b/src/index.html @@ -9,7 +9,8 @@ Namu Підпишіться на дайджест 1s0x40d4ce52445a8315:0x5e30ef474eddac89!8m2!3d50.449395!4d30.5307834! 16s%2Fg%2F11l76wtstx?hl=ru&entry=ttu&g_ep=EgoyMDI0MTExOS4yIKXMDSoASAFQAw%3D%3D" class="footer__address" + target="_blank" > Київ, вул. М. Грушевського, 6 Підпишіться на дайджест diff --git a/src/styles/footer.scss b/src/styles/footer.scss index b2ee9ede8..202571fac 100644 --- a/src/styles/footer.scss +++ b/src/styles/footer.scss @@ -83,6 +83,11 @@ text-decoration: none; color: $main-text-color; + &:hover { + color: inherit; + opacity: 0.5; + } + @include on-tablet { width: 250px; } @@ -97,6 +102,11 @@ color: $main-text-color; margin-bottom: 30px; + &:hover { + color: inherit; + opacity: 0.5; + } + @include on-tablet { margin-bottom: 50px; } @@ -197,7 +207,7 @@ gap: 22px; @include on-desktop { - gap: 102px; + gap: 92px; } } @@ -251,6 +261,11 @@ height: 20px; background-repeat: no-repeat; background-image: url(/src/images/icons/facebook.svg); + + &:hover { + color: inherit; + opacity: 0.5; + } } &--twitter { @@ -258,6 +273,11 @@ height: 20px; background-repeat: no-repeat; background-image: url(/src/images/icons/twitter.svg); + + &:hover { + color: inherit; + opacity: 0.5; + } } &--telegram { @@ -265,6 +285,11 @@ height: 20px; background-repeat: no-repeat; background-image: url(/src/images/icons/telegram.svg); + + &:hover { + color: inherit; + opacity: 0.5; + } } &--instagram { @@ -272,5 +297,10 @@ height: 20px; background-repeat: no-repeat; background-image: url(/src/images/icons/instagram.svg); + + &:hover { + color: inherit; + opacity: 0.5; + } } } diff --git a/src/styles/header.scss b/src/styles/header.scss index f1372b435..6e863a17e 100644 --- a/src/styles/header.scss +++ b/src/styles/header.scss @@ -8,9 +8,12 @@ body { background: $c-gray; margin: 0; font-family: Raleway, sans-serif; - scroll-behavior: smooth; overflow-x: hidden; min-width: 320px; + + &:has(.menu:target) { + overflow: hidden; + } } .header { @@ -19,6 +22,7 @@ body { height: 747px; background-color: #3f5252; position: relative; + scroll-behavior: smooth; @include on-tablet { padding: 20px 0 0 40px; diff --git a/src/styles/main.scss b/src/styles/main.scss index 3462cf358..f153743e4 100644 --- a/src/styles/main.scss +++ b/src/styles/main.scss @@ -143,8 +143,8 @@ } @include on-desktop { - width: 570px; - height: 484px; + width: 800px; + height: 684px; object-fit: cover; } } @@ -694,8 +694,8 @@ } @include on-desktop { - width: 568px; - height: 370px; + width: 800px; + height: 684px; } } @@ -928,6 +928,17 @@ &:not(:placeholder-shown) { color: #1c1b29; } + + &:-webkit-autofill { + color: #000; + -webkit-box-shadow: 1px 1px 1px 100vh #fff inset; + } + &:-webkit-autofill:hover, + &:-webkit-autofill:focus, + &:-webkit-autofill:active { + -webkit-text-fill-color: $main-text-color; + -webkit-box-shadow: 1px 1px 1px 100vh #fff inset; + } } .center__text {