Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-12 08:15:52 +01:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'origin/t35'

Browse Source 
# Conflicts:
#	src/views/tabs.ejs
This commit is contained in:
zadam
2019-07-28 22:38:02 +02:00
parent b8509c487d e4e4f73638
commit 385b79ad34
21 changed files with 686 additions and 15683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/desktop.ejs
View File

@@ -6,7 +6,7 @@
</head>
<body class="desktop theme-<%= theme %>" style="--main-font-size: <%= mainFontSize %>%; --tree-font-size: <%= treeFontSize %>%; --detail-font-size: <%= detailFontSize %>%;">
<noscript>Trilium requires JavaScript to be enabled.</noscript>
<div id="container" style="display: none; grid-template-columns: minmax(<%= leftPaneMinWidth %>px, <%= leftPaneWidthPercent %>fr) minmax(0, <%= rightPaneWidthPercent %>fr)">
<div id="container" style="display: none; grid-template-columns: <%= leftPaneWidthPercent %>fr <%= rightPaneWidthPercent %>fr">
<div id="header" class="hide-toggle">
<div id="history-navigation" style="display: none;">
<a id="history-back-button" title="Go to previous note." class="icon-action jam jam-arrow-square-left"></a>
@@ -106,7 +106,7 @@
</div>
</div>
<div id="left-pane" class="hide-toggle">
<div id="left-pane" class="hide-toggle" style="resize: horizontal; overflow: scroll;">
<div id="global-buttons">
<a id="create-top-level-note-button" title="Create new top level note" class="icon-action jam jam-plus-circle"></a>

7
src/views/sidebar.ejs Normal file
View File

@@ -0,0 +1,7 @@
<div class="note-detail-sidebar">
<div style="text-align: center; margin-bottom: 10px;">
<button class="hide-sidebar-button" style="background: none; border: none;">hide sidebar <span class="jam jam-chevron-right"></span></button>
</div>
<div class="note-detail-widgets"></div>
</div>

62
src/views/tabs.ejs
View File

@@ -4,42 +4,46 @@
<div id="note-tab-container">
<div class="note-tab-content note-tab-content-template">
<% include title.ejs %>
<div class="note-detail-content">
<% include title.ejs %>
<div class="note-detail-script-area"></div>
<div class="note-detail-script-area"></div>
<table class="note-detail-promoted-attributes"></table>
<table class="note-detail-promoted-attributes"></table>
<div class="note-detail-component-wrapper">
<div class="note-detail-text note-detail-component">
<div class="note-detail-text-editor" tabindex="10000"></div>
<div class="note-detail-component-wrapper">
<div class="note-detail-text note-detail-component">
<div class="note-detail-text-editor" tabindex="10000"></div>
</div>
<div class="note-detail-code note-detail-component">
<div class="note-detail-code-editor"></div>
</div>
<% include details/empty.ejs %>
<% include details/search.ejs %>
<% include details/render.ejs %>
<% include details/file.ejs %>
<% include details/image.ejs %>
<% include details/relation_map.ejs %>
<% include details/protected_session_password.ejs %>
<div class="children-overview hide-toggle"></div>
</div>
<div class="note-detail-code note-detail-component">
<div class="note-detail-code-editor"></div>
<div class="attribute-list">
<button class="btn btn-sm show-attributes-button">Attributes:</button>
<span class="attribute-list-inner"></span>
</div>
<% include details/empty.ejs %>
<% include details/search.ejs %>
<% include details/render.ejs %>
<% include details/file.ejs %>
<% include details/image.ejs %>
<% include details/relation_map.ejs %>
<% include details/protected_session_password.ejs %>
<div class="children-overview hide-toggle"></div>
</div>
<div class="attribute-list">
<button class="btn btn-sm show-attributes-button">Attributes:</button>
<span class="attribute-list-inner"></span>
</div>
<% include sidebar.ejs %>
</div>
</div>

2
src/views/title.ejs
View File

@@ -73,6 +73,8 @@
<a class="dropdown-item show-note-info-button">Note info</a>
</div>
</div>
<button class="btn btn-sm icon-button jam jam-chevron-left show-sidebar-button" title="Show sidebar"></button>
</div>
</div>
</div>