aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-01-29 15:28:09 -0800
committerfriendica <info@friendica.com>2014-01-29 15:28:09 -0800
commit1915add7c1c812a368540ece48209729329ced94 (patch)
treed83aa057d1052593e26aaca2a690b0058e1b41aa /doc
parent777d4e1ddb0d6c10be74d797dc930cb8df6923b0 (diff)
parent75022367e5c3ecec24ec66acff162d6dd534486c (diff)
downloadvolse-hubzilla-1915add7c1c812a368540ece48209729329ced94.tar.gz
volse-hubzilla-1915add7c1c812a368540ece48209729329ced94.tar.bz2
volse-hubzilla-1915add7c1c812a368540ece48209729329ced94.zip
Merge pull request #290 from git-marijus/master
add image floating to bbcode
Diffstat (limited to 'doc')
-rw-r--r--doc/bbcode.html4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/bbcode.html b/doc/bbcode.html
index a24dd8b5d..cb8286ad7 100644
--- a/doc/bbcode.html
+++ b/doc/bbcode.html
@@ -9,6 +9,10 @@
<li>[color=red]red[/color] - <span style="color: red;">red</span><br />
<li>[url=https://redmatrix.me]Red Matrix[/url] <a href="https://redmatrix.me">Red Matrix</a><br />
<li>[img]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg" alt="Image/photo" /><br />
+<li>[img float=left]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg" style="float:left;" alt="Image/photo" /><br />
+<div style="clear:both;"></div>
+<li>[img float=right]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] <img src="https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg" style="float:right;" alt="Image/photo" /><br />
+<div style="clear:both;"></div>
<li>[code]code[/code] <code>code</code><br />
<li>[quote]quote[/quote] <blockquote>quote</blockquote><br />
<li>[quote=Author]Author? Me? No, no, no...[/quote] <br /><strong class="author">Author wrote:</strong><blockquote>Author? Me? No, no, no...</blockquote><br />