Skip to content

Commit

Permalink
Merge branch 'master' into gh-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
robertleeplummerjr committed Apr 23, 2015
2 parents b9bbc24 + ebd903e commit 0f38951
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions index.html
Expand Up @@ -32,7 +32,7 @@ <h3>Horizontal & Vertical</h3>
<div id="both" class="well" style="height: 400px; width: 300px; position: relative"></div>

<h3>Table (using MegaTable.js)</h3>
<div id="large-table" class="well" style="height: 400px; width: 300px; position: relative; overflow: hidden"></div>
<div id="large-table" style="height: 400px; width: 300px; position: relative; overflow: hidden"></div>
<!--Examples End-->


Expand All @@ -43,7 +43,6 @@ <h3>Table (using MegaTable.js)</h3>
</footer>
</body>
<script src="infinitescroll.js"></script>
<script src="bower_components/thaw.js/thaw.js"></script>
<script src="bower_components/MouseWheel/MouseWheel.js"></script>
<script src="bower_components/megatable.js/megatable.js"></script>
<script>
Expand Down Expand Up @@ -108,6 +107,6 @@ <h3>Table (using MegaTable.js)</h3>
}),
largeTableM = new MouseWheel(largeTable, largeTableI._out);

largeTable.className = 'table';
largeTableMT.table.className += ' table table-striped';
</script>
</html>

0 comments on commit 0f38951

Please sign in to comment.