D3Public/daux.io
8
0
Fork 0
Code Pull Requests Releases Activity

Fixed merge errors

Browse Source
This commit is contained in:
Garrett Moon 2013-06-10 17:39:34 -05:00
parent 03b00ae1f9
commit bf9d3bfc0e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
index.php
View File

@ -823,6 +823,7 @@ $tree = get_tree("docs");
<!-- Custom --> <!-- Custom -->
<link href='http://fonts.googleapis.com/css?family=Roboto+Slab:400,700,300,100' rel='stylesheet' type='text/css'> <link href='http://fonts.googleapis.com/css?family=Roboto+Slab:400,700,300,100' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="/css/daux-blue.css"> <link rel="stylesheet" href="/css/daux-blue.css">
<!-- hightlight.js --> <!-- hightlight.js -->
<script src="http://yandex.st/highlightjs/7.3/highlight.min.js"></script> <script src="http://yandex.st/highlightjs/7.3/highlight.min.js"></script>
@ -837,6 +838,9 @@ $tree = get_tree("docs");
$(this).parent().siblings().find('ul').slideUp(); $(this).parent().siblings().find('ul').slideUp();
$(this).next().slideToggle(); $(this).next().slideToggle();
}); });
// Bootstrap Table Class
$('table').addClass('table');
}); });
</script> </script>
</head> </head>
@ -878,15 +882,13 @@ $tree = get_tree("docs");
<? if (!empty($options['twitter'])) { ?> <? if (!empty($options['twitter'])) { ?>
<? foreach($options['twitter'] as $handle) { ?> <? foreach($options['twitter'] as $handle) { ?>
<div class="twitter"> <div class="twitter">
<hr/> <hr/>
<iframe allowtransparency="true" frameborder="0" scrolling="no" style="width:162px; height:20px;" src="https://platform.twitter.com/widgets/follow_button.html?screen_name=<?=$handle;?>&amp;show_count=false"></iframe> <iframe allowtransparency="true" frameborder="0" scrolling="no" style="width:162px; height:20px;" src="https://platform.twitter.com/widgets/follow_button.html?screen_name=<?=$handle;?>&amp;show_count=false"></iframe>
</div> </div>
<? } ?> <? } ?>
<? } ?> <? } ?>
</div> </div>
<? } ?> <? } ?>
</div> </div>
</div> </div>
<div class="right-column float-view content-area span9"> <div class="right-column float-view content-area span9">
@ -899,4 +901,4 @@ $tree = get_tree("docs");
</div> </div>
</div> </div>
</body> </body>
</html> </html>