From 4bebdfda798c0b505e987347f24c804914a0af80 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Sat, 18 Sep 2021 00:37:21 -0400 Subject: [PATCH 1/5] Allow wide classTables to bleed into top margin --- themes/5ePhb.style.less | 92 ++++++++++++++++++++++------------------- 1 file changed, 50 insertions(+), 42 deletions(-) diff --git a/themes/5ePhb.style.less b/themes/5ePhb.style.less index 19492ebef..e81ab8fef 100644 --- a/themes/5ePhb.style.less +++ b/themes/5ePhb.style.less @@ -600,49 +600,57 @@ body { //***************************** // * CLASS TABLE // *****************************/ -.page .classTable{ - th[colspan]:not([rowspan]) { - white-space : nowrap; +.page { + * + .classTable.frame { + margin-top : 0.66cm; } - &.frame { - margin-top : 0.66cm; - margin-bottom : 1.05cm; - margin-left : -0.1cm; - margin-right : -0.1cm; - width : calc(100% + 0.2cm); - border-collapse : separate; - background-color : white; - border : initial; - border-style : solid; - border-image-outset : 0.55cm 0.3cm; - border-image-repeat : stretch; - border-image-slice : 200; - border-image-source : @frameBorderImage; - border-image-width : 47px; - } - &.decoration { - transform-style : preserve-3d; - } - &.decoration::before { - content :''; - position : absolute; - background-image : @classTableDecoration; - background-size : contain; - background-repeat : space; - width : 7.75cm; - height : calc(100% + 3.3cm); - top : 50%; - left : 50%; - transform : translateY(-50%) translateX(-50%) translateZ(-1px); - filter : drop-shadow(0px 0px 1px #C8C5C080) - } - &.decoration.wide::before { - width : calc(100% + 3.3cm); - height : 7.75cm; - top : calc(50% + 0.4cm); - } - h5 + table{ - margin-top : 0.2cm; + .classTable{ + th[colspan]:not([rowspan]) { + white-space : nowrap; + } + &.frame { + margin-top : 0.66cm; + &.wide { // Allow top border to move into margin if + margin-top : 0; + } + margin-bottom : 1.05cm; + margin-left : -0.1cm; + margin-right : -0.1cm; + width : calc(100% + 0.2cm); + border-collapse : separate; + background-color : white; + border : initial; + border-style : solid; + border-image-outset : 0.4cm 0.3cm; + border-image-repeat : stretch; + border-image-slice : 200; + border-image-source : @frameBorderImage; + border-image-width : 47px; + } + &.decoration { + transform-style : preserve-3d; + } + &.decoration::before { + content :''; + position : absolute; + background-image : @classTableDecoration; + background-size : contain; + background-repeat : space; + width : 7.75cm; + height : calc(100% + 3.3cm); + top : 50%; + left : 50%; + transform : translateY(-50%) translateX(-50%) translateZ(-1px); + filter : drop-shadow(0px 0px 1px #C8C5C080) + } + &.decoration.wide::before { + width : calc(100% + 3.3cm); + height : 7.75cm; + top : calc(50% + 0.4cm); + } + h5 + table{ + margin-top : 0.2cm; + } } } //***************************** From 936fdff87185321222cb07a29d57096b082de4af Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Thu, 16 Jun 2022 22:13:52 -0400 Subject: [PATCH 2/5] Update CSS, Shrink vertical border margins slightly --- themes/5ePhb.style.less | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/themes/5ePhb.style.less b/themes/5ePhb.style.less index c8320f2a6..811cb6eaa 100644 --- a/themes/5ePhb.style.less +++ b/themes/5ePhb.style.less @@ -604,7 +604,7 @@ body { } &.frame { margin-top : 0.66cm; - margin-bottom : 1.05cm; + margin-bottom : 0.9cm; margin-left : -0.1cm; margin-right : -0.1cm; width : calc(100% + 0.2cm); @@ -612,11 +612,14 @@ body { background-color : white; border : initial; border-style : solid; - border-image-outset : 0.55cm 0.3cm; + border-image-outset : 0.4cm 0.3cm; border-image-repeat : stretch; border-image-slice : 200; border-image-source : @frameBorderImage; border-image-width : 47px; + &.wide:first-child { + margin-top: 0.225cm; + } } &.decoration { position:relative; From f7d8c6434f3b2f67ebb78dbb6a9f80f9239cd887 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Thu, 16 Jun 2022 22:41:04 -0400 Subject: [PATCH 3/5] Small tweaks --- themes/5ePhb.style.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/themes/5ePhb.style.less b/themes/5ePhb.style.less index 811cb6eaa..6915c5753 100644 --- a/themes/5ePhb.style.less +++ b/themes/5ePhb.style.less @@ -603,7 +603,7 @@ body { white-space : nowrap; } &.frame { - margin-top : 0.66cm; + margin-top : 0.7cm; margin-bottom : 0.9cm; margin-left : -0.1cm; margin-right : -0.1cm; @@ -618,7 +618,7 @@ body { border-image-source : @frameBorderImage; border-image-width : 47px; &.wide:first-child { - margin-top: 0.225cm; + margin-top: 0.12cm; } } &.decoration { From 5ca2899b549f1b8bcdff72810719fbd17aa0f408 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jun 2022 03:00:52 +0000 Subject: [PATCH 4/5] Bump eslint from 8.17.0 to 8.18.0 Bumps [eslint](https://github.com/eslint/eslint) from 8.17.0 to 8.18.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v8.17.0...v8.18.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index a54bfe626..391f8aaa5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -45,7 +45,7 @@ "vitreum": "git+https://git@github.com/calculuschild/vitreum.git" }, "devDependencies": { - "eslint": "^8.17.0", + "eslint": "^8.18.0", "eslint-plugin-react": "^7.30.0", "jest": "^28.1.1", "supertest": "^6.2.3" @@ -4865,9 +4865,9 @@ } }, "node_modules/eslint": { - "version": "8.17.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.17.0.tgz", - "integrity": "sha512-gq0m0BTJfci60Fz4nczYxNAlED+sMcihltndR8t9t1evnU/azx53x3t2UHXC/uRjcbvRw/XctpaNygSTcQD+Iw==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.18.0.tgz", + "integrity": "sha512-As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA==", "dev": true, "dependencies": { "@eslint/eslintrc": "^1.3.0", @@ -16394,9 +16394,9 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "eslint": { - "version": "8.17.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.17.0.tgz", - "integrity": "sha512-gq0m0BTJfci60Fz4nczYxNAlED+sMcihltndR8t9t1evnU/azx53x3t2UHXC/uRjcbvRw/XctpaNygSTcQD+Iw==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.18.0.tgz", + "integrity": "sha512-As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA==", "dev": true, "requires": { "@eslint/eslintrc": "^1.3.0", diff --git a/package.json b/package.json index 4436d5962..fb4a3ee60 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "vitreum": "git+https://git@github.com/calculuschild/vitreum.git" }, "devDependencies": { - "eslint": "^8.17.0", + "eslint": "^8.18.0", "eslint-plugin-react": "^7.30.0", "jest": "^28.1.1", "supertest": "^6.2.3" From 60811a3295f106cd6fa6c62590c41b0acc01d7d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jun 2022 03:01:19 +0000 Subject: [PATCH 5/5] Bump mongoose from 6.3.8 to 6.4.0 Bumps [mongoose](https://github.com/Automattic/mongoose) from 6.3.8 to 6.4.0. - [Release notes](https://github.com/Automattic/mongoose/releases) - [Changelog](https://github.com/Automattic/mongoose/blob/master/CHANGELOG.md) - [Commits](https://github.com/Automattic/mongoose/compare/6.3.8...6.4.0) --- updated-dependencies: - dependency-name: mongoose dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 78 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/package-lock.json b/package-lock.json index a54bfe626..9b96f1477 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32,7 +32,7 @@ "marked-extended-tables": "^1.0.3", "markedLegacy": "npm:marked@^0.3.19", "moment": "^2.29.3", - "mongoose": "^6.3.8", + "mongoose": "^6.4.0", "nanoid": "3.3.4", "nconf": "^0.12.0", "query-string": "7.1.1", @@ -3694,9 +3694,9 @@ } }, "node_modules/bson": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/bson/-/bson-4.6.2.tgz", - "integrity": "sha512-VeJKHShcu1b/ugl0QiujlVuBepab714X9nNyBdA1kfekuDGecxgpTA2Z6nYbagrWFeiIyzSWIOzju3lhj+RNyQ==", + "version": "4.6.4", + "resolved": "https://registry.npmjs.org/bson/-/bson-4.6.4.tgz", + "integrity": "sha512-TdQ3FzguAu5HKPPlr0kYQCyrYUYh8tFM+CMTpxjNzVzxeiJY00Rtuj3LXLHSgiGvmaWlZ8PE+4KyM2thqE38pQ==", "dependencies": { "buffer": "^5.6.0" }, @@ -6589,9 +6589,9 @@ } }, "node_modules/ip": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", - "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=" + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz", + "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==" }, "node_modules/ipaddr.js": { "version": "1.9.1", @@ -8458,9 +8458,9 @@ } }, "node_modules/kareem": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.3.5.tgz", - "integrity": "sha512-qxCyQtp3ioawkiRNQr/v8xw9KIviMSSNmy+63Wubj7KmMn3g7noRXIZB4vPCAP+ETi2SR8eH6CvmlKZuGpoHOg==" + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.4.1.tgz", + "integrity": "sha512-aJ9opVoXroQUPfovYP5kaj2lM7Jn02Gw13bL0lg9v0V7SaUc0qavPs0Eue7d2DcC3NjqI6QAUElXNsuZSeM+EA==" }, "node_modules/keyv": { "version": "3.1.0", @@ -9055,11 +9055,11 @@ } }, "node_modules/mongodb": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.5.0.tgz", - "integrity": "sha512-A2l8MjEpKojnhbCM0MK3+UOGUSGvTNNSv7AkP1fsT7tkambrkkqN/5F2y+PhzsV0Nbv58u04TETpkaSEdI2zKA==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.7.0.tgz", + "integrity": "sha512-HhVar6hsUeMAVlIbwQwWtV36iyjKd9qdhY+s4wcU8K6TOj4Q331iiMy+FoPuxEntDIijTYWivwFJkLv8q/ZgvA==", "dependencies": { - "bson": "^4.6.2", + "bson": "^4.6.3", "denque": "^2.0.1", "mongodb-connection-string-url": "^2.5.2", "socks": "^2.6.2" @@ -9081,13 +9081,13 @@ } }, "node_modules/mongoose": { - "version": "6.3.8", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.3.8.tgz", - "integrity": "sha512-TPIm61/DR2Go+aDXD5HM6vwMvl4dEOFos1oTT4yPT8qJpcTugxWXf5J2Vp+0vzqDETfDMtN/gBhPCzFdFJx2bg==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.4.0.tgz", + "integrity": "sha512-eBDrueap1Zx3qFrcYylTiqTFlL5iTEaYAxoDF1MSRdipwAzChQRMJve+vxHtxPhI2q5tmf9RYHfZwXfTUHPd3g==", "dependencies": { "bson": "^4.6.2", - "kareem": "2.3.5", - "mongodb": "4.5.0", + "kareem": "2.4.1", + "mongodb": "4.7.0", "mpath": "0.9.0", "mquery": "4.0.3", "ms": "2.1.3", @@ -11054,7 +11054,7 @@ "node_modules/sparse-bitfield": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", - "integrity": "sha1-/0rm5oZWBWuks+eSqzM004JzyhE=", + "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==", "optional": true, "dependencies": { "memory-pager": "^1.0.2" @@ -15451,9 +15451,9 @@ } }, "bson": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/bson/-/bson-4.6.2.tgz", - "integrity": "sha512-VeJKHShcu1b/ugl0QiujlVuBepab714X9nNyBdA1kfekuDGecxgpTA2Z6nYbagrWFeiIyzSWIOzju3lhj+RNyQ==", + "version": "4.6.4", + "resolved": "https://registry.npmjs.org/bson/-/bson-4.6.4.tgz", + "integrity": "sha512-TdQ3FzguAu5HKPPlr0kYQCyrYUYh8tFM+CMTpxjNzVzxeiJY00Rtuj3LXLHSgiGvmaWlZ8PE+4KyM2thqE38pQ==", "requires": { "buffer": "^5.6.0" }, @@ -17702,9 +17702,9 @@ } }, "ip": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", - "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=" + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz", + "integrity": "sha512-PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg==" }, "ipaddr.js": { "version": "1.9.1", @@ -19093,9 +19093,9 @@ "integrity": "sha512-40aUybvhH9t2h71ncA1/1SbtTNCVZHgsTsTgqPUxGWDmUDrXyDf2wMNQKEbdBjbf4AI+fQhbECNTV6lWxQKUzg==" }, "kareem": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.3.5.tgz", - "integrity": "sha512-qxCyQtp3ioawkiRNQr/v8xw9KIviMSSNmy+63Wubj7KmMn3g7noRXIZB4vPCAP+ETi2SR8eH6CvmlKZuGpoHOg==" + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.4.1.tgz", + "integrity": "sha512-aJ9opVoXroQUPfovYP5kaj2lM7Jn02Gw13bL0lg9v0V7SaUc0qavPs0Eue7d2DcC3NjqI6QAUElXNsuZSeM+EA==" }, "keyv": { "version": "3.1.0", @@ -19563,11 +19563,11 @@ "integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==" }, "mongodb": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.5.0.tgz", - "integrity": "sha512-A2l8MjEpKojnhbCM0MK3+UOGUSGvTNNSv7AkP1fsT7tkambrkkqN/5F2y+PhzsV0Nbv58u04TETpkaSEdI2zKA==", + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-4.7.0.tgz", + "integrity": "sha512-HhVar6hsUeMAVlIbwQwWtV36iyjKd9qdhY+s4wcU8K6TOj4Q331iiMy+FoPuxEntDIijTYWivwFJkLv8q/ZgvA==", "requires": { - "bson": "^4.6.2", + "bson": "^4.6.3", "denque": "^2.0.1", "mongodb-connection-string-url": "^2.5.2", "saslprep": "^1.0.3", @@ -19584,13 +19584,13 @@ } }, "mongoose": { - "version": "6.3.8", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.3.8.tgz", - "integrity": "sha512-TPIm61/DR2Go+aDXD5HM6vwMvl4dEOFos1oTT4yPT8qJpcTugxWXf5J2Vp+0vzqDETfDMtN/gBhPCzFdFJx2bg==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.4.0.tgz", + "integrity": "sha512-eBDrueap1Zx3qFrcYylTiqTFlL5iTEaYAxoDF1MSRdipwAzChQRMJve+vxHtxPhI2q5tmf9RYHfZwXfTUHPd3g==", "requires": { "bson": "^4.6.2", - "kareem": "2.3.5", - "mongodb": "4.5.0", + "kareem": "2.4.1", + "mongodb": "4.7.0", "mpath": "0.9.0", "mquery": "4.0.3", "ms": "2.1.3", @@ -21138,7 +21138,7 @@ "sparse-bitfield": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", - "integrity": "sha1-/0rm5oZWBWuks+eSqzM004JzyhE=", + "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==", "optional": true, "requires": { "memory-pager": "^1.0.2" diff --git a/package.json b/package.json index 4436d5962..9ae21889d 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "marked-extended-tables": "^1.0.3", "markedLegacy": "npm:marked@^0.3.19", "moment": "^2.29.3", - "mongoose": "^6.3.8", + "mongoose": "^6.4.0", "nanoid": "3.3.4", "nconf": "^0.12.0", "query-string": "7.1.1",