From d9244b5e75d42a738a6bb23ecf75eb33a154ce82 Mon Sep 17 00:00:00 2001 From: Cameron Date: Thu, 16 Jul 2015 12:26:36 -0700 Subject: [PATCH] Issue #1146 - Bootstrap2 infopanel fixed. --- e107_admin/includes/infopanel.php | 4 ++-- e107_themes/bootstrap/admin_style.css | 1 + e107_themes/bootstrap/admin_theme.php | 12 ++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/e107_admin/includes/infopanel.php b/e107_admin/includes/infopanel.php index e089b3005..f41f95156 100644 --- a/e107_admin/includes/infopanel.php +++ b/e107_admin/includes/infopanel.php @@ -272,11 +272,11 @@ class adminstyle_infopanel echo $mes->render().' -
+
'.$text.'
-
+
'.$text2.'
diff --git a/e107_themes/bootstrap/admin_style.css b/e107_themes/bootstrap/admin_style.css index 54f1935f9..414681602 100644 --- a/e107_themes/bootstrap/admin_style.css +++ b/e107_themes/bootstrap/admin_style.css @@ -106,6 +106,7 @@ a.tweet_action { font-size:8px } /* Bootstrap Bug Fix See: https://github.com/twitter/bootstrap/issues/3494 Specific for e107-admin InfoPanel */ .row-fluid ul.thumbnails li.span12 + li { margin-left : 0px; } +.core-infopanel.span12 + div { margin-left : 0px; } .row-fluid div.s-message + div { margin-left : 0px; } /* diff --git a/e107_themes/bootstrap/admin_theme.php b/e107_themes/bootstrap/admin_theme.php index 46f3f9f51..49ac4e863 100644 --- a/e107_themes/bootstrap/admin_theme.php +++ b/e107_themes/bootstrap/admin_theme.php @@ -78,7 +78,7 @@ class bootstrap_admintheme //return; echo ' -
  • +
    @@ -87,7 +87,7 @@ class bootstrap_admintheme
    -
  • +
    '; return; @@ -97,7 +97,7 @@ class bootstrap_admintheme { echo ' -
    +
    '.$text.' @@ -117,16 +117,16 @@ class bootstrap_admintheme echo ' -
  • +
    -
    +
    '.$text.'
    -
  • +
    '; return;