Merge https://github.com/friendica/red into zpull

3 files changed, 35 insertions, 0 deletions

diff --git a/view/css/conversation.css b/view/css/conversation.css
index 46e1ed436..b32c5a08f 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -338,6 +338,7 @@
 	margin: 0px 0 -5px 0px;
 	padding: 0px;
 	width: 75%;
+	min-width: 170px
 }
 
 [class^="comment-edit-bb"] > li {
@@ -360,6 +361,7 @@
 .comment-edit-text-empty {
 	height: 2.8em;
 	width: 30%;
+	min-width: 170px;
 	overflow: auto;
 	margin-bottom: 10px;
 }
@@ -367,6 +369,7 @@
 .comment-edit-text-full {
 	height: 150px;
 	width: 50%;
+	min-width: 170px;
 	overflow: auto;
 }
 
diff --git a/view/css/default.css b/view/css/default.css
index c6a8fe58e..267b3bd35 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -8,6 +8,7 @@ header #banner {
 
 main {
 	display: table;
+	table-layout: fixed;
 	position: relative;
 	width: 100%;
 	height: 100%;
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 25922cb39..0b94bff80 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2277,4 +2277,35 @@ blockquote {
 	main.region_1-on {
 		left: 0px;
 	}
+
+	.thread-wrapper.toplevel_item {
+		width: 100%;
+	}
+
+	.thread-wrapper .wall-item-comment-wrapper,
+	.wall-item-content-wrapper.comment {
+		margin-left: 24px;
+	}
+
+	.wall-item-info {
+		margin-right: 10px;
+	}
+
+	.hide-comments-outer {
+		margin-left: 24px;
+	}
+
+	.comment-edit-photo {
+		margin: 10px;
+	}
+
+	.wall-item-photo {
+		width: 48px !important;
+		height: 48px !important;
+	}
+
+	.comment .wall-item-photo {
+		width: 32px !important;
+		height: 32px !important;
+	}
 }