1
0
mirror of https://github.com/e107inc/e107.git synced 2025-03-14 09:29:45 +01:00

Issue - Bootstrap2 infopanel fixed.

This commit is contained in:
Cameron 2015-07-16 12:26:36 -07:00
parent bbf4445482
commit d9244b5e75
3 changed files with 9 additions and 8 deletions
e107_admin/includes
e107_themes/bootstrap

@ -272,11 +272,11 @@ class adminstyle_infopanel
echo $mes->render().' echo $mes->render().'
<!-- INFOPANEL --> <!-- INFOPANEL -->
<div class="col-md-6"> <div class="span6 col-md-6">
'.$text.' '.$text.'
</div> </div>
<div class="col-md-6"> <div class="span6 col-md-6">
'.$text2.' '.$text2.'
</div> </div>

@ -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 */ /* 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; } .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; } .row-fluid div.s-message + div { margin-left : 0px; }
/* /*

@ -78,7 +78,7 @@ class bootstrap_admintheme
//return; //return;
echo ' echo '
<!-- Start Mode: '.$mode.' --> <!-- Start Mode: '.$mode.' -->
<li class="span6 '.$mode.'" > <div class="span6 '.$mode.'" >
<div class="well" style="padding:10px;min-height:220px;" > <div class="well" style="padding:10px;min-height:220px;" >
<div class="nav-header">'.$caption.'</div> <div class="nav-header">'.$caption.'</div>
@ -87,7 +87,7 @@ class bootstrap_admintheme
<!-- Content End --> <!-- Content End -->
</div> </div>
</li> </div>
<!-- End Mode: '.$mode.' --> <!-- End Mode: '.$mode.' -->
'; ';
return; return;
@ -97,7 +97,7 @@ class bootstrap_admintheme
{ {
echo ' echo '
<!-- Mode: '.$mode.' --> <!-- Mode: '.$mode.' -->
<div class="well" style="padding:10px"> <div class="well clearfix" style="padding:10px">
<div class="nav-header">'.$caption.'</div> <div class="nav-header">'.$caption.'</div>
<!-- Content Start --> <!-- Content Start -->
'.$text.' '.$text.'
@ -117,16 +117,16 @@ class bootstrap_admintheme
echo ' echo '
<!-- Start Style: '.$style.' --> <!-- Start Style: '.$style.' -->
<li class="span12"> <div class="core-infopanel span12">
<div class="well" > <div class="well clearfix" >
<div class="nav-header">'.$caption.'</div> <div class="nav-header">'.$caption.'</div>
<!-- Content Start --> <!-- Content Start -->
'.$text.' '.$text.'
<!-- Content End --> <!-- Content End -->
</div> </div>
</li> </div>
<!-- End Style: '.$style.' --> <!-- End Style: '.$style.' -->
'; ';
return; return;