permissions responder + upstream merge

1 files changed, 15 insertions, 3 deletions

diff --git a/view/theme/duepuntozero/css/style.css b/view/theme/duepuntozero/css/style.css
index 34360aacf..f2edad499 100644
--- a/view/theme/duepuntozero/css/style.css
+++ b/view/theme/duepuntozero/css/style.css
@@ -952,7 +952,6 @@ input#dfrn-url {
 	position: relative;
 	-moz-border-radius: 3px;
 	border-radius: 3px;	
-
 }
 
 .tread-wrapper .tread-wrapper {
@@ -1210,6 +1209,10 @@ input#dfrn-url {
 	width: 100px;
 	float: left;
 }
+.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-photo {
+	width: 40px;
+}
+
 .comment-edit-photo img {
 	width: 25px;
 }
@@ -1229,6 +1232,10 @@ input#dfrn-url {
 	margin: 10px 0px 10px 110px;
 }
 
+.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-submit-wrapper > .comment-edit-submit {
+	margin-left: 50px;
+}
+
 #profile-jot-plugin-wrapper,
 #profile-jot-submit-wrapper {
 	margin-top: 15px;
@@ -1772,12 +1779,16 @@ input#dfrn-url {
 
 .comment-edit-text-empty {
 	color: gray;
-	height: 30px;
+	height: 5em;
 	width: 175px;
 	overflow: auto;
 	margin-bottom: 10px;
 }
 
+.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-text-empty {
+	height: 1.5em;
+}
+
 .comment-edit-text-full {
 	color: black;
 	height: 150px;
@@ -3088,7 +3099,8 @@ aside input[type='text'] {
 [class^="comment-edit-bb"] {
 	list-style: none;
 	display: none;
-	margin: 0px 0 -5px 60px;
+	margin: 0px 0 -5px 0px;
+	padding: 0px;
 	width: 75%;
 }
 [class^="comment-edit-bb"] > li {