From c21713707693ccd5c6c3e4fb93df3d6b1cbee469 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Thu, 16 Jul 2015 13:01:45 -0700
Subject: [PATCH] Issue #1147 Fix for bootstrap right-margin issue.

---
 e107_admin/includes/infopanel.php         | 17 +++++++++--------
 e107_themes/bootstrap3/admin_style.css    |  4 +++-
 e107_themes/bootstrap3/admin_template.php |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/e107_admin/includes/infopanel.php b/e107_admin/includes/infopanel.php
index f41f95156..d78a3b0f6 100644
--- a/e107_admin/includes/infopanel.php
+++ b/e107_admin/includes/infopanel.php
@@ -272,14 +272,15 @@ class adminstyle_infopanel
 			echo $mes->render().'
 
 			<!-- INFOPANEL -->
-			<div class="span6 col-md-6">
-			 	'.$text.'
-			 </div>
-			 
-			 <div class="span6 col-md-6">
-			 	'.$text2.'
-			 </div>
-						 
+			<div class="row">
+				<div class="span6 col-md-6">
+				    '.$text.'
+				 </div>
+
+				 <div class="span6 col-md-6">
+				    '.$text2.'
+				 </div>
+			</div>
 			<!--  -->  
 			 
 			 
diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css
index 4262b38b7..18d1d7240 100644
--- a/e107_themes/bootstrap3/admin_style.css
+++ b/e107_themes/bootstrap3/admin_style.css
@@ -51,6 +51,8 @@ body						{ padding-top: 75px;  }
 a.core-mainpanel-link-icon	{ height:80px; width: 100%; padding-top:20px;  }
 a.core-mainpanel-link-icon:hover { text-decoration: none; filter: none; }
 
+
+/* TODO - use col-xx-x markup where core-mainpanel-block occurs. ? */
 @media (max-width: 1700px){ 
 	.core-mainpanel-block 		{ width:25%; }
 }
@@ -73,7 +75,7 @@ a.core-mainpanel-link-icon:hover { text-decoration: none; filter: none; }
 	.core-mainpanel-block 		{ width:50%; }
 }
 @media (max-width: 380px){ 
-	.core-mainpanel-block 		{ width:100%; }
+	.core-mainpanel-block 		{ width:50%; }
 }
 
 
diff --git a/e107_themes/bootstrap3/admin_template.php b/e107_themes/bootstrap3/admin_template.php
index 68fd747fe..9d8f794d0 100644
--- a/e107_themes/bootstrap3/admin_template.php
+++ b/e107_themes/bootstrap3/admin_template.php
@@ -297,7 +297,7 @@ $ADMIN_HEADER .= '<div class="container-fluid">
 			
          </div>
         <div class="col-md-10" id="right-panel" >
-        	<div class="row">
+        	<div>
         
         ';