diff options
author | Sem <sembrestels@riseup.net> | 2014-01-22 03:37:52 +0100 |
---|---|---|
committer | Sem <sembrestels@riseup.net> | 2014-01-22 03:37:52 +0100 |
commit | 4a2ed114bb18c5363f594a380676c5654f4165a4 (patch) | |
tree | 3a37094b249c40e3e6bf122691db53115f65f8f0 /mod/developers/views/default/theme_preview/typography/misc.php | |
parent | 673932bc46a3918293a28c2c2fc622b3e5ff6bde (diff) | |
parent | 0dd36c458d41e77521c36ae572fe73114ad4bc5a (diff) | |
download | elgg-4a2ed114bb18c5363f594a380676c5654f4165a4.tar.gz elgg-4a2ed114bb18c5363f594a380676c5654f4165a4.tar.bz2 |
Merge tag '1.8.18' of git://github.com/Elgg/Elgg into develop
1.8.18
Conflicts:
mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js
mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
Diffstat (limited to 'mod/developers/views/default/theme_preview/typography/misc.php')
-rw-r--r-- | mod/developers/views/default/theme_preview/typography/misc.php | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/mod/developers/views/default/theme_preview/typography/misc.php b/mod/developers/views/default/theme_preview/typography/misc.php index 93a279c36..0b9fd9db7 100644 --- a/mod/developers/views/default/theme_preview/typography/misc.php +++ b/mod/developers/views/default/theme_preview/typography/misc.php @@ -1,16 +1,16 @@ -<ul>
- <li>I am <a href="?abc123">the a tag</a> example</li>
- <li>I am <abbr title="test">the abbr tag</abbr> example</li>
- <li>I am <acronym>the acronym tag</acronym> example</li>
- <li>I am <b>the b tag</b> example</li>
- <li>I am <code>the code tag</code> example</li>
- <li>I am <del>the del tag</del> example</li>
- <li>I am <em>the em tag</em> example</li>
- <li>I am <i>the i tag</i> example</li>
- <li>I am <strong>the strong tag</strong> example</li>
-</ul>
-<blockquote><p>Paragraph inside Blockquote: <?php echo $ipsum; ?></p></blockquote>
-<pre>
- <strong>Preformated:</strong>Testing one row
- and another
-</pre>
+<ul> + <li>I am <a href="?abc123">the a tag</a> example</li> + <li>I am <abbr title="test">the abbr tag</abbr> example</li> + <li>I am <acronym>the acronym tag</acronym> example</li> + <li>I am <b>the b tag</b> example</li> + <li>I am <code>the code tag</code> example</li> + <li>I am <del>the del tag</del> example</li> + <li>I am <em>the em tag</em> example</li> + <li>I am <i>the i tag</i> example</li> + <li>I am <strong>the strong tag</strong> example</li> +</ul> +<blockquote><p>Paragraph inside Blockquote: <?php echo $ipsum; ?></p></blockquote> +<pre> + <strong>Preformated:</strong>Testing one row + and another +</pre> |