keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote branch 'upstream/master'

Browse source
This commit is contained in:
Michael Vogel 2012-08-02 10:27:11 +02:00
commit b904a21134
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
view/theme/frost-mobile/jot-header.tpl
View file

@ -1,5 +1,6 @@
<script>
var none = "none"; // ugly hack: $editselect shouldn't be a string if TinyMCE is enabled, but should if it isn't
window.editSelect = $editselect;
window.isPublic = "$ispublic";
window.nickname = "$nickname";

2
view/theme/frost-mobile/theme.php
View file

@ -4,7 +4,7 @@
* Name: Frost--mobile version
* Description: Like frosted glass
* Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
* Version: Version 0.2.1
* Version: Version 0.2.2
* Author: Zach P <windforest@f.shmuz.in>
* Maintainer: Zach P <windforest@f.shmuz.in>
*/

1
view/theme/frost/jot-header.tpl
View file

@ -1,5 +1,6 @@
<script>
var none = "none"; // ugly hack: $editselect shouldn't be a string if TinyMCE is enabled, but should if it isn't
window.editSelect = $editselect;
window.isPublic = "$ispublic";
window.nickname = "$nickname";

2
view/theme/frost/theme.php
View file

@ -4,7 +4,7 @@
* Name: Frost
* Description: Like frosted glass
* Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
* Version: Version 0.2.1
* Version: Version 0.2.2
* Author: Zach P <windforest@f.shmuz.in>
* Maintainer: Zach P <windforest@f.shmuz.in>
*/