mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-08 07:36:32 +02:00
Code Issues Releases Wiki Activity

Issue #1138 - Bootstrap3 fixes.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_admin/image.php
View File

@@ -1175,7 +1175,7 @@ class media_admin_ui extends e_admin_ui
$text .= "<div class='tab-pane' id='core-media-style'> $text .= "<div class='tab-pane' id='core-media-style'>
<div class='row'> <div class='row'>
<div class='span6'> <div class='col-md-6 span6'>
<table class='table'> <table class='table'>
<colgroup> <colgroup>
<col class='col-label' /> <col class='col-label' />
@@ -1217,7 +1217,7 @@ class media_admin_ui extends e_admin_ui
</tbody></table> </tbody></table>
</div> </div>
<div class='span6'> <div class='col-md-6 span6'>
<h5>Preview</h5> <h5>Preview</h5>
<img class='well' id='preview' src='".e_IMAGE_ABS."generic/blank.gif' style='min-width:220px; min-height:180px;' /> <img class='well' id='preview' src='".e_IMAGE_ABS."generic/blank.gif' style='min-width:220px; min-height:180px;' />

2
e107_handlers/theme_handler.php
View File

@@ -649,7 +649,7 @@ class themeHandler
$mes->addInfo("No Themes found which match your search criteria"); $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>'; <li data-target="#myCarousel" data-slide-to="0" class="active"></li>';
foreach($slides as $key=>$v) foreach($slides as $key=>$v)

3
e107_themes/bootstrap3/admin_theme.php
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', '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/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_style.css');
// e107::css('theme','admin_dark.css'); // e107::css('theme','admin_dark.css');
e107::css('theme','ie_all.css',null,'all',"<!--[if IE]>","<![endif]-->"); e107::css('theme','ie_all.css',null,'all',"<!--[if IE]>","<![endif]-->");