Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 02:16:05 +01:00
Code Issues Packages Projects Releases Activity

bootstrap needs to be included before jQuery UI, otherwise close icon in the dialog will be missing

Browse Source
This commit is contained in:
azivner
2017-09-06 21:41:12 -04:00
parent 7bc322f9a1
commit 16485576c8
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/templates/app.html
View File

@@ -115,6 +115,10 @@
<script src="stat/lib/jquery.min.js"></script> <script src="stat/lib/jquery.min.js"></script>
<!-- bootstrap needs to be included before jQuery UI, otherwise close icon in the dialog will be missing -->
<link href="stat/lib/bootstrap/css/bootstrap.css" rel="stylesheet">
<script src="stat/lib/bootstrap/js/bootstrap.js"></script>
<link href="stat/lib/jqueryui/jquery-ui.min.css" rel="stylesheet"> <link href="stat/lib/jqueryui/jquery-ui.min.css" rel="stylesheet">
<script src="stat/lib/jqueryui/jquery-ui.min.js"></script> <script src="stat/lib/jqueryui/jquery-ui.min.js"></script>
@@ -122,9 +126,6 @@
<link href="stat/lib/fancytree/skin-win8/ui.fancytree.css" rel="stylesheet"> <link href="stat/lib/fancytree/skin-win8/ui.fancytree.css" rel="stylesheet">
<script src="stat/lib/fancytree/jquery.fancytree-all.js"></script> <script src="stat/lib/fancytree/jquery.fancytree-all.js"></script>
<link href="stat/lib/bootstrap/css/bootstrap.css" rel="stylesheet">
<script src="stat/lib/bootstrap/js/bootstrap.js"></script>
<link href="stat/lib/summernote/summernote.css" rel="stylesheet"> <link href="stat/lib/summernote/summernote.css" rel="stylesheet">
<script src="stat/lib/summernote/summernote.js"></script> <script src="stat/lib/summernote/summernote.js"></script>

2
static/js/init.js
View File

@@ -4,8 +4,6 @@ $(function() {
if (fancyTree.length) { if (fancyTree.length) {
fancyTree.height($(window).height() - fancyTree.offset().top - 10); fancyTree.height($(window).height() - fancyTree.offset().top - 10);
console.log("height: ", $(window).height() - fancyTree.offset().top - 10);
} }
const noteEditable = $('div.note-editable'); const noteEditable = $('div.note-editable');