Upstream changes for review
This commit is contained in:
@@ -11,7 +11,7 @@
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<!-- Bootstrap -->
|
||||
<?php echo HTML::style('media/theme/bootstrap/css/bootstrap.min.css',array('media'=>'screen')); ?>
|
||||
<?php echo HTML::style('http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap.min.css'); ?>
|
||||
<style type="text/css">
|
||||
body { padding-top: 50px; padding-bottom: 10px; }
|
||||
</style>
|
||||
@@ -46,8 +46,10 @@
|
||||
<p><?php echo $footer; ?></p>
|
||||
</footer>
|
||||
</div><!-- container -->
|
||||
<script src="http://code.jquery.com/jquery.min.js"></script>
|
||||
<?php echo HTML::script('media/theme/bootstrap/js/bootstrap.min.js'); ?>
|
||||
<?php
|
||||
echo HTML::script('http://code.jquery.com/jquery-1.9.1.min.js');
|
||||
echo HTML::script('http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/js/bootstrap.min.js');
|
||||
?>
|
||||
<?php echo Script::factory(); ?>
|
||||
</body>
|
||||
</html>
|
||||
|
Reference in New Issue
Block a user