github
/
AdminLTE
mirror of https://github.com/ColorlibHQ/AdminLTE
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed broken links

pull/229/merge
Abdullah Almsaeed 2015-02-07 11:44:45 -05:00
parent 10bde1cf79
commit dd8bfbc5d6
4 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dist/js/app.js vendored
View File

@ -181,10 +181,14 @@ $.AdminLTE.layout = {
var sidebar_height = $(".main-sidebar, .left-side").height(); var sidebar_height = $(".main-sidebar, .left-side").height();
//Set the min-height of the content and sidebar based on the //Set the min-height of the content and sidebar based on the
//the height of the document. //the height of the document.
if (window_height >= sidebar_height) { if ($("body").hasClass("fixed")) {
$(".content-wrapper, .main-sidebar, .left-side, .right-side").css('min-height', window_height - neg); $(".content-wrapper, .right-side").css('min-height', window_height - $('.main-footer').outerHeight());
} else { } else {
$(".content-wrapper, .main-sidebar, .left-side, .right-side").css('min-height', sidebar_height); if (window_height >= sidebar_height) {
$(".content-wrapper, .main-sidebar, .left-side, .right-side").css('min-height', window_height - neg);
} else {
$(".content-wrapper, .main-sidebar, .left-side, .right-side").css('min-height', sidebar_height);
}
} }
}, },
fixSidebar: function () { fixSidebar: function () {
@ -194,7 +198,7 @@ $.AdminLTE.layout = {
$(".sidebar").slimScroll({destroy: true}).height("auto"); $(".sidebar").slimScroll({destroy: true}).height("auto");
} }
return; return;
} else if(typeof $.fn.slimScroll == 'undefined' && console) { } else if (typeof $.fn.slimScroll == 'undefined' && console) {
console.error("Error: the fixed layout requires the slimscroll plugin!"); console.error("Error: the fixed layout requires the slimscroll plugin!");
} }
//Enable slimscroll for fixed layout //Enable slimscroll for fixed layout

2
dist/js/app.min.js vendored
View File

File diff suppressed because one or more lines are too long

20
pages/layout/boxed.html
View File

@ -278,19 +278,19 @@
<small class="label pull-right bg-yellow">12</small> <small class="label pull-right bg-yellow">12</small>
</a> </a>
</li> </li>
<li class="treeview active"> <li class="treeview">
<a href="#"> <a href="#">
<i class="fa fa-folder"></i> <span>Examples</span> <i class="fa fa-folder"></i> <span>Examples</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
<li><a href="invoice.html"><i class="fa fa-circle-o"></i> Invoice</a></li> <li><a href="../examples/invoice.html"><i class="fa fa-circle-o"></i> Invoice</a></li>
<li><a href="login.html"><i class="fa fa-circle-o"></i> Login</a></li> <li><a href="../examples/login.html"><i class="fa fa-circle-o"></i> Login</a></li>
<li><a href="register.html"><i class="fa fa-circle-o"></i> Register</a></li> <li><a href="../examples/register.html"><i class="fa fa-circle-o"></i> Register</a></li>
<li><a href="lockscreen.html"><i class="fa fa-circle-o"></i> Lockscreen</a></li> <li><a href="../examples/lockscreen.html"><i class="fa fa-circle-o"></i> Lockscreen</a></li>
<li><a href="404.html"><i class="fa fa-circle-o"></i> 404 Error</a></li> <li><a href="../examples/404.html"><i class="fa fa-circle-o"></i> 404 Error</a></li>
<li><a href="500.html"><i class="fa fa-circle-o"></i> 500 Error</a></li> <li><a href="../examples/500.html"><i class="fa fa-circle-o"></i> 500 Error</a></li>
<li><a href="blank.html"><i class="fa fa-circle-o"></i> Blank Page</a></li> <li><a href="../examples/blank.html"><i class="fa fa-circle-o"></i> Blank Page</a></li>
</ul> </ul>
</li> </li>
<li class="treeview"> <li class="treeview">
@ -333,8 +333,8 @@
<!-- Content Header (Page header) --> <!-- Content Header (Page header) -->
<section class="content-header"> <section class="content-header">
<h1> <h1>
Blank page Boxed Layout
<small>it all starts here</small> <small>Blank example to the boxed layout</small>
</h1> </h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><a href="#"><i class="fa fa-dashboard"></i> Home</a></li> <li><a href="#"><i class="fa fa-dashboard"></i> Home</a></li>

20
pages/layout/fixed.html
View File

@ -278,19 +278,19 @@
<small class="label pull-right bg-yellow">12</small> <small class="label pull-right bg-yellow">12</small>
</a> </a>
</li> </li>
<li class="treeview active"> <li class="treeview">
<a href="#"> <a href="#">
<i class="fa fa-folder"></i> <span>Examples</span> <i class="fa fa-folder"></i> <span>Examples</span>
<i class="fa fa-angle-left pull-right"></i> <i class="fa fa-angle-left pull-right"></i>
</a> </a>
<ul class="treeview-menu"> <ul class="treeview-menu">
<li><a href="invoice.html"><i class="fa fa-circle-o"></i> Invoice</a></li> <li><a href="../examples/invoice.html"><i class="fa fa-circle-o"></i> Invoice</a></li>
<li><a href="login.html"><i class="fa fa-circle-o"></i> Login</a></li> <li><a href="../examples/login.html"><i class="fa fa-circle-o"></i> Login</a></li>
<li><a href="register.html"><i class="fa fa-circle-o"></i> Register</a></li> <li><a href="../examples/register.html"><i class="fa fa-circle-o"></i> Register</a></li>
<li><a href="lockscreen.html"><i class="fa fa-circle-o"></i> Lockscreen</a></li> <li><a href="../examples/lockscreen.html"><i class="fa fa-circle-o"></i> Lockscreen</a></li>
<li><a href="404.html"><i class="fa fa-circle-o"></i> 404 Error</a></li> <li><a href="../examples/404.html"><i class="fa fa-circle-o"></i> 404 Error</a></li>
<li><a href="500.html"><i class="fa fa-circle-o"></i> 500 Error</a></li> <li><a href="../examples/500.html"><i class="fa fa-circle-o"></i> 500 Error</a></li>
<li><a href="blank.html"><i class="fa fa-circle-o"></i> Blank Page</a></li> <li><a href="../examples/blank.html"><i class="fa fa-circle-o"></i> Blank Page</a></li>
</ul> </ul>
</li> </li>
<li class="treeview"> <li class="treeview">
@ -333,8 +333,8 @@
<!-- Content Header (Page header) --> <!-- Content Header (Page header) -->
<section class="content-header"> <section class="content-header">
<h1> <h1>
Blank page Fixed Layout
<small>it all starts here</small> <small>Blank example to the fixed layout</small>
</h1> </h1>
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><a href="#"><i class="fa fa-dashboard"></i> Home</a></li> <li><a href="#"><i class="fa fa-dashboard"></i> Home</a></li>