1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 06:38:00 +02:00

Issue #1138 - Bootstrap3 fixes.

This commit is contained in:
Cameron
2015-07-14 12:13:46 -07:00
parent e5015c5999
commit 83f7b90d0b
3 changed files with 7 additions and 4 deletions

View File

@@ -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;' />

View File

@@ -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)

View File

@@ -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]-->");