From babd46be6305539e1932e89b974cf1b23d8a10dc Mon Sep 17 00:00:00 2001 From: Neel Mishra Date: Tue, 26 Sep 2023 12:03:57 +0530 Subject: [PATCH 1/5] Resolve the hover color issue Signed-off-by: Neel Mishra --- static/main.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/static/main.css b/static/main.css index b8c28778..dddb5784 100644 --- a/static/main.css +++ b/static/main.css @@ -8993,22 +8993,22 @@ blockquote p:last-of-type { fill: #FFFFFF; } .social-icons a.facebook:hover svg { - fill: #44649D; + fill: #1DB4EB; } .social-icons a.twitter:hover svg { fill: #1DB4EB; } .social-icons a.linkedin:hover svg { - fill: #2b75b2; + fill: #1DB4EB; } .social-icons a.instagram:hover svg { - fill: #356692; + fill: #1DB4EB; } .social-icons a.github:hover svg { - fill: #4078c0; + fill: #1DB4EB; } .social-icons a.mastodon:hover svg { - fill: #3088D4; + fill: #1DB4EB; } .social-icons.highlight svg { From e969e8429a6b720f9b1a0ae50e91255e7a6b644f Mon Sep 17 00:00:00 2001 From: Neel Mishra Date: Wed, 27 Sep 2023 00:36:27 +0530 Subject: [PATCH 2/5] Resolved the hover color change issue Signed-off-by: Neel Mishra --- Gemfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gemfile b/Gemfile index af000052..f18379d3 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,7 @@ source "https://rubygems.org" +gem 'wdm', '>=0.1.0 ' gem "webrick" gem "github-pages", group: :jekyll_plugins +gem "tzinfo-data" \ No newline at end of file From 339a3d6769e52313a23ff218682618d8d827175f Mon Sep 17 00:00:00 2001 From: Neel Mishra Date: Wed, 27 Sep 2023 01:04:06 +0530 Subject: [PATCH 3/5] Resolved the white hover color of the website icon Signed-off-by: Neel Mishra --- static/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/main.css b/static/main.css index dddb5784..e53e3287 100644 --- a/static/main.css +++ b/static/main.css @@ -8990,7 +8990,7 @@ blockquote p:last-of-type { fill: #140A44; } .social-icons a:hover svg { - fill: #FFFFFF; + fill: #1DB4EB; } .social-icons a.facebook:hover svg { fill: #1DB4EB; From f6423ba78b1326b24eca5c50f00603a7e16c4fd6 Mon Sep 17 00:00:00 2001 From: Neel Mishra Date: Fri, 29 Sep 2023 02:03:41 +0530 Subject: [PATCH 4/5] revert the changes made and added .web hover, change the color of github and website Signed-off-by: Neel Mishra --- _src/scss/_settings.scss | 4 +- _src/scss/module/_social-icons.scss | 2 +- package-lock.json | 109 ++++++++++++---------------- package.json | 6 +- static/main.css | 12 +-- 5 files changed, 58 insertions(+), 75 deletions(-) diff --git a/_src/scss/_settings.scss b/_src/scss/_settings.scss index 7b2d045f..8ac3e7a5 100644 --- a/_src/scss/_settings.scss +++ b/_src/scss/_settings.scss @@ -64,8 +64,8 @@ $color-linkedin: #2b75b2; $color-pinterest: #CF3132; $color-youtube: #E4251A; $color-google-plus: #D55441; -$color-github: #4078c0; -$color-mastodon: #3088D4; +$color-github: #000000; +$color-mastodon: #6364ff; $color-rss: #FD8A22; // 1. Global diff --git a/_src/scss/module/_social-icons.scss b/_src/scss/module/_social-icons.scss index 930c139d..3b4eb2f8 100644 --- a/_src/scss/module/_social-icons.scss +++ b/_src/scss/module/_social-icons.scss @@ -50,7 +50,7 @@ } &.mastodon:hover svg { - fill: $color-mastodon; + fill: $color-twitter; } } diff --git a/package-lock.json b/package-lock.json index c5ed9fd8..c3f273f6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,9 +19,9 @@ "css-loader": "^6.7.1", "mini-css-extract-plugin": "^2.6.1", "resolve-url-loader": "^3.1.1", - "sass": "^1.62.1", - "sass-loader": "^13.0.2", - "webpack": "^5.80.0", + "sass": "^1.68.0", + "sass-loader": "^13.3.2", + "webpack": "^5.88.2", "webpack-cli": "^4.10.0" } }, @@ -349,9 +349,9 @@ } }, "node_modules/acorn-import-assertions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", + "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", "dev": true, "peerDependencies": { "acorn": "^8" @@ -920,9 +920,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.13.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.13.0.tgz", - "integrity": "sha512-eyV8f0y1+bzyfh8xAwW/WTSZpLbjhqc4ne9eGSH4Zo2ejdyiNG9pU6mf9DG8a7+Auk6MFTlNOT4Y2y/9k8GKVg==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", + "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", "dev": true, "dependencies": { "graceful-fs": "^4.2.4", @@ -1512,15 +1512,6 @@ "node": ">=0.10.0" } }, - "node_modules/klona": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz", - "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, "node_modules/loader-runner": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", @@ -2266,9 +2257,9 @@ "dev": true }, "node_modules/sass": { - "version": "1.62.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.62.1.tgz", - "integrity": "sha512-NHpxIzN29MXvWiuswfc1W3I0N8SXBd8UR26WntmDlRYf0bSADnwnOjsyMZ3lMezSlArD33Vs3YFhp7dWvL770A==", + "version": "1.68.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.68.0.tgz", + "integrity": "sha512-Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA==", "dev": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", @@ -2283,12 +2274,11 @@ } }, "node_modules/sass-loader": { - "version": "13.2.2", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.2.2.tgz", - "integrity": "sha512-nrIdVAAte3B9icfBiGWvmMhT/D+eCDwnk+yA7VE/76dp/WkHX+i44Q/pfo71NYbwj0Ap+PGsn0ekOuU1WFJ2AA==", + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.2.tgz", + "integrity": "sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==", "dev": true, "dependencies": { - "klona": "^2.0.6", "neo-async": "^2.6.2" }, "engines": { @@ -2300,7 +2290,7 @@ }, "peerDependencies": { "fibers": ">= 3.1.0", - "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0", + "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0", "sass": "^1.3.0", "sass-embedded": "*", "webpack": "^5.0.0" @@ -2749,9 +2739,9 @@ "dev": true }, "node_modules/webpack": { - "version": "5.80.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.80.0.tgz", - "integrity": "sha512-OIMiq37XK1rWO8mH9ssfFKZsXg4n6klTEDL7S8/HqbAOBBaiy8ABvXvz0dDCXeEF9gqwxSvVk611zFPjS8hJxA==", + "version": "5.88.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz", + "integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==", "dev": true, "dependencies": { "@types/eslint-scope": "^3.7.3", @@ -2760,10 +2750,10 @@ "@webassemblyjs/wasm-edit": "^1.11.5", "@webassemblyjs/wasm-parser": "^1.11.5", "acorn": "^8.7.1", - "acorn-import-assertions": "^1.7.6", + "acorn-import-assertions": "^1.9.0", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.13.0", + "enhanced-resolve": "^5.15.0", "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", @@ -2773,7 +2763,7 @@ "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", - "schema-utils": "^3.1.2", + "schema-utils": "^3.2.0", "tapable": "^2.1.1", "terser-webpack-plugin": "^5.3.7", "watchpack": "^2.4.0", @@ -2905,9 +2895,9 @@ "dev": true }, "node_modules/webpack/node_modules/schema-utils": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.2.tgz", - "integrity": "sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.8", @@ -3318,9 +3308,9 @@ "dev": true }, "acorn-import-assertions": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz", - "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", + "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", "dev": true, "requires": {} }, @@ -3724,9 +3714,9 @@ "dev": true }, "enhanced-resolve": { - "version": "5.13.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.13.0.tgz", - "integrity": "sha512-eyV8f0y1+bzyfh8xAwW/WTSZpLbjhqc4ne9eGSH4Zo2ejdyiNG9pU6mf9DG8a7+Auk6MFTlNOT4Y2y/9k8GKVg==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", + "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", "dev": true, "requires": { "graceful-fs": "^4.2.4", @@ -4175,12 +4165,6 @@ "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true }, - "klona": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz", - "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==", - "dev": true - }, "loader-runner": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", @@ -4717,9 +4701,9 @@ "dev": true }, "sass": { - "version": "1.62.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.62.1.tgz", - "integrity": "sha512-NHpxIzN29MXvWiuswfc1W3I0N8SXBd8UR26WntmDlRYf0bSADnwnOjsyMZ3lMezSlArD33Vs3YFhp7dWvL770A==", + "version": "1.68.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.68.0.tgz", + "integrity": "sha512-Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA==", "dev": true, "requires": { "chokidar": ">=3.0.0 <4.0.0", @@ -4728,12 +4712,11 @@ } }, "sass-loader": { - "version": "13.2.2", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.2.2.tgz", - "integrity": "sha512-nrIdVAAte3B9icfBiGWvmMhT/D+eCDwnk+yA7VE/76dp/WkHX+i44Q/pfo71NYbwj0Ap+PGsn0ekOuU1WFJ2AA==", + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.2.tgz", + "integrity": "sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==", "dev": true, "requires": { - "klona": "^2.0.6", "neo-async": "^2.6.2" } }, @@ -5044,9 +5027,9 @@ "dev": true }, "webpack": { - "version": "5.80.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.80.0.tgz", - "integrity": "sha512-OIMiq37XK1rWO8mH9ssfFKZsXg4n6klTEDL7S8/HqbAOBBaiy8ABvXvz0dDCXeEF9gqwxSvVk611zFPjS8hJxA==", + "version": "5.88.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz", + "integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==", "dev": true, "requires": { "@types/eslint-scope": "^3.7.3", @@ -5055,10 +5038,10 @@ "@webassemblyjs/wasm-edit": "^1.11.5", "@webassemblyjs/wasm-parser": "^1.11.5", "acorn": "^8.7.1", - "acorn-import-assertions": "^1.7.6", + "acorn-import-assertions": "^1.9.0", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.13.0", + "enhanced-resolve": "^5.15.0", "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", @@ -5068,7 +5051,7 @@ "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", - "schema-utils": "^3.1.2", + "schema-utils": "^3.2.0", "tapable": "^2.1.1", "terser-webpack-plugin": "^5.3.7", "watchpack": "^2.4.0", @@ -5101,9 +5084,9 @@ "dev": true }, "schema-utils": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.2.tgz", - "integrity": "sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", "dev": true, "requires": { "@types/json-schema": "^7.0.8", diff --git a/package.json b/package.json index dc03d1eb..b986e614 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,9 @@ "css-loader": "^6.7.1", "mini-css-extract-plugin": "^2.6.1", "resolve-url-loader": "^3.1.1", - "sass": "^1.62.1", - "sass-loader": "^13.0.2", - "webpack": "^5.80.0", + "sass": "^1.68.0", + "sass-loader": "^13.3.2", + "webpack": "^5.88.2", "webpack-cli": "^4.10.0" }, "scripts": { diff --git a/static/main.css b/static/main.css index e53e3287..b8c28778 100644 --- a/static/main.css +++ b/static/main.css @@ -8990,25 +8990,25 @@ blockquote p:last-of-type { fill: #140A44; } .social-icons a:hover svg { - fill: #1DB4EB; + fill: #FFFFFF; } .social-icons a.facebook:hover svg { - fill: #1DB4EB; + fill: #44649D; } .social-icons a.twitter:hover svg { fill: #1DB4EB; } .social-icons a.linkedin:hover svg { - fill: #1DB4EB; + fill: #2b75b2; } .social-icons a.instagram:hover svg { - fill: #1DB4EB; + fill: #356692; } .social-icons a.github:hover svg { - fill: #1DB4EB; + fill: #4078c0; } .social-icons a.mastodon:hover svg { - fill: #1DB4EB; + fill: #3088D4; } .social-icons.highlight svg { From f7cf3ec813cbbc463f21b80210dce8f5f636928b Mon Sep 17 00:00:00 2001 From: Neel Mishra Date: Fri, 29 Sep 2023 08:30:21 +0530 Subject: [PATCH 5/5] changed mastodon and web fill color Signed-off-by: Neel Mishra --- _src/scss/module/_social-icons.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_src/scss/module/_social-icons.scss b/_src/scss/module/_social-icons.scss index 3b4eb2f8..91bb3f5d 100644 --- a/_src/scss/module/_social-icons.scss +++ b/_src/scss/module/_social-icons.scss @@ -25,8 +25,8 @@ fill: $primary-color; } - &:hover svg { - fill: $white; + &.web:hover svg { + fill: $black; } &.facebook:hover svg { @@ -50,7 +50,7 @@ } &.mastodon:hover svg { - fill: $color-twitter; + fill: $color-mastodon; } }