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

Merge branch 'master' into metadata-document-block

Browse Source 
# Conflicts:
#	package-lock.json
This commit is contained in:
Charlie Humphreys
2021-11-28 23:31:14 -06:00
parent 5ffdd022c2 1bc68a9e85
commit 49bc2cb32a
3 changed files with 9702 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9859
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

8
package.json
View File

@@ -42,11 +42,11 @@
"dependencies": { "dependencies": {
"@babel/core": "^7.16.0", "@babel/core": "^7.16.0",
"@babel/plugin-transform-runtime": "^7.16.4", "@babel/plugin-transform-runtime": "^7.16.4",
"@babel/preset-env": "^7.16.0", "@babel/preset-env": "^7.16.4",
"@babel/preset-react": "^7.16.0", "@babel/preset-react": "^7.16.0",
"body-parser": "^1.19.0", "body-parser": "^1.19.0",
"classnames": "^2.3.1", "classnames": "^2.3.1",
"codemirror": "^5.63.3", "codemirror": "^5.64.0",
"cookie-parser": "^1.4.6", "cookie-parser": "^1.4.6",
"create-react-class": "^15.7.0", "create-react-class": "^15.7.0",
"dedent-tabs": "^0.10.1", "dedent-tabs": "^0.10.1",
@@ -76,8 +76,8 @@
"vitreum": "git+https://git@github.com/calculuschild/vitreum.git" "vitreum": "git+https://git@github.com/calculuschild/vitreum.git"
}, },
"devDependencies": { "devDependencies": {
"eslint": "^8.2.0", "eslint": "^8.3.0",
"eslint-plugin-react": "^7.27.0", "eslint-plugin-react": "^7.27.1",
"pico-check": "^2.1.3" "pico-check": "^2.1.3"
} }
} }

6
themes/5ePhb.style.less
View File

@@ -242,9 +242,6 @@ body {
display : block; display : block;
padding-bottom : 0px; padding-bottom : 0px;
} }
p + p {
padding-top : .8em;
}
:last-child { :last-child {
margin-bottom : 0; margin-bottom : 0;
} }
@@ -275,9 +272,6 @@ body {
padding-bottom : 0px; padding-bottom : 0px;
line-height : 1.5em; line-height : 1.5em;
} }
p + p {
padding-top : .8em;
}
:last-child { :last-child {
margin-bottom : 0; margin-bottom : 0;
} }