diff options
| author | friendica <info@friendica.com> | 2014-06-26 16:26:33 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-06-26 16:26:33 -0700 |
| commit | fea4eac17a5979fc5ffe0ac74e626c3cc562a45e (patch) | |
| tree | 33c1ebecb67d9fdec59c27b9fbf45f381d6606cc | |
| parent | 8b545d91db1bec0881645a989f4d7fc146397154 (diff) | |
| parent | 0db4b55223d5df47a13cdb47d25ba30fd57df5c1 (diff) | |
| download | volse-hubzilla-fea4eac17a5979fc5ffe0ac74e626c3cc562a45e.tar.gz volse-hubzilla-fea4eac17a5979fc5ffe0ac74e626c3cc562a45e.tar.bz2 volse-hubzilla-fea4eac17a5979fc5ffe0ac74e626c3cc562a45e.zip | |
Merge https://github.com/friendica/red into pending_merge
| -rw-r--r-- | app/invite.apd | 4 | ||||
| -rw-r--r-- | app/invite.png | bin | 0 -> 5166 bytes | |||
| -rw-r--r-- | library/jquery.divgrow/jquery.divgrow-1.3.1.js | 10 | ||||
| -rw-r--r-- | mod/home.php | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 4 |
5 files changed, 15 insertions, 5 deletions
diff --git a/app/invite.apd b/app/invite.apd new file mode 100644 index 000000000..8526d2d4a --- /dev/null +++ b/app/invite.apd @@ -0,0 +1,4 @@ +url: $baseurl/invite +requires: local_user +name: Invite +photo: $baseurl/app/invite.png diff --git a/app/invite.png b/app/invite.png Binary files differnew file mode 100644 index 000000000..1cd9ce254 --- /dev/null +++ b/app/invite.png diff --git a/library/jquery.divgrow/jquery.divgrow-1.3.1.js b/library/jquery.divgrow/jquery.divgrow-1.3.1.js index e79c7928c..49788f802 100644 --- a/library/jquery.divgrow/jquery.divgrow-1.3.1.js +++ b/library/jquery.divgrow/jquery.divgrow-1.3.1.js @@ -43,12 +43,12 @@ obj.css('height', options.initialHeight).css('overflow', 'hidden');
if (options.showBrackets) {
- obj.after('<p class="divgrow-brackets">[…]</p><a href="#" class="divgrow-showmore' + " divgrow-obj-" + divgrowid + '"' + '></a>');
+ obj.after('<p class="divgrow-brackets">[…]</p><div href="#" class="divgrow-showmore' + " divgrow-obj-" + divgrowid + '"' + '></div>');
}
else {
- obj.after('<a href="#" class="divgrow-showmore' + " divgrow-obj-" + divgrowid + '"' + '></a>');
+ obj.after('<div class="divgrow-showmore' + " divgrow-obj-" + divgrowid + '"' + '></div>');
}
- $("a.divgrow-showmore").html(options.moreText);
+ $("div.divgrow-showmore").html(options.moreText);
$("." + "divgrow-obj-" + divgrowid).toggle(function () {
//alert(obj.attr('class'));
@@ -61,7 +61,7 @@ if (options.showBrackets) {
$(this).nextAll("p.divgrow-brackets:first").fadeOut();
}
- $(this).nextAll("a.divgrow-showmore:first").html(options.lessText);
+ $(this).nextAll("div.divgrow-showmore:first").html(options.lessText);
});
@@ -74,7 +74,7 @@ if (options.showBrackets) {
$(this).nextAll("p.divgrow-brackets:first").stop(true, false).fadeIn();
}
- $(this).nextAll("a.divgrow-showmore:first").stop(true, false).html(options.moreText);
+ $(this).nextAll("div.divgrow-showmore:first").stop(true, false).html(options.moreText);
});
});
diff --git a/mod/home.php b/mod/home.php index 6f7a0b5d7..bc352976d 100644 --- a/mod/home.php +++ b/mod/home.php @@ -16,6 +16,8 @@ function home_init(&$a) { if(! $dest) $dest = get_pconfig(local_user(),'system','startpage'); if(! $dest) + $dest = get_config('system','startpage'); + if(! $dest) $dest = z_root() . '/apps'; goaway($dest); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 4ee8a7477..50e698e48 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2062,10 +2062,14 @@ img.mail-list-sender-photo { border-bottom-right-radius: $radiuspx; border-bottom-left-radius: $radiuspx; text-align: center; + font-weight: bold; + color: $link_colour; + cursor: pointer; } .divgrow-showmore:hover { border-top: 1px dashed #adadad; + text-decoration: underline; } |
