harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
friendica 2015-03-26 18:10:42 -07:00
commit fe2d5969d2
13 changed files with 8345 additions and 7611 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
view/js/main.js
View File

@ -616,12 +616,20 @@ function updateConvItems(mode,data) {
function collapseHeight() {
$(".wall-item-body, .contact-info").each(function() {
if($(this).height() > divmore_height + 10) {
var orgHeight = $(this).height();
if(orgHeight > divmore_height + 10) {
if(! $(this).hasClass('divmore')) {
$(this).readmore({
collapsedHeight: divmore_height,
moreLink: '<a href="#" class="divgrow-showmore">' + aStr.divgrowmore + '</a>',
lessLink: '<a href="#" class="divgrow-showmore">' + aStr.divgrowless + '</a>'
lessLink: '<a href="#" class="divgrow-showmore">' + aStr.divgrowless + '</a>',
beforeToggle: function(trigger, element, expanded) {
if(expanded) {
if((($(element).offset().top + divmore_height) - $(window).scrollTop()) < 65 ) {
$('html, body').animate( { scrollTop: $(window).scrollTop() - (orgHeight - divmore_height) }, {duration: 100 } );
}
}
}
});
$(this).addClass('divmore');
}
@ -666,8 +674,10 @@ function liveUpdate() {
else
update_mode = 'append';
}
else
else {
update_mode = 'update';
var orgHeight = $("#region_2").height();
}
$.get(update_url, function(data) {
page_load = false;
@ -676,6 +686,10 @@ function liveUpdate() {
$("#page-spinner").spin(false);
$("#profile-jot-text-loading").spin(false);
if(update_mode === 'update') {
$(window).scrollTop($(window).scrollTop() + $("#region_2").height() - orgHeight);
}
in_progress = false;
// FIXME - the following lines were added so that almost
@ -1340,4 +1354,4 @@ function zid(s) {
s = s + achar + 'f=&zid=' + zid;
return s;
}
}

13119
view/nb-no/messages.po
View File

File diff suppressed because it is too large Load Diff

2533
view/nb-no/strings.php
View File

File diff suppressed because it is too large Load Diff

23
view/theme/redbasic/css/style.css
View File

@ -1347,13 +1347,7 @@ header {
}
.notify-seen a {
background: $notifyseen_bgcolour;
color: $notifyseen_linkcolour !important;
}
.notify-seen a:hover {
background: $notifyseen_bghover;
color: $notifyseen_linkhover !important;
background: #ddd;
}
#page-spinner {
@ -1866,21 +1860,6 @@ nav .dropdown-menu {
border-top-left-radius: 0px;
border-bottom-right-radius: $radiuspx;
border-bottom-left-radius: $radiuspx;
background-color: $notify_bgcolour;
}
nav .dropdown-menu .divider{
background-color: $navmenu_bgchover;
}
nav .dropdown-menu>li>a{
color: $notify_linkcolour;
}
nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
color: $notify_linkcolour;
background-color: $navmenu_bgchover;
$navmenu_bgimage
}
#usermenu-caret {

31
view/theme/redbasic/php/style.php
View File

@ -96,10 +96,6 @@ if(! $a->install) {
$nav_icon_colour = "#999";
if (! $nav_active_icon_colour)
$nav_active_icon_colour = "#fff";
if (! $navmenu_bgchover)
$navmenu_bgchover = "#f5f5f5";
if (! $navmenu_bgimage)
$navmenu_bgimage = "";
if (! $navtabs_borderc)
$navtabs_borderc = "rgba(204,204,204,0.8)";
if (! $navtabs_fontcolour)
@ -200,23 +196,6 @@ if(! $a->install) {
$acpopup_tgbl_bgcolour = "#ddddff";
if (! $acpopup_hovercolour)
$acpopup_hovercolour = "#000";
if (! $notify_bgcolour)
$notify_bgcolour = "#fff";
if (! $notify_linkcolour)
$notify_linkcolour = "#333";
if (! $notify_bghover)
$notify_bghover = "#e7e7e7";
if (! $notifyseen_bgcolour)
$notifyseen_bgcolour = "#ddd";
if (! $notifyseen_linkcolour)
$notifyseen_linkcolour = "#333";
if (! $notifyseen_bghover)
$notifyseen_bghover = "#e7e7e7";
if (! $notifyseen_linkhover)
$notifyseen_linkhover = "#333";
if (! $notify_topmargin)
$notify_topmargin = "1px";
if (! $radius)
$radius = "4";
@ -262,8 +241,6 @@ $options = array (
'$nav_bd' => $nav_bd,
'$nav_icon_colour' => $nav_icon_colour,
'$nav_active_icon_colour' => $nav_active_icon_colour,
'$navmenu_bgchover' => $navmenu_bgchover,
'$navmenu_bgimage' => $navmenu_bgimage,
'$navtabs_borderc' => $navtabs_borderc,
'$navtabs_fontcolour' => $navtabs_fontcolour,
'$navtabs_bgcolour' => $navtabs_bgcolour,
@ -314,14 +291,6 @@ $options = array (
'$acpopup_bordercolour' => $acpopup_bordercolour,
'$acpopup_tgbl_bgcolour' => $acpopup_tgbl_bgcolour,
'$acpopup_hovercolour' => $acpopup_hovercolour,
'$notify_bgcolour' => $notify_bgcolour,
'$notify_linkcolour' => $notify_linkcolour,
'$notify_bghover' => $notify_bghover,
'$notifyseen_bgcolour' => $notifyseen_bgcolour,
'$notifyseen_linkcolour' => $notifyseen_linkcolour,
'$notifyseen_bghover' => $notifyseen_bghover,
'$notifyseen_linkhover' => $notifyseen_linkhover,
'$notify_topmargin' => $notify_topmargin,
'$radius' => $radius,
'$shadow' => $shadow,
'$active_colour' => $active_colour,

35
view/theme/redbasic/schema/dark.css
View File

@ -115,3 +115,38 @@ input[type="submit"] {
background-color: #333;
color: #fff;
}
.notify-seen a {
background: #111;
color: #222 !important;
}
.notify-seen a:hover {
background: #222;
color: #ccc !important;
}
nav .dropdown-menu>li>a{
color: #fff;
}
nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
color: #fff;
background-color: #222;
background-image: none;
}
nav .dropdown-menu .divider{
background-color: #222;
}
nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
color: #fff;
background-color: #222;
background-image: none;
}
nav .dropdown-menu {
background-color: #000;
}

21
view/theme/redbasic/schema/dark.php
View File

@ -16,10 +16,6 @@
$nav_icon_colour = "#999";
if (! $nav_active_icon_colour)
$nav_active_icon_colour = "#fff";
if (! $navmenu_bgchover)
$navmenu_bgchover = "#222";
if (! $navmenu_bgimage)
$navmenu_bgimage = "background-image: none;";
if (! $navtabs_borderc)
$navtabs_borderc = "#333";
if (! $navtabs_fontcolour)
@ -116,20 +112,3 @@
$dropdown_bordercol = "#222";
if (! $preview_backgroundimg)
$preview_backgroundimg = "gray_and_black_diagonal_stripes_background_seamless.gif";
if (! $notify_bgcolour)
$notify_bgcolour = "#000";
if (! $notify_linkcolour)
$notify_linkcolour = "#FFF";
if (! $notify_bghover)
$notify_bghover = "#222";
if (! $notify_topmargin)
$notify_topmargin = "-1px";
if (! $notifyseen_bgcolour)
$notifyseen_bgcolour = "#111";
if (! $notifyseen_linkcolour)
$notifyseen_linkcolour = "#222";
if (! $notifyseen_bghover)
$notifyseen_bghover = "#222";
if (! $notifyseen_linkhover)
$notifyseen_linkhover = "#CCC";

35
view/theme/redbasic/schema/simple_black_on_white.css
View File

@ -115,3 +115,38 @@ input[type="submit"] {
background-color: #fff;
color: #000;
}
.notify-seen a {
background: #fff;
color: #fff !important;
}
.notify-seen a:hover {
background: #fff;
color: #000 !important;
}
nav .dropdown-menu>li>a{
color: #000;
}
nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
color: #000;
background-color: #F5F5F5;
background-image: none;
}
nav .dropdown-menu .divider{
background-color: #F5F5F5;
}
nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
color: #000;
background-color: #F5F5F5;
background-image: none;
}
nav .dropdown-menu {
background-color: #fff;
}

22
view/theme/redbasic/schema/simple_black_on_white.php
View File

@ -16,10 +16,7 @@
$nav_icon_colour = "#111";
if (! $nav_active_icon_colour)
$nav_active_icon_colour = "#000";
if (! $navmenu_bgchover)
$navmenu_bgchover = "#F5F5F5";
if (! $navmenu_bgimage)
$navmenu_bgimage = "background-image: none;";
if (! $navtabs_borderc)
$navtabs_borderc = "#000";
if (! $navtabs_fontcolour)
@ -114,20 +111,3 @@
$dropdown_bordercol = "#fff";
if (! $preview_backgroundimg)
$preview_backgroundimg = "gray_and_white_diagonal_stripes_background_seamless.gif";
if (! $notify_bgcolour)
$notify_bgcolour = "#fff";
if (! $notify_linkcolour)
$notify_linkcolour = "#000";
if (! $notify_bghover)
$notify_bghover = "#fff";
if (! $notify_topmargin)
$notify_topmargin = "-1px";
if (! $notifyseen_bgcolour)
$notifyseen_bgcolour = "#fff";
if (! $notifyseen_linkcolour)
$notifyseen_linkcolour = "#fff";
if (! $notifyseen_bghover)
$notifyseen_bghover = "#fff";
if (! $notifyseen_linkhover)
$notifyseen_linkhover = "#000";

35
view/theme/redbasic/schema/simple_green_on_black.css
View File

@ -115,3 +115,38 @@ input[type="submit"] {
background-color: #000;
color: #50f148;
}
.notify-seen a {
background: #000;
color: #000 !important;
}
.notify-seen a:hover {
background: #000;
color: #50f148 !important;
}
nav .dropdown-menu>li>a{
color: #50f148;
}
nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
color: #50f148;
background-color: #143D12;
background-image: none;
}
nav .dropdown-menu .divider{
background-color: #143D12;
}
nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
color: #50f148;
background-color: #143D12;
background-image: none;
}
nav .dropdown-menu {
background-color: #000;
}

25
view/theme/redbasic/schema/simple_green_on_black.php
View File

@ -16,10 +16,6 @@
$nav_icon_colour = "#32962D";
if (! $nav_active_icon_colour)
$nav_active_icon_colour = "#50f148";
if (! $navmenu_bgchover)
$navmenu_bgchover = "#143D12";
if (! $navmenu_bgimage)
$navmenu_bgimage = "background-image: none;";
if (! $navtabs_borderc)
$navtabs_borderc = "#143D12";
if (! $navtabs_fontcolour)
@ -114,22 +110,11 @@ if (! $navaside_bghover)
$dropdown_bordercol = "#143D12";
if (! $preview_backgroundimg)
$preview_backgroundimg = "gray_and_black_diagonal_stripes_background_seamless.gif";
if (! $notify_bgcolour)
$notify_bgcolour = "#000";
if (! $notify_linkcolour)
$notify_linkcolour = "#50f148";
if (! $notify_bghover)
$notify_bghover = "#000";
if (! $notify_topmargin)
$notify_topmargin = "-1px";
if (! $notifyseen_bgcolour)
$notifyseen_bgcolour = "#000";
if (! $notifyseen_linkcolour)
$notifyseen_linkcolour = "#000";
if (! $notifyseen_bghover)
$notifyseen_bghover = "#000";
if (! $notifyseen_linkhover)
$notifyseen_linkhover = "#50f148";

34
view/theme/redbasic/schema/simple_white_on_black.css
View File

@ -116,3 +116,37 @@ input[type="submit"] {
background-color: #000;
color: #fff;
}
.notify-seen a {
background: #000;
color: #000 !important;
}
.notify-seen a:hover {
background: #000;
color: #fff !important;
}
nav .dropdown-menu>li>a{
color: #fff;
}
nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
color: #fff;
background-color: #030303;
background-image: none;
}
nav .dropdown-menu .divider{
background-color: #030303;
}
nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
color: #fff;
background-color: #030303;
background-image: none;
}
nav .dropdown-menu {
background-color: #000;
}

21
view/theme/redbasic/schema/simple_white_on_black.php
View File

@ -16,10 +16,6 @@
$nav_icon_colour = "#eee";
if (! $nav_active_icon_colour)
$nav_active_icon_colour = "#fff";
if (! $navmenu_bgchover)
$navmenu_bgchover = "#030303";
if (! $navmenu_bgimage)
$navmenu_bgimage = "background-image: none;";
if (! $navtabs_borderc)
$navtabs_borderc = "#fff";
if (! $navtabs_fontcolour)
@ -114,20 +110,3 @@
$dropdown_bordercol = "#000";
if (! $preview_backgroundimg)
$preview_backgroundimg = "gray_and_black_diagonal_stripes_background_seamless.gif";
if (! $notify_bgcolour)
$notify_bgcolour = "#000";
if (! $notify_linkcolour)
$notify_linkcolour = "#fff";
if (! $notify_bghover)
$notify_bghover = "#000";
if (! $notify_topmargin)
$notify_topmargin = "-1px";
if (! $notifyseen_bgcolour)
$notifyseen_bgcolour = "#000";
if (! $notifyseen_linkcolour)
$notifyseen_linkcolour = "#000";
if (! $notifyseen_bghover)
$notifyseen_bghover = "#000";
if (! $notifyseen_linkhover)
$notifyseen_linkhover = "#fff";