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

Merge branch 'stable'

Browse Source
This commit is contained in:
zadam 2019-06-30 20:15:37 +02:00
commit ec4abe0d81
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/public/javascripts/services/tab_context.js
View File

@ -338,7 +338,9 @@ class TabContext {
} }
closeAutocomplete() { closeAutocomplete() {
this.$tabContent.find('.aa-input').autocomplete('close'); if (utils.isDesktop()) {
this.$tabContent.find('.aa-input').autocomplete('close');
}
} }
} }

6
src/views/login.ejs
View File

@ -72,7 +72,7 @@
document.cookie = name + "=" + (value || "") + expires + "; path=/"; document.cookie = name + "=" + (value || "") + expires + "; path=/";
} }
</script> </script>
<link href="libraries/bootstrap/css/bootstrap.min.css" rel="stylesheet"> <link href="libraries/bootstrap/css/bootstrap.min.css" rel="stylesheet">
</body> </body>
</html> </html>

4
src/views/mobile.ejs
View File

@ -49,7 +49,9 @@
</div> </div>
<div class="note-detail-component-wrapper"> <div class="note-detail-component-wrapper">
<div class="note-detail-text note-detail-component" tabindex="10000"></div> <div class="note-detail-text note-detail-component" tabindex="10000">
<div class="note-detail-text-editor"></div>
</div>
<div class="note-detail-code note-detail-component"></div> <div class="note-detail-code note-detail-component"></div>