Merge branch 'gh-pages' into bug/datatables

This commit is contained in:
Tom Johnson
2017-04-10 22:21:06 -07:00
committed by GitHub
2 changed files with 15 additions and 3 deletions

View File

@ -12,6 +12,8 @@
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav navbar-right">
<!-- toggle sidebar button -->
<li><a id="tg-sb-link" href="#"><i id="tg-sb-icon" class="fa fa-toggle-on"></i> Nav</a></li>
<!-- entries without drop-downs appear here -->
{% for entry in site.data.topnav.topnav %}
{% for item in entry.items %}

View File

@ -38,7 +38,17 @@
$('[data-toggle="tooltip"]').tooltip()
})
</script>
<script>
$(document).ready(function() {
$("#tg-sb-link").click(function() {
$("#tg-sb-sidebar").toggle();
$("#tg-sb-content").toggleClass('col-md-9');
$("#tg-sb-content").toggleClass('col-md-12');
$("#tg-sb-icon").toggleClass('fa-toggle-on');
$("#tg-sb-icon").toggleClass('fa-toggle-off');
});
});
</script>
{% if page.datatable == true %}
<!-- Include the standard DataTables bits -->
<link rel="stylesheet" type="text/css" href="//cdn.datatables.net/1.10.13/css/jquery.dataTables.css">
@ -69,11 +79,11 @@
<!-- Content Row -->
<div class="row">
<!-- Sidebar Column -->
<div class="col-md-3">
<div class="col-md-3" id="tg-sb-sidebar">
{% include sidebar.html %}
<!-- Content Column -->
<div class="col-md-9">
<div class="col-md-9" id="tg-sb-content">
{{content}}
</div>
<!-- /.row -->