Merge pull request #98 from nonmakina/markup1

fixes gentoo style. Fixes redtext markup. Adds orange quoting (ie: <). Adds underlining.

inc/config.php

@@ -657,7 +657,7 @@
 	$config['markup'][] = array("/'''(.+?)'''/", "<strong>\$1</strong>");
 	$config['markup'][] = array("/''(.+?)''/", "<em>\$1</em>");
 	$config['markup'][] = array("/\*\*(.+?)\*\*/", "<span class=\"spoiler\">\$1</span>");
-	$config['markup'][] = array("/^[ |\t]*==(.+?)==[ |\t]*$/m", "<span class=\"heading\">\$1</span>");
+	$config['markup'][] = array("/==(.+?)==/", "<span class=\"heading\">\$1</span>");
 
 	// Code markup. This should be set to a regular expression, using tags you want to use. Examples:
 	// "/\[code\](.*?)\[\/code\]/is"

inc/instance-config.php

@@ -327,3 +327,13 @@ $config['embedding'][0] = array(
 '/^https?:\/\/(\w+\.)?(?:youtube\.com\/watch\?v=|youtu\.be\/)([a-zA-Z0-9\-_]{10,11})(&.+)?$/i',
 $config['youtube_js_html']);
 $config['additional_javascript'][] = 'js/youtube.js';
+
+/*
+ * ====================
+ *  Markup
+ * ====================
+ */
+
+$config['markup'][] = array("/^\s*&lt;.*$/m", '<span class="orangeQuote">$0</span>');
+$config['markup'][] = array("/__(.+?)__/", "<span class=\"underline\">\$1</span>");
+$config['markup'][] = array("/~~(.+?)~~/", "<span class=\"strikethrough\">\$1</span>");

stylesheets/dark_red.css

@@ -6,7 +6,7 @@
 @import url("/stylesheets/dark.css");
 
 span.quote {
-	color:#D96262;
+	/* color:#D96262; */
 }
 
 div.blotter, h1, h2, header div.subtitle, div.title, a:link:hover, a:visited:hover p.intro a.post_no:hover, 

stylesheets/gentoochan.css

@@ -68,3 +68,8 @@ div.boardlist a {
 table.modlog tr th {
 	background: #EA8;
 }
+
+#quick-reply table {
+	background: #0E0E0E url(data:image/gif;base64,R0lGODlhGAAMAKEEAOXl5ebm5vDw8PHx8SH+EUNyZWF0ZWQgd2l0aCBHSU1QACwAAAAAGAAMAAACRpQiY6cLa146MyY1EJQKjG81lNGRUPOIkgMJHtquBgIO7xwvpbrpduUSuXq8ntEC0bBEylYitdDAdM1ViaobkgKgZwyDLAAAOw==) repeat 0 0 !important;
+}
+

stylesheets/style.css

@@ -1953,4 +1953,16 @@ div.mix {
 
 footer {
  margin-bottom: 50px;
-}
+}
+
+span.underline {
+    text-decoration: underline;
+}
+
+span.strikethrough {
+    text-decoration: line-through;
+}
+
+span.orangeQuote {
+    color: #FF8C00;
+}