From 83f7b90d0b643595d5852a50319c642227897386 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Tue, 14 Jul 2015 12:13:46 -0700
Subject: [PATCH] Issue #1138 - Bootstrap3 fixes.

---
 e107_admin/image.php                   | 4 ++--
 e107_handlers/theme_handler.php        | 2 +-
 e107_themes/bootstrap3/admin_theme.php | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/e107_admin/image.php b/e107_admin/image.php
index 5bc83f469..d22e8bb12 100644
--- a/e107_admin/image.php
+++ b/e107_admin/image.php
@@ -1175,7 +1175,7 @@ class media_admin_ui extends e_admin_ui
 			$text .= "<div class='tab-pane' id='core-media-style'>
 				
 				<div class='row'>
-				<div class='span6'>
+				<div class='col-md-6 span6'>
 				<table class='table'>
 				<colgroup>
 					<col class='col-label' />
@@ -1217,7 +1217,7 @@ class media_admin_ui extends e_admin_ui
 		
 			</tbody></table>
 			</div>
-			<div class='span6'>
+			<div class='col-md-6 span6'>
 			<h5>Preview</h5>
 		
 			<img class='well' id='preview' src='".e_IMAGE_ABS."generic/blank.gif' style='min-width:220px; min-height:180px;' />
diff --git a/e107_handlers/theme_handler.php b/e107_handlers/theme_handler.php
index d4717371a..b958ac2c0 100644
--- a/e107_handlers/theme_handler.php
+++ b/e107_handlers/theme_handler.php
@@ -649,7 +649,7 @@ class themeHandler
 				$mes->addInfo("No Themes found which match your search criteria");		
 			}	
 				
-			 $indicators = '<ol class="carousel-indicators span6">
+			 $indicators = '<ol class="carousel-indicators col-md-6 span6">
 				<li data-target="#myCarousel" data-slide-to="0" class="active"></li>';
 				
 			foreach($slides as $key=>$v)
diff --git a/e107_themes/bootstrap3/admin_theme.php b/e107_themes/bootstrap3/admin_theme.php
index cc617d8f8..a902e8d72 100644
--- a/e107_themes/bootstrap3/admin_theme.php
+++ b/e107_themes/bootstrap3/admin_theme.php
@@ -17,8 +17,11 @@ e107::js('url',  "http://cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstr
 
 
 e107::css('url', 'http://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/slate/bootstrap.min.css');
+
 //e107::css('url', 		"https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/cosmo/bootstrap.min.css");
-//e107::css('url', 		"https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/darkly/bootstrap.min.css");
+// e107::css('url', 		"https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/darkly/bootstrap.min.css");
+
+// e107::css('core', 'bootstrap/css/darkstrap.css');
 	e107::css('theme','admin_style.css');
 // e107::css('theme','admin_dark.css');
 e107::css('theme','ie_all.css',null,'all',"<!--[if IE]>","<![endif]-->");