Merge branch 'master' of https://github.com/asiekierka/Tinyboard

Conflicts:
	mod.php

3 files changed, 66 insertions, 1 deletions

diff --git a/templates/themes/recent/info.php b/templates/themes/recent/info.php
index d4cf1029..58448b3d 100644
--- a/templates/themes/recent/info.php
+++ b/templates/themes/recent/info.php
@@ -55,6 +55,14 @@
 		'default' => 'recent.css',
 		'comment' => '(eg. "recent.css")'
 	);
+
+	$theme['config'][] = Array(
+		'title' => 'CSS stylesheet name',
+		'name' => 'basecss',
+		'type' => 'text',
+		'default' => 'recent.css',
+		'comment' => '(eg. "recent.css" - see templates/themes/recent for details)'
+	);
 	
 	// Unique function name for building everything
 	$theme['build_function'] = 'recentposts_build';
diff --git a/templates/themes/recent/recent_fs.css b/templates/themes/recent/recent_fs.css
new file mode 100644
index 00000000..26aed668
--- /dev/null
+++ b/templates/themes/recent/recent_fs.css
@@ -0,0 +1,57 @@
+.box-wrap {
+	max-width: 670px;
+	min-width: 332px;
+	margin: 30px auto;
+	overflow: auto;
+	padding: 0;
+}
+.box {
+	background: white;
+	border: 1px solid #98E;
+	width: 330px;
+	margin: 8px 0;
+	padding: 0;
+}
+.box ul {
+	padding: 2px 15px;
+}
+.box ul li {
+	list-style: none;
+	margin: 0;
+}
+.box.left {
+    background: #FDF6AF;
+    color: #9E914F;
+    border: 1px solid #9E914F;
+	float: left;
+}
+.box.right {
+    background: #F2DCE5;
+    color: #525;
+    border: 1px solid #CA759E;
+	float: right;
+}
+
+.box h2 {
+	padding: 3px 7px;
+	font-size: 12pt;
+}
+.box img {
+	float: none;
+	margin: 10px auto;
+}
+.box.left h2 {
+    background: #FEE78F;
+    color: #9E914F;
+}
+.box.right h2 {
+    background: #EB81B4;
+    color: #F8F8F8;
+}
+
+body {
+    background: #F7F8F9;
+}
+header div.subtitle, h1 {
+    color: #888A8C;
+}
diff --git a/templates/themes/recent/theme.php b/templates/themes/recent/theme.php
index 986fac6a..b436ab0f 100644
--- a/templates/themes/recent/theme.php
+++ b/templates/themes/recent/theme.php
@@ -18,7 +18,7 @@
 			global $config, $_theme;
 			
 			if ($action == 'all') {
-				copy('templates/themes/recent/recent.css', $config['dir']['home'] . $settings['css']);
+				copy('templates/themes/recent/' . $settings['basecss'], $config['dir']['home'] . $settings['css']);
 			}
 			
 			$this->excluded = explode(' ', $settings['exclude']);