gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-03 21:19:01 +01:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity

fix visual glitch in search - showing search now doesn't move note content

Browse Source
This commit is contained in:
azivner 2018-02-05 20:53:04 -05:00
parent 02e07ec03a
commit aee64b2522
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/javascripts/note_tree.js
View File

@ -3,7 +3,7 @@
const noteTree = (function() { const noteTree = (function() {
const treeEl = $("#tree"); const treeEl = $("#tree");
const parentListEl = $("#parent-list"); const parentListEl = $("#parent-list");
const parentListListEl = $("#parent-list-list"); const parentListListEl = $("#parent-list-inner");
let startNotePath = null; let startNotePath = null;
let notesTreeMap = {}; let notesTreeMap = {};

8
src/public/stylesheets/style.css
View File

@ -5,13 +5,18 @@
display: grid; display: grid;
grid-template-areas: "header header" grid-template-areas: "header header"
"tree-actions title" "tree-actions title"
"search note-content"
"tree note-content" "tree note-content"
"parent-list note-content" "parent-list note-content"
"parent-list attribute-list"; "parent-list attribute-list";
grid-template-columns: 2fr 5fr; grid-template-columns: 2fr 5fr;
grid-template-rows: auto grid-template-rows: auto
auto auto
1fr; auto
1fr
auto
auto;
justify-content: center; justify-content: center;
grid-gap: 10px; grid-gap: 10px;
} }
@ -135,6 +140,7 @@ div.ui-tooltip {
margin-left: 20px; margin-left: 20px;
border-top: 2px solid #eee; border-top: 2px solid #eee;
padding-top: 10px; padding-top: 10px;
grid-area: parent-list;
} }
#parent-list ul { #parent-list ul {

6
src/views/index.ejs
View File

@ -56,15 +56,15 @@
<img src="images/icons/search.png" alt="Search in notes"/> <img src="images/icons/search.png" alt="Search in notes"/>
</a> </a>
</div> </div>
</div>
<div id="search-box" style="display: none; padding: 10px; margin-top: 10px;"> <div id="search-box" class="hide-toggle" style="grid-area: search; display: none; padding: 10px; margin-top: 10px;">
<div style="display: flex; align-items: center;"> <div style="display: flex; align-items: center;">
<label>Search:</label> <label>Search:</label>
<input name="search-text" style="flex-grow: 100; margin-left: 5px; margin-right: 5px;" autocomplete="off"> <input name="search-text" style="flex-grow: 100; margin-left: 5px; margin-right: 5px;" autocomplete="off">
<button id="reset-search-button" class="btn btn-sm" title="Reset search">&times;</button> <button id="reset-search-button" class="btn btn-sm" title="Reset search">&times;</button>
</div> </div>
</div> </div>
</div>
<div id="tree" class="hide-toggle" style="grid-area: tree; overflow: auto;"> <div id="tree" class="hide-toggle" style="grid-area: tree; overflow: auto;">
</div> </div>
@ -72,7 +72,7 @@
<div id="parent-list" class="hide-toggle"> <div id="parent-list" class="hide-toggle">
<p><strong>Note locations:</strong></p> <p><strong>Note locations:</strong></p>
<ul id="parent-list-list"></ul> <ul id="parent-list-inner"></ul>
</div> </div>
<div class="hide-toggle" style="grid-area: title;"> <div class="hide-toggle" style="grid-area: title;">