merge with upstream

static/fluoride.js

@@ -286,6 +286,12 @@ function onPaste(e) {
 	fp.files = dt.files;
 }
 
+function onKeydown(e) {
+	if (e.key == 'Enter' && e.ctrlKey) {
+		document.querySelector(".post-form").submit();
+	}
+}
+
 document.addEventListener("DOMContentLoaded", function() { 
 	checkCSRFToken();
 	checkAntiDopamineMode();
@@ -326,8 +332,10 @@ document.addEventListener("DOMContentLoaded", function() {
 	}
 
 	var pf = document.querySelector(".post-form")
-	if (pf)
+	if (pf) {
 		pf.addEventListener("paste", onPaste);
+		pf.addEventListener("keydown", onKeydown);
+	}
 });
 
 // @license-end

static/style.css

@@ -1,4 +1,4 @@
-body {
+frame, body {
 	background-color: #d2d2d2;
 }
 
@@ -167,15 +167,14 @@ textarea {
 	padding: 4px;
 	font-size: 11pt;
 	font-family: initial;
+	box-sizing: border-box;
 }
 
 .post-content {
-	box-sizing: border-box;
 	width: 100%;
 }
 
-#css {
-	box-sizing: border-box;
+#css, #bio {
 	max-width: 100%;
 }
 
@@ -442,9 +441,14 @@ img.emoji {
 	margin-right: 2px;
 }
 
+.profile-edit-link {
+	font-size: 8pt;
+}
+
 .user-list-item {
 	overflow: auto;
-	margin: 0 0 12px 0;
+	margin: 0 0 4px 0;
+	padding: 4px;
 	display: flex;
 	align-items: center;
 }
@@ -596,6 +600,41 @@ kbd {
 	color: #789922;
 }
 
+.profile-form {
+	margin: 0 4px;
+}
+
+.profile-form-field {
+	margin: 8px 0;
+}
+
+.profile-avatar {
+	height: 96px;
+	width: 96px;
+	object-fit: contain;
+}
+
+.profile-banner {
+	height: 120px;
+}
+
+.block-label,
+.profile-delete,
+.profile-field,
+.profile-field input {
+	margin: 0 0 4px 0;
+}
+
+.profile-form input[type=text] {
+	width: 320px;
+	max-width: 100%;
+	box-sizing: border-box;
+}
+
+#bio {
+	width: 644px;
+}
+
 .dark {
 	background-color: #222222;
 	background-image: none;
@@ -606,7 +645,7 @@ kbd {
 	color: #81a2be;
 }
 
-.dark textarea {
+.dark .post-content {
 	background-color: #333333;
 	border: 1px solid #444444;
 	color: #eaeaea;