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/master' into m41

Browse Source 
# Conflicts:
#	src/public/javascripts/mobile.js
#	src/public/stylesheets/style.css
This commit is contained in:
zadam
2020-02-25 09:42:27 +01:00
parent 7cac2521ef e8a9e49e9e
commit 36eac6badd
11 changed files with 80 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/mobile.ejs
View File

@@ -71,6 +71,8 @@
<% include details/relation_map.ejs %>
<% include details/protected_session_password.ejs %>
<% include details/book.ejs %>
</div>
</div>
</div>

6
src/views/setup.ejs
View File

@@ -19,13 +19,13 @@
<label><input type="radio" name="setup-type" value="new-document" data-bind="checked: setupType">
I'm a new user and I want to create new Trilium document for my notes</label>
</div>
<div class="radio" data-bind="if: instanceType == 'server'" style="margin-bottom: 15px;">
<div class="radio" style="margin-bottom: 15px;">
<label><input type="radio" name="setup-type" value="sync-from-desktop" data-bind="checked: setupType">
I have desktop instance already and I want to setup sync with it</label>
</div>
<div class="radio" data-bind="if: instanceType == 'desktop'" style="margin-bottom: 15px;">
<div class="radio" style="margin-bottom: 15px;">
<label><input type="radio" name="setup-type" value="sync-from-server" data-bind="checked: setupType">
I have server instance up and I want to setup sync with it</label>
I have server instance already and I want to setup sync with it</label>
</div>
<button type="button" data-bind="disable: !setupTypeSelected(), click: selectSetupType" class="btn btn-primary">Next</button>