Merge branch 'master' into trimBrewTitlesOnUserPage-#2775

client/homebrew/pages/editPage/editPage.jsx

@@ -91,7 +91,7 @@ const EditPage = createClass({
 		if(!(e.ctrlKey || e.metaKey)) return;
 		const S_KEY = 83;
 		const P_KEY = 80;
-		if(e.keyCode == S_KEY) this.save();
+		if(e.keyCode == S_KEY) this.trySave(true);
 		if(e.keyCode == P_KEY) window.open(`/print/${this.processShareId()}?dialog=true`, '_blank').focus();
 		if(e.keyCode == P_KEY || e.keyCode == S_KEY){
 			e.stopPropagation();
@@ -137,13 +137,14 @@ const EditPage = createClass({
 		return !_.isEqual(this.state.brew, this.savedBrew);
 	},
 
-	trySave : function(){
+	trySave : function(immediate=false){
 		if(!this.debounceSave) this.debounceSave = _.debounce(this.save, SAVE_TIMEOUT);
 		if(this.hasChanges()){
 			this.debounceSave();
 		} else {
 			this.debounceSave.cancel();
 		}
+		if(immediate) this.debounceSave.flush();
 	},
 
 	handleGoogleClick : function(){

package.json

@@ -78,10 +78,10 @@
     ]
   },
   "dependencies": {
-    "@babel/core": "^7.22.10",
-    "@babel/plugin-transform-runtime": "^7.22.10",
-    "@babel/preset-env": "^7.22.10",
-    "@babel/preset-react": "^7.22.5",
+    "@babel/core": "^7.22.15",
+    "@babel/plugin-transform-runtime": "^7.22.15",
+    "@babel/preset-env": "^7.22.15",
+    "@babel/preset-react": "^7.22.15",
     "@googleapis/drive": "^5.1.0",
     "body-parser": "^1.20.2",
     "classnames": "^2.3.2",
@@ -99,11 +99,11 @@
     "lodash": "^4.17.21",
     "marked": "5.1.1",
     "marked-extended-tables": "^1.0.6",
-    "marked-gfm-heading-id": "^3.0.6",
+    "marked-gfm-heading-id": "^3.0.7",
     "marked-smartypants-lite": "^1.0.0",
     "markedLegacy": "npm:marked@^0.3.19",
     "moment": "^2.29.4",
-    "mongoose": "^7.4.3",
+    "mongoose": "^7.5.0",
     "nanoid": "3.3.4",
     "nconf": "^0.12.0",
     "npm": "^9.8.1",
@@ -116,10 +116,10 @@
     "vitreum": "git+https://git@github.com/calculuschild/vitreum.git"
   },
   "devDependencies": {
-    "eslint": "^8.47.0",
+    "eslint": "^8.48.0",
     "eslint-plugin-jest": "^27.2.3",
     "eslint-plugin-react": "^7.33.2",
-    "jest": "^29.6.2",
+    "jest": "^29.6.4",
     "jest-expect-message": "^1.1.3",
     "postcss-less": "^6.0.0",
     "stylelint": "^15.10.3",

themes/V3/5ePHB/style.less

@@ -42,7 +42,7 @@ body {
 		margin-top : 0.1cm;
 	}
 }
-.useColumns(@multiplier : 1, @fillMode: balance){
+.useColumns(@multiplier : 1, @fillMode: auto){
 	column-count         : 2;
 	column-fill          : @fillMode;
 	column-gap           : 0.9cm;

themes/V3/Blank/style.less

@@ -33,7 +33,7 @@ body {
 	}
 }
 
-.useColumns(@multiplier : 1, @fillMode: balance){
+.useColumns(@multiplier : 1, @fillMode: auto){
 	column-fill          : @fillMode;
 	column-count         : 2;
 }
@@ -42,6 +42,7 @@ body {
 	column-span       : all;
 	columns           : inherit;
 	column-gap        : inherit;
+	column-fill       : inherit;
 }
 .page{
 	.useColumns();