From b7e953f50eb8c2dc77ab95a712e5b12ce54c28b8 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 17 Sep 2015 14:14:01 +0200 Subject: fix calculation of content height with margins --- library/readmore.js/readmore.js | 2 +- view/css/conversation.css | 11 +++++++---- view/js/main.js | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/library/readmore.js/readmore.js b/library/readmore.js/readmore.js index e790ceb76..d4c1cf723 100644 --- a/library/readmore.js/readmore.js +++ b/library/readmore.js/readmore.js @@ -62,7 +62,7 @@ function setBoxHeights(element) { var el = element, - expandedHeight = el.outerHeight(), + expandedHeight = el.outerHeight(true), cssMaxHeight = parseInt(el.css({maxHeight: ''}).css('max-height').replace(/[^-\d\.]/g, ''), 10), defaultHeight = element.data('defaultHeight'); diff --git a/view/css/conversation.css b/view/css/conversation.css index 7d4930aac..e409cf4cf 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -122,12 +122,15 @@ a.wall-item-name-link { overflow: auto; } -.wall-item-content h1, .wall-item-content h2 { - font-size: 1.319em; +.wall-item-content h1, +.wall-item-content h2 { + font-size: 1.319em; } -.wall-item-title h3, .wall-item-content h3, .wall-item-content h4 { - font-size: 1.112em; +.wall-item-title h3, +.wall-item-content h3, +.wall-item-content h4 { + font-size: 1.112em; } .wall-item-content img { diff --git a/view/js/main.js b/view/js/main.js index 5fe778488..a60b47541 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -615,7 +615,7 @@ function updateConvItems(mode,data) { function collapseHeight() { - $(".wall-item-body, .directory-collapse").each(function() { + $(".wall-item-content, .directory-collapse").each(function() { var orgHeight = $(this).height(); if(orgHeight > divmore_height + 10) { if(! $(this).hasClass('divmore')) { -- cgit v1.2.3 From 582607c0f03375ab84fcdc046ba73292cbd589f2 Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Thu, 17 Sep 2015 16:28:31 +0200 Subject: Another (hopefully final) Spanish update --- view/es/messages.po | 6 +++--- view/es/strings.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/view/es/messages.po b/view/es/messages.po index 0272811eb..bb0ba9839 100644 --- a/view/es/messages.po +++ b/view/es/messages.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: Redmatrix\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-11 00:05-0700\n" -"PO-Revision-Date: 2015-09-14 11:47+0000\n" +"PO-Revision-Date: 2015-09-14 18:21+0000\n" "Last-Translator: Manuel Jiménez Friaza \n" "Language-Team: Spanish (http://www.transifex.com/Friendica/red-matrix/language/es/)\n" "MIME-Version: 1.0\n" @@ -2507,7 +2507,7 @@ msgstr "Privado" #: ../../include/permissions.php:894 msgid "Community Forum" -msgstr "Foro de la comunidad" +msgstr "Foro de discusión" #: ../../include/permissions.php:895 msgid "Feed Republish" @@ -8604,7 +8604,7 @@ msgstr "O importar un canal existente de otro lugar" msgid "" "Please choose a channel type (such as social networking or community forum) " "and privacy requirements so we can select the best permissions for you" -msgstr "Elija el tipo de canal (como red social o foro de comunidad) y la privacidad que requiera, así podremos seleccionar el mejor conjunto de permisos para usted" +msgstr "Elija el tipo de canal (como red social o foro de discusión) y la privacidad que requiera, así podremos seleccionar el mejor conjunto de permisos para usted" #: ../../mod/new_channel.php:119 msgid "Channel Type" diff --git a/view/es/strings.php b/view/es/strings.php index 749562004..1d91ed820 100644 --- a/view/es/strings.php +++ b/view/es/strings.php @@ -579,7 +579,7 @@ $a->strings["Social Networking"] = "Redes sociales"; $a->strings["Mostly Public"] = "Público en su mayor parte"; $a->strings["Restricted"] = "Restringido"; $a->strings["Private"] = "Privado"; -$a->strings["Community Forum"] = "Foro de la comunidad"; +$a->strings["Community Forum"] = "Foro de discusión"; $a->strings["Feed Republish"] = "Republicar un \"feed\""; $a->strings["Special Purpose"] = "Propósito especial"; $a->strings["Celebrity/Soapbox"] = "Página para fans"; @@ -2031,7 +2031,7 @@ $a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"A $a->strings["Choose a short nickname"] = "Elija un alias corto"; $a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = "Su alias podrá usarse para crear una dirección de canal fácilmente memorizable (como una dirección de correo electrónico) que puede ser compartido con otros."; $a->strings["Or import an existing channel from another location"] = "O importar un canal existente de otro lugar"; -$a->strings["Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you"] = "Elija el tipo de canal (como red social o foro de comunidad) y la privacidad que requiera, así podremos seleccionar el mejor conjunto de permisos para usted"; +$a->strings["Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you"] = "Elija el tipo de canal (como red social o foro de discusión) y la privacidad que requiera, así podremos seleccionar el mejor conjunto de permisos para usted"; $a->strings["Channel Type"] = "Tipo de canal"; $a->strings["Read more about roles"] = "Leer más sobre los roles"; $a->strings["App installed."] = "Aplicación instalada."; -- cgit v1.2.3 From 3dc066a143783bbfff08a347f7a8aaa9e273e717 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Fri, 18 Sep 2015 22:43:35 -0700 Subject: dummy update --- boot.php | 2 +- install/update.php | 6 +++++- util/messages.po | 10 +++++----- version.inc | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/boot.php b/boot.php index 43b5581ac..e00997cef 100755 --- a/boot.php +++ b/boot.php @@ -49,7 +49,7 @@ define ( 'PLATFORM_NAME', 'redmatrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1152 ); +define ( 'DB_UPDATE_VERSION', 1153 ); /** * @brief Constant with a HTML line break. diff --git a/install/update.php b/install/update.php index 82792a82d..bcce4e5b7 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ \n" "Language-Team: LANGUAGE \n" @@ -3110,15 +3110,15 @@ msgstr "" msgid "Connection not found." msgstr "" -#: ../../include/zot.php:675 +#: ../../include/zot.php:677 msgid "Invalid data packet" msgstr "" -#: ../../include/zot.php:691 +#: ../../include/zot.php:693 msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:2142 +#: ../../include/zot.php:2161 #, php-format msgid "Unable to verify site signature for %s" msgstr "" diff --git a/version.inc b/version.inc index e008faecc..2d7153d51 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-09-16.1157 +2015-09-18.1159 -- cgit v1.2.3