Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Mobile navigation menu requires bootstrap.min.js so brought it back t…
…o the JS bundle.
  • Loading branch information
Otto Chrons committed Nov 29, 2015
commit adade8eded606f325feb884191536a22a5e199d4
1 change: 1 addition & 0 deletions _assets/js/bundle.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
//= require clipboard.min
//= require jquery.min
//= require bootstrap.min
//= require highlight.pack
//= require custom
3 changes: 1 addition & 2 deletions _includes/nav.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<!-- Fixed navbar -->
<div class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
Expand All @@ -20,6 +19,6 @@
<li><a href="http://github.com/scala-js/scala-js"><i aria-label="github" style="font-size: 20px" class="fa fa-github"></i></a></li>
<li><a href="http://twitter.com/scala_js"><i aria-label="twitter" style="font-size: 20px" class="fa fa-twitter"></i></a></li>
</ul>
</div><!--/.nav-collapse -->
</div>
</div>
</div>