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 2014-07-28 21:03:55 -07:00
commit 3a108168c7
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,7 +132,7 @@ if(! $a->install) {
if (! $font_size) if (! $font_size)
$font_size = "1.0em"; $font_size = "1.0em";
if (! $body_font_size) if (! $body_font_size)
$body_font_size = "14px"; $body_font_size = "12pt";
if (! $font_colour) if (! $font_colour)
$font_colour = "#4d4d4d"; $font_colour = "#4d4d4d";
if (! $selected_active_colour) if (! $selected_active_colour)

3
view/tpl/photo_view.tpl
View File

@ -75,12 +75,11 @@
<div id="photo-edit-end"></div> <div id="photo-edit-end"></div>
</form> </form>
</div> </div>
{{/if}}
<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post"> <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();"> <input id="photo-photo-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();">
</form> </form>
{{/if}}
{{if $likebuttons}} {{if $likebuttons}}
<div id="photo-like-div"> <div id="photo-like-div">