Commit 3de1c429 authored by Sam McCollum's avatar Sam McCollum

Merge branch 'button_fix' into 'master'

dm - commented out jquery so that buttons will work again

See merge request !41
parents 24f7c772 9569baea
Pipeline #578 passed with stages
in 2 minutes and 15 seconds
......@@ -16,7 +16,7 @@
<link href="https://fonts.googleapis.com/css?family=Fjalla+One" rel="stylesheet"/>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css"/>
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"/>
<script src="https://code.jquery.com/jquery-3.1.1.slim.min.js"></script>
<!--<script src="https://code.jquery.com/jquery-3.1.1.slim.min.js"></script>-->
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js"></script>
</h:head>
<h:body>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment