make pcss work (really this time)

2 files changed, 14 insertions, 67 deletions

diff --git a/boot.php b/boot.php
index 647e8a6e3..bee75e371 100644
--- a/boot.php
+++ b/boot.php
@@ -1786,8 +1786,8 @@ if(! function_exists('current_theme_url')) {
 		global $a;
 		$t = current_theme();
 		if (file_exists('view/theme/' . $t . '/php/style.php'))
-			return($a->get_baseurl() . '/view/theme/' . $t . '/php/style.pcss');
-		return($a->get_baseurl() . '/view/theme/' . $t . '/css/style.css');
+			return('view/theme/' . $t . '/php/style.pcss');
+		return('view/theme/' . $t . '/css/style.css');
 	}
 }
 
@@ -2095,7 +2095,7 @@ function construct_page(&$a) {
 
 	head_add_css(((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.css');
 	head_add_css('mod_' . $a->module . '.css');
-	head_add_css('style.css');
+	head_add_css(current_theme_url());
 
 	head_add_js('mod_' . $a->module . '.js');
 
diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php
index f2bc8e500..99ad06c55 100644
--- a/view/theme/redbasic/php/style.php
+++ b/view/theme/redbasic/php/style.php
@@ -28,72 +28,19 @@
     if ($colour === false) {
 		$colour = $site_colour;
 	}
+	if($colour === false) {
 		$colour = "light";
-
-    
-        if (file_exists("$THEMEPATH/css/style.css")) {
-            echo file_get_contents("$THEMEPATH/css/style.css");
-        }
+	}
     
+	if(file_exists('view/theme/' . current_theme() . '/css/style.css')) {
+		echo file_get_contents('view/theme/' . current_theme() . '/css/style.css');
+    }
+    echo "\r\n";
 
-	if($redbasic_font_size == "16") {
-		echo ".wall-item-content {
-				font-size: 16px;
-			}";
-	}
-	if($redbasic_font_size == "15") {
-		echo ".wall-item-content {
-				font-size: 15px;
-			}";
-	}	
-	if($redbasic_font_size == "14") {
-		echo ".wall-item-content {
-				font-size: 14px;
-			}";
-	}
-	if($redbasic_font_size == "13.5") {
-		echo ".wall-item-content {
-				font-size: 13.5px;
-			}";
-	}
-	if($redbasic_font_size == "13") {
-		echo ".wall-item-content {
-				font-size: 13px;
-			}";
-	}
-	if($redbasic_font_size == "12.5") {
-		echo ".wall-item-content {
-				font-size: 12.5px;
-			}";
-	}
-	if($redbasic_font_size == "12") {
-		echo ".wall-item-content {
-				font-size: 12px;
-			}";
-	}
-	if($line_height == "1.5") {
-		echo ".wall-item-content {
-				line-height: 1.5;
-			}";
-	}	
-	if($line_height == "1.4") {
-		echo ".wall-item-content {
-				line-height: 1.4;
-			}";
-	}
-	if($line_height == "1.3") {
-		echo ".wall-item-content {
-				line-height: 1.3;
-			}";
-	}
-	if($line_height == "1.2") {
-		echo ".wall-item-content {
-				line-height: 1.2;
-			}";
-	}
-	if($line_height == "1.1") {
-		echo ".wall-item-content {
-				line-height: 1.1;
-			}";
+	if(($redbasic_font_size >= 10.0) && ($redbasic_font_size <= 16.0)) {
+		echo ".wall-item-content { font-size: $redbasic_font_size; }\r\n";
 	}
 
+	if(($line_height >= 1.0) && ($line_height <= 1.5)) {
+		echo ".wall-item-content { line-height: $line_height; }\r\n";
+	}