diff options
| author | zotlabs <mike@macgirvin.com> | 2018-11-13 20:37:52 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-11-13 20:37:52 -0800 |
| commit | cfc43f6dea22c4c23ed485a7b321de76515f584d (patch) | |
| tree | 11bc8dd44a4c33c390996f9190aabd135712add2 /view | |
| parent | ee85784be18c14905568fb259411f490c8d6bd91 (diff) | |
| parent | 1260887fa743a4e5522dea366f0a584430b0a9a0 (diff) | |
| download | volse-hubzilla-cfc43f6dea22c4c23ed485a7b321de76515f584d.tar.gz volse-hubzilla-cfc43f6dea22c4c23ed485a7b321de76515f584d.tar.bz2 volse-hubzilla-cfc43f6dea22c4c23ed485a7b321de76515f584d.zip | |
Merge branch 'master' into zvi
Diffstat (limited to 'view')
| -rw-r--r-- | view/es-es/hstrings.php | 4 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 10 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/Focus-Light.php | 3 | ||||
| -rw-r--r-- | view/tpl/activity_filter_widget.tpl | 2 |
4 files changed, 6 insertions, 13 deletions
diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php index 2024504a1..a459e10dd 100644 --- a/view/es-es/hstrings.php +++ b/view/es-es/hstrings.php @@ -2,10 +2,10 @@ if(! function_exists("string_plural_select_es_es")) { function string_plural_select_es_es($n){ - return ($n != 1);; + return ($n != 1 ? 1 : 0); }} App::$rtl = 0; -App::$strings["plural_function_code"] = "(n != 1)"; +App::$strings["plural_function_code"] = "(n != 1 ? 1 : 0)"; App::$strings["Can view my channel stream and posts"] = "Pueden verse la actividad y publicaciones de mi canal"; App::$strings["Can send me their channel stream and posts"] = "Se me pueden enviar entradas y contenido de un canal"; App::$strings["Can view my default channel profile"] = "Puede verse mi perfil de canal predeterminado."; diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index ddf3d1295..f2c1b7a48 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -872,10 +872,6 @@ div.jGrowl div.jGrowl-notification { margin-left: 20px; } -.reshared-content img { - width: 100%; -} - .shared_header img { border-radius: $radius; margin-right: 10px; @@ -884,21 +880,19 @@ div.jGrowl div.jGrowl-notification { .tag1 { font-size : 0.9em !important; } + .tag2 { font-size : 1.0em !important; } - .tag3 { font-size : 1.1em !important; } - .tag4 { font-size : 1.2em !important; } - .tag5 { font-size : 1.3em !important; } @@ -918,12 +912,10 @@ div.jGrowl div.jGrowl-notification { font-size : 1.6em !important; } - .tag9 { font-size : 1.7em !important; } - .tag10 { font-size : 1.8em !important; } diff --git a/view/theme/redbasic/schema/Focus-Light.php b/view/theme/redbasic/schema/Focus-Light.php index 14ee130d9..8a542d1b8 100644 --- a/view/theme/redbasic/schema/Focus-Light.php +++ b/view/theme/redbasic/schema/Focus-Light.php @@ -3,10 +3,11 @@ if (! $nav_bg) $nav_bg = "#f8f9fa"; if (! $nav_icon_colour) - $nav_icon_colour = "rgba(0, 0, 0, 0.5);"; + $nav_icon_colour = "rgba(0, 0, 0, 0.5)"; if (! $nav_active_icon_colour) $nav_active_icon_colour = "rgba(0, 0, 0, 0.7)"; if (! $radius) $radius = "4px"; if (! $banner_colour) $banner_colour = "rgba(0, 0, 0, 0.7)"; + diff --git a/view/tpl/activity_filter_widget.tpl b/view/tpl/activity_filter_widget.tpl index 1eb11c10f..7d10100ba 100644 --- a/view/tpl/activity_filter_widget.tpl +++ b/view/tpl/activity_filter_widget.tpl @@ -17,7 +17,7 @@ </form> </div> <script> - $("#cid-filter").name_autocomplete(baseurl + '/acl', 'a', true, function(data) { + $("#cid-filter").contact_autocomplete(baseurl + '/acl', 'a', true, function(data) { $("#cid").val(data.id); }); </script> |