Skip to content

Commit

Permalink
removed some warnings in idea
Browse files Browse the repository at this point in the history
  • Loading branch information
@zadam
zadam committed Mar 24, 2018
1 parent e3e2dc9 commit 7e524c0
Show file tree
Hide file tree
Showing 7 changed files with 99 additions and 64 deletions.
10 changes: 10 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/misc.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 7 additions & 14 deletions src/public/stylesheets/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,38 +53,31 @@ ul.fancytree-container {

/* icons from https://feathericons.com */
span.fancytree-node > span.fancytree-icon {
background-position: 0 0;
background-image: url("../images/icons/file.png");
background: url("../images/icons/file.png") 0 0;
}

span.fancytree-node.fancytree-folder > span.fancytree-icon {
background-position: 0 0;
background-image: url("../images/icons/folder.png");
background: url("../images/icons/folder.png") 0 0;
}

span.fancytree-node.code > span.fancytree-icon {
background-position: 0 0;
background-image: url("../images/icons/code.png");
background: url("../images/icons/code.png") 0 0;
}

span.fancytree-node.fancytree-folder.code > span.fancytree-icon {
background-position: 0 0;
background-image: url("../images/icons/code-folder.png");
background: url("../images/icons/code-folder.png") 0 0;
}

span.fancytree-node.file > span.fancytree-icon {
background-position: 0 0;
background-image: url("../images/icons/paperclip.png");
background: url("../images/icons/paperclip.png") 0 0;
}

span.fancytree-node.render > span.fancytree-icon {
background-position: 0 0;
background-image: url("../images/icons/play.png");
background: url("../images/icons/play.png") 0 0;
}

span.fancytree-node.search > span.fancytree-icon {
background-position: 0 0;
background-image: url("../images/icons/search-small.png");
background: url("../images/icons/search-small.png") 0 0;
}

span.fancytree-node.protected > span.fancytree-icon {
Expand Down
100 changes: 50 additions & 50 deletions src/views/index.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<div id="container" style="display:none;">
<div id="header" class="hide-toggle">
<div id="header-title">
<img src="images/app-icons/png/24x24.png">
<img src="/images/app-icons/png/24x24.png">

Trilium Notes
</div>
Expand Down Expand Up @@ -41,16 +41,16 @@
<div class="hide-toggle" style="grid-area: tree-actions;">
<div style="display: flex; justify-content: space-around; padding: 10px 0 10px 0; margin: 0 20px 0 20px; border: 1px solid #ccc;">
<a id="create-top-level-note-button" title="Create new top level note" class="icon-action"
style="background: url('images/icons/file-plus.png')"></a>
style="background: url('/images/icons/file-plus.png')"></a>

<a id="collapse-tree-button" title="Collapse note tree" class="icon-action"
style="background: url('images/icons/list.png')"></a>
style="background: url('/images/icons/list.png')"></a>

<a id="scroll-to-current-note-button" title="Scroll to current note. Shortcut CTRL+." class="icon-action"
style="background: url('images/icons/crosshair.png')"></a>
style="background: url('/images/icons/crosshair.png')"></a>

<a id="toggle-search-button" title="Search in notes" class="icon-action"
style="background: url('images/icons/search.png')"></a>
style="background: url('/images/icons/search.png')"></a>
</div>

<input type="file" id="import-upload" style="display: none" />
Expand Down Expand Up @@ -101,7 +101,7 @@
id="execute-script-button">Execute <kbd>Ctrl+Enter</kbd></button>

<div class="dropdown" id="note-type" data-bind="visible: type() != 'search'">
<button data-bind="disable: isDisabled()" id="dLabel" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn btn-sm">
<button data-bind="disable: isDisabled()" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn btn-sm">
Type: <span data-bind="text: typeString()"></span>
<span class="caret"></span>
</button>
Expand All @@ -118,7 +118,7 @@
</div>

<div class="dropdown" style="margin-left: 10px; margin-right: 10px;">
<button id="dLabel" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn btn-sm">
<button type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn btn-sm">
Note actions
<span class="caret"></span>
</button>
Expand Down Expand Up @@ -495,67 +495,67 @@
<!-- 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>

<!-- bootstrap needs to be included before jQuery UI, otherwise close icon in the dialog will be missing -->
<link href="libraries/bootstrap/css/bootstrap.css" rel="stylesheet">
<script src="libraries/bootstrap/js/bootstrap.js"></script>
<link href="/libraries/bootstrap/css/bootstrap.css" rel="stylesheet">
<script src="/libraries/bootstrap/js/bootstrap.js"></script>

<link href="libraries/jqueryui/jquery-ui.min.css" rel="stylesheet">
<script src="libraries/jqueryui/jquery-ui.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>
<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>
<link href="/libraries/fancytree/skin-win8/ui.fancytree.css" rel="stylesheet">
<script src="/libraries/fancytree/jquery.fancytree-all.min.js"></script>

<script src="libraries/jquery.hotkeys.js"></script>
<script src="libraries/jquery.fancytree.hotkeys.js"></script>
<script src="/libraries/jquery.hotkeys.js"></script>
<script src="/libraries/jquery.fancytree.hotkeys.js"></script>

<script src="libraries/jquery.ui-contextmenu.min.js"></script>
<script src="/libraries/jquery.ui-contextmenu.min.js"></script>

<script src="libraries/knockout.min.js"></script>
<script src="/libraries/knockout.min.js"></script>

<link href="stylesheets/style.css" rel="stylesheet">
<link href="/stylesheets/style.css" rel="stylesheet">

<script src="javascripts/bootstrap.js" type="module"></script>
<script src="/javascripts/bootstrap.js" type="module"></script>

<script src="javascripts/utils.js"></script>
<script src="javascripts/init.js"></script>
<script src="javascripts/server.js"></script>
<script src="/javascripts/utils.js"></script>
<script src="/javascripts/init.js"></script>
<script src="/javascripts/server.js"></script>

<!-- Tree scripts -->
<script src="javascripts/note_tree.js"></script>
<script src="javascripts/tree_changes.js"></script>
<script src="javascripts/cloning.js"></script>
<script src="javascripts/tree_utils.js"></script>
<script src="javascripts/drag_and_drop.js"></script>
<script src="javascripts/context_menu.js"></script>
<script src="javascripts/export.js"></script>
<script src="/javascripts/note_tree.js"></script>
<script src="/javascripts/tree_changes.js"></script>
<script src="/javascripts/cloning.js"></script>
<script src="/javascripts/tree_utils.js"></script>
<script src="/javascripts/drag_and_drop.js"></script>
<script src="/javascripts/context_menu.js"></script>
<script src="/javascripts/export.js"></script>

<!-- Note detail -->
<script src="javascripts/note_editor.js"></script>
<script src="javascripts/protected_session.js"></script>
<script src="javascripts/note_type.js"></script>
<script src="/javascripts/note_editor.js"></script>
<script src="/javascripts/protected_session.js"></script>
<script src="/javascripts/note_type.js"></script>

<!-- dialogs -->
<script src="javascripts/dialogs/recent_notes.js"></script>
<script src="javascripts/dialogs/add_link.js"></script>
<script src="javascripts/dialogs/jump_to_note.js"></script>
<script src="javascripts/dialogs/settings.js"></script>
<script src="javascripts/dialogs/note_history.js"></script>
<script src="javascripts/dialogs/recent_changes.js"></script>
<script src="javascripts/dialogs/event_log.js"></script>
<script src="javascripts/dialogs/edit_tree_prefix.js"></script>
<script src="javascripts/dialogs/sql_console.js"></script>
<script src="javascripts/dialogs/note_source.js"></script>
<script src="javascripts/dialogs/attributes.js"></script>

<script src="javascripts/link.js"></script>
<script src="javascripts/sync.js"></script>
<script src="javascripts/messaging.js"></script>
<script src="javascripts/api.js"></script>
<script src="/javascripts/dialogs/recent_notes.js"></script>
<script src="/javascripts/dialogs/add_link.js"></script>
<script src="/javascripts/dialogs/jump_to_note.js"></script>
<script src="/javascripts/dialogs/settings.js"></script>
<script src="/javascripts/dialogs/note_history.js"></script>
<script src="/javascripts/dialogs/recent_changes.js"></script>
<script src="/javascripts/dialogs/event_log.js"></script>
<script src="/javascripts/dialogs/edit_tree_prefix.js"></script>
<script src="/javascripts/dialogs/sql_console.js"></script>
<script src="/javascripts/dialogs/note_source.js"></script>
<script src="/javascripts/dialogs/attributes.js"></script>

<script src="/javascripts/link.js"></script>
<script src="/javascripts/sync.js"></script>
<script src="/javascripts/messaging.js"></script>
<script src="/javascripts/api.js"></script>

<script type="text/javascript">
// we hide container initally because otherwise it is rendered first without CSS and then flickers into
Expand Down
12 changes: 12 additions & 0 deletions trilium.iml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/public" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

0 comments on commit 7e524c0

Please sign in to comment.