Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-13 16:55:50 +01:00
Code Issues Packages Projects Releases Activity

migrated tooltips to bootstrap, #203

Browse Source
This commit is contained in:
azivner
2018-11-06 19:35:42 +01:00
parent 2f4ef0a4a2
commit 57e9850ca6
7 changed files with 70 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/index.ejs
View File

@@ -316,8 +316,6 @@
<% include dialogs/protected_session_password.ejs %>
<% include dialogs/recent_changes.ejs %>
<% include dialogs/sql_console.ejs %>
<div id="tooltip" style="display: none;"></div>
</div>
<script type="text/javascript">
@@ -339,14 +337,11 @@
<link href="/libraries/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<script src="/libraries/bootstrap/js/bootstrap.bundle.min.js"></script>
<link href="/libraries/jqueryui/jquery-ui.min.css" rel="stylesheet">
<script src="/libraries/jqueryui/jquery-ui.min.js"></script>
<script src="/libraries/bootstrap-notify.min.js"></script>
<!-- Include Fancytree skin and library -->
<link href="/libraries/fancytree/skin-win8/ui.fancytree.css" rel="stylesheet">
<script src="/libraries/fancytree/jquery.fancytree-all.min.js"></script>
<script src="/libraries/fancytree/jquery.fancytree-all-deps.min.js"></script>
<script src="/libraries/jquery.hotkeys.js"></script>
<script src="/libraries/jquery.fancytree.hotkeys.js"></script>

2
src/views/login.ejs
View File

@@ -43,6 +43,6 @@
<!-- Required for correct loading of scripts in Electron -->
<script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
<link href="libraries/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<link href="/libraries/bootstrap/css/bootstrap.min.css" rel="stylesheet">
</body>
</html>

8
src/views/setup.ejs
View File

@@ -122,13 +122,13 @@
<!-- Required for correct loading of scripts in Electron -->
<script>if (typeof module === 'object') {window.module = module; module = undefined;}</script>
<script src="libraries/jquery.min.js"></script>
<script src="/libraries/jquery.min.js"></script>
<link href="libraries/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<script src="libraries/bootstrap/js/bootstrap.min.js"></script>
<link href="/libraries/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<script src="/libraries/bootstrap/js/bootstrap.min.js"></script>
<script src="/libraries/knockout.min.js"></script>
<script src="javascripts/setup.js" type="module"></script>
<script src="/javascripts/setup.js" type="module"></script>
</body>
</html>