Commit dc2b93c2 authored by Lukasz Waskiewicz's avatar Lukasz Waskiewicz
Browse files

refs #1453 poprawa css codemirror, poprawa skryptów async i kolejności

parent 0ee7ebbd
......@@ -10,10 +10,11 @@
<link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,400italic,700,700italic&amp;subset=latin,latin-ext,cyrillic-ext" rel="stylesheet"
type="text/css" />
<th:block th:unless="${properties['debug'] == 'true'}" >
<script type="text/javascript" th:src="@{/wro/all.js}"></script>
<script async="async" type="text/javascript" th:src="@{/wro/lazyload.js}"></script>
<link th:href="@{/wro/lazyload.css}" rel="stylesheet" type="text/css" />
<script type="text/javascript" th:src="@{/wro/all.js}"></script>
<link th:href="@{/wro/all.css}" rel="stylesheet" type="text/css" />
</th:block>
......@@ -42,8 +43,8 @@
<link media="all" type="text/css" rel="stylesheet" href="" th:href="@{/libs/font-awesome/css/font-awesome.min.css}" />
<script async="async" th:src="@{/libs/sockjs-min.js}"></script>
<script async="async" th:src="@{/libs/stomp.js}"></script>
<script th:src="@{/libs/sockjs-min.js}"></script>
<script th:src="@{/libs/stomp.js}"></script>
<script async="async" th:src="@{/libs/jquery.popconfirm/jquery.popconfirm.js}"></script>
<script async="async" th:src="@{/libs/jquery.easyautocomplete/jquery.easy-autocomplete.min.js}"></script>
......
......@@ -12,6 +12,7 @@
<js>classpath:META-INF/web-resources/libs/CodeMirror/mode/css/css.js</js>
<css>classpath:META-INF/web-resources/libs/CodeMirror/lib/codemirror.css</css>
<css>classpath:META-INF/web-resources/libs/CodeMirror/addon/hint/show-hint.css</css>
<css>classpath:META-INF/web-resources/app/common/css/codemirror.css</css>
</group>
<group name="lazyload">
......@@ -33,9 +34,6 @@
<js>classpath:META-INF/web-resources/libs/jquery-multiselect/jquery-multiselect.js</js>
<css>classpath:META-INF/web-resources/libs/jquery-multiselect/jquery-multiselect.css</css>
<js>classpath:META-INF/web-resources/libs/sockjs-min.js</js>
<js>classpath:META-INF/web-resources/libs/stomp.js</js>
<js>classpath:META-INF/web-resources/libs/jquery.popconfirm/jquery.popconfirm.js</js>
<js>classpath:META-INF/web-resources/libs/jquery.easyautocomplete/jquery.easy-autocomplete.min.js</js>
<css>classpath:META-INF/web-resources/libs/jquery.easyautocomplete/easy-autocomplete.min.css</css>
......@@ -48,6 +46,8 @@
<group name="all">
<js>classpath:META-INF/web-resources/libs/jquery-min.js</js>
<js>classpath:META-INF/web-resources/libs/sockjs-min.js</js>
<js>classpath:META-INF/web-resources/libs/stomp.js</js>
<js>classpath:META-INF/web-resources/app/common/js/webSocketConnector.js</js>
<css>classpath:META-INF/web-resources/libs/font-awesome/css/font-awesome.min.css</css>
......
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