From f896c47af337e668b4314ff05cc150b86302a6cd Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Thu, 20 Jun 2013 02:04:18 -0700
Subject: [PATCH] Bootstrap css changes (work in progress)

---
 e107_handlers/theme_handler.php | 2 +-
 e107_themes/bootstrap/theme.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php
index b41223017..a63e55bda 100644
--- a/e107_handlers/theme_handler.php
+++ b/e107_handlers/theme_handler.php
@@ -222,7 +222,7 @@ class themeHandler
 
 		$reject = array('e_.*');
 
-		$handle2 = e107::getFile()->get_files(e_THEME.$file."/", ".php|.css|.xml|preview.jpg|preview.png", $reject, 0);
+		$handle2 = e107::getFile()->get_files(e_THEME.$file."/", ".php|.css|.xml|preview.jpg|preview.png", $reject, 1);
 
 
 		foreach ($handle2 as $fln)
diff --git a/e107_themes/bootstrap/theme.php b/e107_themes/bootstrap/theme.php
index 1aa169822..99be24131 100644
--- a/e107_themes/bootstrap/theme.php
+++ b/e107_themes/bootstrap/theme.php
@@ -12,11 +12,11 @@ e107::js('bootstrap','bootstrap.min.js');
 
 if(THEME_STYLE != 'style.css') // allow for drop-in bootstrap replacement. See http://bootswatch.com
 {
-	//define("CSSORDER", "theme,core,other,plugin,inline");
-	
+	define("CSSORDER", "theme,core,other,plugin,inline");
+
 	switch (THEME_STYLE) 
 	{
-		case 'superhero.css':
+		case 'css/superhero.css':
 			e107::css('inline','@media (min-width: 1000px){ body	{ padding-top: 100px;  }  } ');	
 		break;