diff options
| author | friendica <info@friendica.com> | 2014-07-28 21:03:55 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-07-28 21:03:55 -0700 |
| commit | 3a108168c7dbddfe96a759b87cccede449f54484 (patch) | |
| tree | af044b54f50c1d927d8f1a959a1f9d11e8a21b6e | |
| parent | f0f6f1e08065cf1b72759d732332284464caa542 (diff) | |
| parent | 2e6dd91599c5b1790d1e994797ef90b98d5a78b3 (diff) | |
| download | volse-hubzilla-3a108168c7dbddfe96a759b87cccede449f54484.tar.gz volse-hubzilla-3a108168c7dbddfe96a759b87cccede449f54484.tar.bz2 volse-hubzilla-3a108168c7dbddfe96a759b87cccede449f54484.zip | |
Merge https://github.com/friendica/red into pending_merge
| -rw-r--r-- | view/theme/redbasic/php/style.php | 2 | ||||
| -rwxr-xr-x | view/tpl/photo_view.tpl | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 9d42bbf69..f55b29d5e 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -132,7 +132,7 @@ if(! $a->install) { if (! $font_size) $font_size = "1.0em"; if (! $body_font_size) - $body_font_size = "14px"; + $body_font_size = "12pt"; if (! $font_colour) $font_colour = "#4d4d4d"; if (! $selected_active_colour) diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 51e5c28b7..a0ca7e0f9 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -75,12 +75,11 @@ <div id="photo-edit-end"></div> </form> </div> -{{/if}} - <form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post"> <input id="photo-photo-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();"> </form> +{{/if}} {{if $likebuttons}} <div id="photo-like-div"> |