aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-09-10 22:00:56 -0700
committerfriendica <info@friendica.com>2012-09-10 22:00:56 -0700
commitc8957b36ea11a41604330c8f87c0fc0611ef18e6 (patch)
tree4a1b2ae68d463a69c388fa6ee0a7453cc8e74498 /view/theme
parent61cca7637af3c4484d90ed9e1208a10845758276 (diff)
downloadvolse-hubzilla-c8957b36ea11a41604330c8f87c0fc0611ef18e6.tar.gz
volse-hubzilla-c8957b36ea11a41604330c8f87c0fc0611ef18e6.tar.bz2
volse-hubzilla-c8957b36ea11a41604330c8f87c0fc0611ef18e6.zip
permissions responder + upstream merge
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/duepuntozero/css/style.css18
-rw-r--r--view/theme/duepuntozero/php/theme.php14
2 files changed, 26 insertions, 6 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 {
diff --git a/view/theme/duepuntozero/php/theme.php b/view/theme/duepuntozero/php/theme.php
index e42c2b7b4..a1d436a4b 100644
--- a/view/theme/duepuntozero/php/theme.php
+++ b/view/theme/duepuntozero/php/theme.php
@@ -34,11 +34,19 @@ function insertFormatting(comment,BBcode,id) {
return true;
}
-function cmtBbOpen(id) {
- $(".comment-edit-bb-" + id).show();
+function cmtBbOpen(comment, id) {
+ if($(comment).hasClass('comment-edit-text-full')) {
+ $(".comment-edit-bb-" + id).show();
+ return true;
+ }
+ return false;
}
function cmtBbClose(comment, id) {
- $(".comment-edit-bb-" + id).hide();
+ if($(comment).hasClass('comment-edit-text-empty')) {
+ $(".comment-edit-bb-" + id).hide();
+ return true;
+ }
+ return false;
}
$(document).ready(function() {