From 38157b686c6fe38e4abb53bd01f43f38c94d4437 Mon Sep 17 00:00:00 2001
From: "Mr. Stallion" <mrstallion@nobody.nowhere.fauxdomain.ext>
Date: Mon, 22 May 2023 18:44:34 -0700
Subject: [PATCH] minor
---
chat/UserList.vue | 47 ++++++++++++++++++
package.json | 4 +-
scss/_rising.scss | 5 ++
site/character_page/kinks.vue | 8 +--
yarn.lock | 93 ++++++++++++++---------------------
5 files changed, 96 insertions(+), 61 deletions(-)
diff --git a/chat/UserList.vue b/chat/UserList.vue
index 1a5cd8e..e7dca4f 100644
--- a/chat/UserList.vue
+++ b/chat/UserList.vue
@@ -231,6 +231,17 @@
display: none;
}
+ .tab-content #overview > div {
+ margin-bottom: 0.4rem !important;
+ margin-left: 5px;
+ margin-right: 5px;
+
+ &.character-kinks-block {
+ margin-left: 0;
+ margin-right: 0;
+ }
+ }
+
.row.character-page {
display: block;
margin-right: 0;
@@ -269,6 +280,32 @@
border: none !important;
background-color: transparent !important;
}
+
+ .character-kinks-block {
+ .kink-block-no {
+ .card {
+ background-color: var(--scoreMismatchBgFaint) !important;
+ }
+ }
+
+ .kink-block-maybe {
+ .card {
+ background-color: var(--scoreWeakMismatchBgFaint) !important;
+ }
+ }
+
+ .kink-block-yes {
+ .card {
+ background-color: var(--scoreWeakMatchBgFaint) !important;
+ }
+ }
+
+ .kink-block-favorite {
+ .card {
+ background-color: var(--scoreMatchBgFaint) !important;
+ }
+ }
+ }
}
.infotag {
@@ -281,10 +318,20 @@
}
}
+ .quick-info-block {
+ margin-left: 5px;
+ margin-right: 5px;
+ }
+
.quick-info {
display: none !important;
}
+ #headerCharacterMemo {
+ margin-left: 5px;
+ margin-right: 5px;
+ }
+
.character-kinks-block {
> div {
flex-direction: column !important;
diff --git a/package.json b/package.json
index 2bda8da..da3202c 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
"@types/bluebird": "3.5.32",
"@types/lodash": "4.14.162",
"@types/node": "16.18.32",
- "@types/node-fetch": "^3.0.3",
+ "@types/node-fetch": "2.6.4",
"@types/qs": "^6.9.5",
"@types/request-promise": "^4.1.46",
"@types/sortablejs": "^1.10.6",
@@ -57,7 +57,7 @@
"@cliqz/adblocker-electron": "1.26.3",
"jquery": "^3.6.0",
"keytar": "~7.8.0",
- "node-fetch": "3.0.0"
+ "node-fetch": "2.6.11"
},
"optionalDependencies": {
"appdmg": "^0.6.0",
diff --git a/scss/_rising.scss b/scss/_rising.scss
index 84e9a52..370b24e 100644
--- a/scss/_rising.scss
+++ b/scss/_rising.scss
@@ -14,6 +14,11 @@ $risingVariables: (
scoreMinimizeButtonBg: #{$scoreMinimizeButtonBg},
scoreReportBg: #{$scoreReportBg},
+ scoreMatchBgFaint: change-color($color: $scoreMatchBg, $alpha: 0.25),
+ scoreWeakMatchBgFaint: change-color($color: $scoreWeakMatchBg, $alpha: 0.25),
+ scoreWeakMismatchBgFaint: change-color($color: $scoreWeakMismatchBg, $alpha: 0.25),
+ scoreMismatchBgFaint: change-color($color: $scoreMismatchBg, $alpha: 0.25),
+
scoreFadedUnicornMatchBg: #{$scoreFadedUnicornMatchBg},
scoreFadedUnicornMatchFg: #{$scoreFadedUnicornMatchFg},
scoreFadedMatchBg: #{$scoreFadedMatchBg},
diff --git a/site/character_page/kinks.vue b/site/character_page/kinks.vue
index fcf1ae6..dd9d9a5 100644
--- a/site/character_page/kinks.vue
+++ b/site/character_page/kinks.vue
@@ -20,7 +20,7 @@
</div>
</div>
<div class="form-row mt-3" :class="{ highlighting: !!highlightGroup }">
- <div class="col-sm-6 col-lg-3">
+ <div class="col-sm-6 col-lg-3 kink-block-favorite">
<div class="card bg-light">
<div class="card-header">
<h4>Favorites</h4>
@@ -31,7 +31,7 @@
</div>
</div>
</div>
- <div class="col-sm-6 col-lg-3">
+ <div class="col-sm-6 col-lg-3 kink-block-yes">
<div class="card bg-light">
<div class="card-header">
<h4>Yes</h4>
@@ -42,7 +42,7 @@
</div>
</div>
</div>
- <div class="col-sm-6 col-lg-3">
+ <div class="col-sm-6 col-lg-3 kink-block-maybe">
<div class="card bg-light">
<div class="card-header">
<h4>Maybe</h4>
@@ -53,7 +53,7 @@
</div>
</div>
</div>
- <div class="col-sm-6 col-lg-3">
+ <div class="col-sm-6 col-lg-3 kink-block-no">
<div class="card bg-light">
<div class="card-header">
<h4>No</h4>
diff --git a/yarn.lock b/yarn.lock
index e25f548..a3abb6b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -455,12 +455,13 @@
resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
-"@types/node-fetch@^3.0.3":
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-3.0.3.tgz#9d969c9a748e841554a40ee435d26e53fa3ee899"
- integrity sha512-HhggYPH5N+AQe/OmN6fmhKmRRt2XuNJow+R3pQwJxOOF9GuwM7O2mheyGeIrs5MOIeNjDEdgdoyHBOrFeJBR3g==
+"@types/node-fetch@2.6.4":
+ version "2.6.4"
+ resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.4.tgz#1bc3a26de814f6bf466b25aeb1473fa1afe6a660"
+ integrity sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==
dependencies:
- node-fetch "*"
+ "@types/node" "*"
+ form-data "^3.0.0"
"@types/node@*", "@types/node@16.18.32", "@types/node@>=10.0.0", "@types/node@^14.6.2", "@types/node@^16.11.26":
version "16.18.32"
@@ -2064,7 +2065,7 @@ color@^3.0.0:
color-convert "^1.9.3"
color-string "^1.6.0"
-combined-stream@^1.0.6, combined-stream@~1.0.6:
+combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
version "1.0.8"
resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -2399,16 +2400,6 @@ dashdash@^1.12.0:
dependencies:
assert-plus "^1.0.0"
-data-uri-to-buffer@^3.0.1:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz#594b8973938c5bc2c33046535785341abc4f3636"
- integrity sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==
-
-data-uri-to-buffer@^4.0.0:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz#d8feb2b2881e6a4f58c2e08acfd0e2834e26222e"
- integrity sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==
-
date-fns@2.29.3:
version "2.29.3"
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8"
@@ -3178,14 +3169,6 @@ fd-slicer@~1.1.0:
dependencies:
pend "~1.2.0"
-fetch-blob@^3.1.2, fetch-blob@^3.1.4:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/fetch-blob/-/fetch-blob-3.2.0.tgz#f09b8d4bbd45adc6f0c20b7e787e793e309dcce9"
- integrity sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==
- dependencies:
- node-domexception "^1.0.0"
- web-streams-polyfill "^3.0.3"
-
file-loader@^6.2.0:
version "6.2.0"
resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"
@@ -3308,6 +3291,15 @@ form-data@^2.5.0:
combined-stream "^1.0.6"
mime-types "^2.1.12"
+form-data@^3.0.0:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
+ integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
+ dependencies:
+ asynckit "^0.4.0"
+ combined-stream "^1.0.8"
+ mime-types "^2.1.12"
+
form-data@~2.3.2:
version "2.3.3"
resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
@@ -3317,13 +3309,6 @@ form-data@~2.3.2:
combined-stream "^1.0.6"
mime-types "^2.1.12"
-formdata-polyfill@^4.0.10:
- version "4.0.10"
- resolved "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz#24807c31c9d402e002ab3d8c720144ceb8848423"
- integrity sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==
- dependencies:
- fetch-blob "^3.1.2"
-
forwarded@0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
@@ -5208,27 +5193,12 @@ node-api-version@^0.1.4:
dependencies:
semver "^7.3.5"
-node-domexception@^1.0.0:
- version "1.0.0"
- resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5"
- integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==
-
-node-fetch@*:
- version "3.3.1"
- resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.3.1.tgz#b3eea7b54b3a48020e46f4f88b9c5a7430d20b2e"
- integrity sha512-cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow==
+node-fetch@2.6.11:
+ version "2.6.11"
+ resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.11.tgz#cde7fc71deef3131ef80a738919f999e6edfff25"
+ integrity sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==
dependencies:
- data-uri-to-buffer "^4.0.0"
- fetch-blob "^3.1.4"
- formdata-polyfill "^4.0.10"
-
-node-fetch@3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.0.0.tgz#79da7146a520036f2c5f644e4a26095f17e411ea"
- integrity sha512-bKMI+C7/T/SPU1lKnbQbwxptpCrG9ashG+VkytmXCPZyuM9jB6VU+hY0oi4lC8LxTtAeWdckNCTa3nrGsAdA3Q==
- dependencies:
- data-uri-to-buffer "^3.0.1"
- fetch-blob "^3.1.2"
+ whatwg-url "^5.0.0"
node-gyp-build@^4.2.1, node-gyp-build@^4.3.0:
version "4.6.0"
@@ -7383,6 +7353,11 @@ tough-cookie@^2.3.3, tough-cookie@~2.5.0:
psl "^1.1.28"
punycode "^2.1.1"
+tr46@~0.0.3:
+ version "0.0.3"
+ resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+ integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
+
trim-newlines@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
@@ -7769,10 +7744,10 @@ wcwidth@^1.0.1:
dependencies:
defaults "^1.0.3"
-web-streams-polyfill@^3.0.3:
- version "3.2.1"
- resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz#71c2718c52b45fd49dbeee88634b3a60ceab42a6"
- integrity sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==
+webidl-conversions@^3.0.0:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+ integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
webpack-sources@^1.1.0, webpack-sources@^1.4.3:
version "1.4.3"
@@ -7820,6 +7795,14 @@ webpack@5.8.0:
watchpack "^2.0.0"
webpack-sources "^2.1.1"
+whatwg-url@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+ integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
+ dependencies:
+ tr46 "~0.0.3"
+ webidl-conversions "^3.0.0"
+
which-boxed-primitive@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"