Permalink
Browse files

Convert all assets to composer.

  • Loading branch information...
Matthewrbowker committed Apr 5, 2016
1 parent c0d59dc commit 2af017fa1ba75990098e7f828edad6c7c6b99cb3
Showing with 13 additions and 8 deletions.
  1. +4 −1 composer.json
  2. +7 −4 templates/footer.tpl
  3. +2 −3 templates/heading.tpl
View
@@ -8,6 +8,9 @@
}
],
"require": {
"smarty/smarty": "3.1.19"
"smarty/smarty": "3.1.19",
"components/jquery": "2.1.4",
"twbs/bootstrap": "3.3.6",
"FortAwesome/Font-Awesome": "4.5.0"
}
}
View
@@ -1,17 +1,20 @@
<!-- BEGIN: footer.tpl -->
<hr>
<div class="footer">
<p style="text-align:right"><small>{$footer1}<br />
{$footer2} </small>
<p style="text-align:right">
<small>
{$footer1}<br />
{$footer2}
</small>
</p>
</div>
</div><!-- /col-md-10 -->
</div> <!-- /container -->
</div>
<script src="//code.jquery.com/jquery-2.1.4.min.js"></script>
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js" integrity="sha256-Sk3nkD6mLTMOF0EOpNtsIry+s1CsaqQC1rVLTAy+0yc= sha512-K1qjQ+NcF2TYO/eI3M6v8EiNYZfA95pQumfvcVrTHtwQVDG+aHRqLi/ETn2uB+1JqwYqVG3LIvdm9lj6imS/pQ==" crossorigin="anonymous"></script>
<script src="vendor/components/jquery/jquery..min.js"></script>
<script src="vendor/twbs/bootstrap/dist/js/bootstrap.min.js"></script>
</BODY>
</HTML>
<!-- END: footer.tpl -->
View
@@ -7,8 +7,8 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet" integrity="sha256-MfvZlkHCEqatNoGiOXveE8FIwMzZg4W85qfrfIFBfYc= sha512-dTfge/zgoMYpP7QbHy4gWMEGsbsdZeCXz7irItjcC3sPUFtf0kuFbDz/ixG7ArTxmDjLXDmezHubeNikyKGVyQ==" crossorigin="anonymous">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
<link href="vendor/twbs/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<link rel="stylesheet" href="vendor/fontawesome/font-awesome/css/font-awesome.min.css">
<link href="awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css" rel="stylesheet">
<style type="text/css">
body {
@@ -22,7 +22,6 @@
{else}
<BODY>
{/if}
<!-- echo $this->gen_navbar(); -->
{include file="navbar.tpl"}
<div class="container-fluid">
<div class="row">

0 comments on commit 2af017f

Please sign in to comment.