Merge tag '1.8.8' of git://github.com/Elgg/Elgg into lorea-preprod

Elgg 1.8.8 release

Conflicts:
	js/lib/languages.js

4 files changed, 7 insertions, 41 deletions

diff --git a/mod/developers/views/default/theme_preview/typography/fonts.php b/mod/developers/views/default/theme_preview/typography/fonts.php
new file mode 100644
index 000000000..dd3c53f00
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/typography/fonts.php
@@ -0,0 +1,7 @@
+<ul>
+	<li>Lorem ipsum dolor sit amet (body)</li>
+	<li><span class="elgg-text-help" style="display: inline;">Lorem ipsum dolor sit amet</span> (.elgg-text-help)</li>
+	<li><span class="elgg-quiet">Lorem ipsum dolor sit amet</span> (.elgg-quiet)</li>
+	<li><span class="elgg-loud">Lorem ipsum dolor sit amet</span> (.elgg-loud)</li>
+	<li><span class="elgg-monospace">Lorem ipsum dolor sit amet</span> (.elgg-monospace)</li>
+</ul>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/typography/headings.php b/mod/developers/views/default/theme_preview/typography/headings.php
deleted file mode 100644
index 1eb96c75c..000000000
--- a/mod/developers/views/default/theme_preview/typography/headings.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<h1>Level 1 heading</h1>

-<h2>Level 2 heading</h2>

-<h3>Level 3 heading</h3>

-<h4>Level 4 heading</h4>

-<h5>Level 5 heading</h5>

-<h6>Level 6 heading</h6>
\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/typography/misc.php b/mod/developers/views/default/theme_preview/typography/misc.php
deleted file mode 100644
index 93a279c36..000000000
--- a/mod/developers/views/default/theme_preview/typography/misc.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<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>

diff --git a/mod/developers/views/default/theme_preview/typography/paragraph.php b/mod/developers/views/default/theme_preview/typography/paragraph.php
deleted file mode 100644
index 54d548f46..000000000
--- a/mod/developers/views/default/theme_preview/typography/paragraph.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<p>Lorem ipsum dolor sit amet, <a href="#" title="test link">test link</a>

-adipiscing elit. Nullam dignissim convallis est. Quisque aliquam. Donec

-faucibus. Nunc iaculis suscipit dui. Nam sit amet sem. Aliquam libero

-nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent

-mattis, massa quis luctus <strong>strong</strong>, turpis mi volutpat justo, eu

-volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus

-eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem,

-consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue

-quis tellus.</p>

-

-<p>Lorem ipsum dolor sit amet, <em>emphasis</em> consectetuer

-adipiscing elit. Nullam dignissim convallis est. Quisque aliquam. Donec

-faucibus. Nunc iaculis suscipit dui. Nam sit amet sem. Aliquam libero

-nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent

-mattis, massa quis luctus fermentum, turpis mi volutpat justo, eu

-volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus

-eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem,

-consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue

-quis tellus.</p>
\ No newline at end of file