f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-16 16:52:39 +00:00
Code Wiki Activity

Merge branch 'master' into experimentalNotificationDB

Browse Source
This commit is contained in:
G.Ambatte
2023-02-22 16:14:19 +13:00
committed by GitHub
parent 1fd8648602 66c80c3891
commit 28cadcad06
9 changed files with 2046 additions and 2054 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/homebrew/brewRenderer/brewRenderer.jsx
View File

@@ -134,7 +134,8 @@ const BrewRenderer = createClass({
renderStyle : function() { renderStyle : function() {
if(!this.props.style) return; if(!this.props.style) return;
return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>@layer styleTab {\n${this.props.style}\n} </style>` }} />; //return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>@layer styleTab {\n${this.props.style}\n} </style>` }} />;
return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>\n${this.props.style}\n</style>` }} />;
}, },
renderPage : function(pageText, index){ renderPage : function(pageText, index){

3
client/homebrew/pages/printPage/printPage.jsx
View File

@@ -60,7 +60,8 @@ const PrintPage = createClass({
renderStyle : function() { renderStyle : function() {
if(!this.state.brew.style) return; if(!this.state.brew.style) return;
return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>@layer styleTab {\n${this.state.brew.style}\n} </style>` }} />; //return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>@layer styleTab {\n${this.state.brew.style}\n} </style>` }} />;
return <div style={{ display: 'none' }} dangerouslySetInnerHTML={{ __html: `<style>\n${this.state.brew.style}\n</style>` }} />;
}, },
renderPages : function(){ renderPages : function(){

32
package-lock.json generated
View File

@@ -11,7 +11,7 @@
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@babel/core": "^7.20.12", "@babel/core": "^7.20.12",
"@babel/plugin-transform-runtime": "^7.19.6", "@babel/plugin-transform-runtime": "^7.21.0",
"@babel/preset-env": "^7.19.4", "@babel/preset-env": "^7.19.4",
"@babel/preset-react": "^7.18.6", "@babel/preset-react": "^7.18.6",
"body-parser": "^1.20.1", "body-parser": "^1.20.1",
@@ -33,7 +33,7 @@
"marked-extended-tables": "^1.0.5", "marked-extended-tables": "^1.0.5",
"markedLegacy": "npm:marked@^0.3.19", "markedLegacy": "npm:marked@^0.3.19",
"moment": "^2.29.4", "moment": "^2.29.4",
"mongoose": "^6.9.1", "mongoose": "^6.9.2",
"nanoid": "3.3.4", "nanoid": "3.3.4",
"nconf": "^0.12.0", "nconf": "^0.12.0",
"npm": "^8.10.0", "npm": "^8.10.0",
@@ -2814,12 +2814,12 @@
} }
}, },
"node_modules/@babel/plugin-transform-runtime": { "node_modules/@babel/plugin-transform-runtime": {
"version": "7.19.6", "version": "7.21.0",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.21.0.tgz",
"integrity": "sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==", "integrity": "sha512-ReY6pxwSzEU0b3r2/T/VhqMKg/AkceBT19X0UptA3/tYi5Pe2eXgEUH+NNMC5nok6c6XQz5tyVTUpuezRfSMSg==",
"dependencies": { "dependencies": {
"@babel/helper-module-imports": "^7.18.6", "@babel/helper-module-imports": "^7.18.6",
"@babel/helper-plugin-utils": "^7.19.0", "@babel/helper-plugin-utils": "^7.20.2",
"babel-plugin-polyfill-corejs2": "^0.3.3", "babel-plugin-polyfill-corejs2": "^0.3.3",
"babel-plugin-polyfill-corejs3": "^0.6.0", "babel-plugin-polyfill-corejs3": "^0.6.0",
"babel-plugin-polyfill-regenerator": "^0.4.1", "babel-plugin-polyfill-regenerator": "^0.4.1",
@@ -10436,9 +10436,9 @@
} }
}, },
"node_modules/mongoose": { "node_modules/mongoose": {
"version": "6.9.1", "version": "6.9.2",
"resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.9.1.tgz", "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.9.2.tgz",
"integrity": "sha512-hOz1ZWV0w6WEVLrj89Wpk7PXDYtDDF6k7/NX79lY5iKqeFtZsceBXW8xW59YFNcW5O3cH32hQ8IbDlhgyBsDMA==", "integrity": "sha512-Yb9rWJhYm+7Yf839QuKx2dXcclbA0GAMxtdDiaedHsOQU+y28cD/8gKYp1wTwwyAjKesqaGfLG4ez7D9lKpwBw==",
"dependencies": { "dependencies": {
"bson": "^4.7.0", "bson": "^4.7.0",
"kareem": "2.5.1", "kareem": "2.5.1",
@@ -18725,12 +18725,12 @@
} }
}, },
"@babel/plugin-transform-runtime": { "@babel/plugin-transform-runtime": {
"version": "7.19.6", "version": "7.21.0",
"resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.21.0.tgz",
"integrity": "sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==", "integrity": "sha512-ReY6pxwSzEU0b3r2/T/VhqMKg/AkceBT19X0UptA3/tYi5Pe2eXgEUH+NNMC5nok6c6XQz5tyVTUpuezRfSMSg==",
"requires": { "requires": {
"@babel/helper-module-imports": "^7.18.6", "@babel/helper-module-imports": "^7.18.6",
"@babel/helper-plugin-utils": "^7.19.0", "@babel/helper-plugin-utils": "^7.20.2",
"babel-plugin-polyfill-corejs2": "^0.3.3", "babel-plugin-polyfill-corejs2": "^0.3.3",
"babel-plugin-polyfill-corejs3": "^0.6.0", "babel-plugin-polyfill-corejs3": "^0.6.0",
"babel-plugin-polyfill-regenerator": "^0.4.1", "babel-plugin-polyfill-regenerator": "^0.4.1",
@@ -24607,9 +24607,9 @@
} }
}, },
"mongoose": { "mongoose": {
"version": "6.9.1", "version": "6.9.2",
"resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.9.1.tgz", "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.9.2.tgz",
"integrity": "sha512-hOz1ZWV0w6WEVLrj89Wpk7PXDYtDDF6k7/NX79lY5iKqeFtZsceBXW8xW59YFNcW5O3cH32hQ8IbDlhgyBsDMA==", "integrity": "sha512-Yb9rWJhYm+7Yf839QuKx2dXcclbA0GAMxtdDiaedHsOQU+y28cD/8gKYp1wTwwyAjKesqaGfLG4ez7D9lKpwBw==",
"requires": { "requires": {
"bson": "^4.7.0", "bson": "^4.7.0",
"kareem": "2.5.1", "kareem": "2.5.1",

4
package.json
View File

@@ -69,7 +69,7 @@
}, },
"dependencies": { "dependencies": {
"@babel/core": "^7.20.12", "@babel/core": "^7.20.12",
"@babel/plugin-transform-runtime": "^7.19.6", "@babel/plugin-transform-runtime": "^7.21.0",
"@babel/preset-env": "^7.19.4", "@babel/preset-env": "^7.19.4",
"@babel/preset-react": "^7.18.6", "@babel/preset-react": "^7.18.6",
"body-parser": "^1.20.1", "body-parser": "^1.20.1",
@@ -91,7 +91,7 @@
"marked-extended-tables": "^1.0.5", "marked-extended-tables": "^1.0.5",
"markedLegacy": "npm:marked@^0.3.19", "markedLegacy": "npm:marked@^0.3.19",
"moment": "^2.29.4", "moment": "^2.29.4",
"mongoose": "^6.9.1", "mongoose": "^6.9.2",
"nanoid": "3.3.4", "nanoid": "3.3.4",
"nconf": "^0.12.0", "nconf": "^0.12.0",
"npm": "^8.10.0", "npm": "^8.10.0",

2
themes/Legacy/5ePHB/style.less
View File

@@ -1,4 +1,3 @@
@layer Legacy_5ePHB {
@import (less) './themes/fonts/5e legacy/fonts.less'; @import (less) './themes/fonts/5e legacy/fonts.less';
@import (less) './themes/assets/assets.less'; @import (less) './themes/assets/assets.less';
@import (less) './themes/phb.depricated.less'; @import (less) './themes/phb.depricated.less';
@@ -496,4 +495,3 @@
margin-bottom : 10px; margin-bottom : 10px;
} }
} }
}

2
themes/V3/5eDMG/style.less
View File

@@ -1,4 +1,3 @@
@layer V3_5eDMG {
:root { :root {
//Colors //Colors
--HB_Color_Accent : #EBCEC3; // Salmon --HB_Color_Accent : #EBCEC3; // Salmon
@@ -18,4 +17,3 @@
bottom : 40px; bottom : 40px;
} }
} }
}

2
themes/V3/5ePHB/style.less
View File

@@ -1,4 +1,3 @@
@layer V3_5ePHB {
@import (less) './themes/fonts/5e/fonts.less'; @import (less) './themes/fonts/5e/fonts.less';
@import (less) './themes/assets/assets.less'; @import (less) './themes/assets/assets.less';
@@ -795,4 +794,3 @@
.page h1 + *{ .page h1 + *{
margin-top : 0; margin-top : 0;
} }
}

2
themes/V3/Blank/style.less
View File

@@ -1,4 +1,3 @@
@layer V3_Blank {
@import (less) './themes/fonts/5e/fonts.less'; @import (less) './themes/fonts/5e/fonts.less';
@import (less) './themes/assets/assets.less'; @import (less) './themes/assets/assets.less';
@@ -275,4 +274,3 @@
} }
} }
} }
}

2
themes/V3/Journal/style.less
View File

@@ -1,4 +1,3 @@
@layer V3_Journal {
@import (less) './themes/fonts/Journal/fonts.less'; @import (less) './themes/fonts/Journal/fonts.less';
@import (less) './themes/assets/assets.less'; @import (less) './themes/assets/assets.less';
@@ -558,4 +557,3 @@
.page .wide { .page .wide {
margin-bottom : 0.45cm; margin-bottom : 0.45cm;
} }
}