Skip to content

Commit

Permalink
remove duplicated reference to bootstrap and jquery
Browse files Browse the repository at this point in the history
  • Loading branch information
passionfruit18 committed May 21, 2018
1 parent 48d64e7 commit bfc809c
Showing 1 changed file with 2 additions and 12 deletions.
14 changes: 2 additions & 12 deletions ModelCatalogueCorePluginTestApp/grails-app/views/layouts/main.gsp
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,10 @@




<%--bootstrap --%>
<%--<asset:stylesheet href="bootstrap/dist/css/bootstrap.css"/>--%>

<asset:javascript src="bootstrap/dist/js/bootstrap.js"/>

%{--Strangely, the dashboard advanced search dropdown won't work if jquery is before bootstrap,
and it's fine if it's after,
although the console complains that bootstrap needs jquery...--}%
<asset:javascript src="jquery/dist/jquery.js"/>

<asset:stylesheet src="application.css"/>

<asset:javascript src="application.js"/>

<g:layoutHead/>
</head>
<body>
Expand Down Expand Up @@ -111,7 +102,6 @@
<div id="spinner" class="spinner" style="display:none;">
<g:message code="spinner.alt" default="Loading&hellip;"/>
</div>
<asset:javascript src="application.js"/>

</body>
</html>

0 comments on commit bfc809c

Please sign in to comment.