0
0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-08 11:52:44 +00:00

Merge branch 'master' into pr/2114

This commit is contained in:
Trevor Buckner
2022-06-09 00:33:44 -04:00
3 changed files with 753 additions and 680 deletions

1394
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -65,7 +65,7 @@
"express-async-handler": "^1.2.0", "express-async-handler": "^1.2.0",
"express-static-gzip": "2.1.7", "express-static-gzip": "2.1.7",
"fs-extra": "10.1.0", "fs-extra": "10.1.0",
"googleapis": "100.0.0", "googleapis": "101.0.0",
"js-yaml": "^4.1.0", "js-yaml": "^4.1.0",
"jwt-simple": "^0.5.6", "jwt-simple": "^0.5.6",
"less": "^3.13.1", "less": "^3.13.1",
@@ -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.5", "mongoose": "^6.3.6",
"nanoid": "3.3.4", "nanoid": "3.3.4",
"nconf": "^0.12.0", "nconf": "^0.12.0",
"query-string": "7.1.1", "query-string": "7.1.1",
@@ -89,7 +89,7 @@
"devDependencies": { "devDependencies": {
"eslint": "^8.17.0", "eslint": "^8.17.0",
"eslint-plugin-react": "^7.30.0", "eslint-plugin-react": "^7.30.0",
"jest": "^28.1.0", "jest": "^28.1.1",
"supertest": "^6.2.3" "supertest": "^6.2.3"
} }
} }

View File

@@ -619,27 +619,28 @@ body {
border-image-width : 47px; border-image-width : 47px;
} }
&.decoration { &.decoration {
transform-style : preserve-3d;
z-index: -1;
position:relative; position:relative;
} }
&.decoration::before { &.decoration::before {
content :''; content :'';
position : absolute; position : absolute;
background-image : @classTableDecoration; background-image : @classTableDecoration,
background-size : contain; @classTableDecoration;
background-repeat : space; background-size : contain, contain;
width : 7.75cm; background-repeat : no-repeat, no-repeat;
height : calc(100% + 3.3cm); background-position : top, bottom;
top : 50%; width : 7.75cm;
left : 50%; height : calc(100% + 3.3cm);
transform : translateY(-50%) translateX(-50%) translateZ(-1px); top : 50%;
filter : drop-shadow(0px 0px 1px #C8C5C080) left : 50%;
transform : translateY(-50%) translateX(-50%);
filter : drop-shadow(0px 0px 1px #C8C5C080);
z-index : -1;
} }
&.decoration.wide::before { &.decoration.wide::before {
width : calc(100% + 3.3cm); width : calc(100% + 3.3cm);
height : 7.75cm; height : 7.75cm;
top : calc(50% + 0.4cm); background-position : left, right;
} }
h5 + table{ h5 + table{
margin-top : 0.2cm; margin-top : 0.2cm;