Merge branch 'master' into absolute_fluorideabsolute_fluoride

1 files changed, 23 insertions, 14 deletions

diff --git a/static/style.css b/static/style.css
index 4e2a196..19cceab 100644
--- a/static/style.css
+++ b/static/style.css
@@ -194,11 +194,14 @@ textarea {
 	border-color: #777777;
 }
 
-.notification-container.favourite .status-container,
-.notification-container.reblog .status-container {
+.notification-container .status-container {
 	opacity: 0.6;
 }
 
+.notification-container.mention .status-container {
+	opacity: unset;
+}
+
 .notification-info-text span {
 	vertical-align: middle;
 }
@@ -277,7 +280,8 @@ textarea {
 	margin-top: 2px;
 }
 
-.user-profile-decription {
+.user-profile-decription,
+.user-fields {
 	overflow-wrap: break-word;
 	margin: 8px 0;
 }
@@ -286,10 +290,22 @@ textarea {
 	margin: 0;
 }
 
+.user-profile-decription img {
+	height: auto;
+	width: auto;
+	max-height: 240px;
+	max-width: 280px;
+	object-fit: contain;
+}
+
 .d-inline {
 	display: inline;
 }
 
+.p-0 {
+	padding: 0;
+}
+
 .btn-link {
 	border: none;
 	outline: none;
@@ -354,10 +370,6 @@ a:hover,
 	display: none;
 }
 
-.post-form-field>* {
-	vertical-align: middle;
-}
-
 .emoji-item-container {
 	width: 220px;
 	display: inline-block;
@@ -422,9 +434,6 @@ img.emoji {
 	margin-right: 2px;
 }
 
-.user-list-container {
-}
-
 .user-list-item {
 	overflow: auto;
 	margin: 0 0 12px 0;
@@ -441,6 +450,10 @@ img.emoji {
 	overflow: auto;
 }
 
+.user-list-action {
+	margin: 0 12px;
+}
+
 #settings-form {
 	margin: 8px 0;
 }
@@ -449,10 +462,6 @@ img.emoji {
 	margin: 4px 0;
 }
 
-.settings-form-field>* {
-	vertical-align: middle;
-}
-
 #settings-form button[type=submit] {
 	margin-top: 8px;
 }