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

3 files changed, 8 insertions, 26 deletions

diff --git a/view/css/conversation.css b/view/css/conversation.css
index 1a614d2f0..b32a08486 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -6,7 +6,7 @@
 	border: 0px;
 	margin: 0px;
 	padding: 8px;
-	height: 3.4em;
+	height: 39px;
 	width: 70%;
 	margin-bottom: 5px;
 }
@@ -16,7 +16,7 @@
 }
 
 #profile-jot-text {
-	height: 40px;
+	height: 39px;
 	padding: 8px;
 	width: 100%;
 }
@@ -72,22 +72,6 @@
 	margin-right: 10px;
 }
 
-.wallwall .wwto {
-	left: 50px;
-	margin: 0;
-	position: absolute;
-	width: 30px
-}
-
-.wallwall .wwto img {
-	width: 30px !important;
-	height: 30px !important;
-}
-
-.wallwall .wall-item-photo-end {
-	clear: both;
-}
-
 .wall-item-photo-wrapper {
 	margin-top: 0px;
 	margin-bottom: 20px;
@@ -206,8 +190,8 @@
 }
 
 .comment-edit-text-empty {
-	height: 2.8em;
-	overflow: auto;
+	height: 30px;
+	overflow: hidden;
 	resize: none;
 
 }
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 29b11c4d5..262819469 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1850,11 +1850,11 @@ img.mail-list-sender-photo {
 }
 
 #profile-jot-text::-webkit-input-placeholder {
-	font-size:19px;
+	font-size:18px;
 }
 
 #profile-jot-text::-moz-placeholder {
-	font-size:19px;
+	font-size:18px;
 }
 
 #profile-jot-text:focus::-webkit-input-placeholder {
@@ -2234,7 +2234,6 @@ blockquote {
 
 .nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{
 	border:1px solid $navtabs_borderc;
-	border-bottom:1px solid transparent;
 }
 
 .nav-tabs.nav-justified > li > a {
@@ -2245,7 +2244,6 @@ blockquote {
     	text-decoration: $navtabs_decohover;
     	background-color: $navtabs_bgchover;
 	border-color: transparent;
-	border-bottom-color: $navtabs_borderc;
 	$navtabs_linkchover
 }
 
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 0915172fb..bf371b05c 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -6,9 +6,9 @@
 {{/if}}
 	<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper {{$item.toplevel}}">
 		<a name="{{$item.id}}" ></a>
-		<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
+		<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
 			<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;">
-				<div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}" >
+				<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
 					<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}}" id="wall-item-photo-wrapper-{{$item.id}}">
 						<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"><img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" /></a>
 					</div>