f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-04 06:02:46 +00:00
Code Wiki Activity

Merge branch 'master' into update-react-router-dom

Browse Source
This commit is contained in:
Trevor Buckner
2022-06-20 17:24:59 -04:00
committed by GitHub
parent c0405fae08 038d0c5b68
commit 802e798492
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package-lock.json generated
View File

@@ -22249,4 +22249,4 @@
"integrity": "sha512-AP1+fQIWSM/sMiET8fyayjx/J+JmTPt2Mr0FkrgqB4todtfa53sOsrSAcIrJRD5XS20bKUwaDIuMkWKCEiQLKA==" "integrity": "sha512-AP1+fQIWSM/sMiET8fyayjx/J+JmTPt2Mr0FkrgqB4todtfa53sOsrSAcIrJRD5XS20bKUwaDIuMkWKCEiQLKA=="
} }
} }
} }

4
package.json
View File

@@ -74,7 +74,7 @@
"marked-extended-tables": "^1.0.3", "marked-extended-tables": "^1.0.3",
"markedLegacy": "npm:marked@^0.3.19", "markedLegacy": "npm:marked@^0.3.19",
"moment": "^2.29.3", "moment": "^2.29.3",
"mongoose": "^6.3.8", "mongoose": "^6.4.0",
"nanoid": "3.3.4", "nanoid": "3.3.4",
"nconf": "^0.12.0", "nconf": "^0.12.0",
"react": "^16.14.0", "react": "^16.14.0",
@@ -86,7 +86,7 @@
"vitreum": "git+https://git@github.com/calculuschild/vitreum.git" "vitreum": "git+https://git@github.com/calculuschild/vitreum.git"
}, },
"devDependencies": { "devDependencies": {
"eslint": "^8.17.0", "eslint": "^8.18.0",
"eslint-plugin-react": "^7.30.0", "eslint-plugin-react": "^7.30.0",
"jest": "^28.1.1", "jest": "^28.1.1",
"supertest": "^6.2.3" "supertest": "^6.2.3"

9
themes/5ePhb.style.less
View File

@@ -603,8 +603,8 @@ body {
white-space : nowrap; white-space : nowrap;
} }
&.frame { &.frame {
margin-top : 0.66cm; margin-top : 0.7cm;
margin-bottom : 1.05cm; margin-bottom : 0.9cm;
margin-left : -0.1cm; margin-left : -0.1cm;
margin-right : -0.1cm; margin-right : -0.1cm;
width : calc(100% + 0.2cm); width : calc(100% + 0.2cm);
@@ -612,11 +612,14 @@ body {
background-color : white; background-color : white;
border : initial; border : initial;
border-style : solid; border-style : solid;
border-image-outset : 0.55cm 0.3cm; border-image-outset : 0.4cm 0.3cm;
border-image-repeat : stretch; border-image-repeat : stretch;
border-image-slice : 200; border-image-slice : 200;
border-image-source : @frameBorderImage; border-image-source : @frameBorderImage;
border-image-width : 47px; border-image-width : 47px;
&.wide:first-child {
margin-top: 0.12cm;
}
} }
&.decoration { &.decoration {
position:relative; position:relative;