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

moved message area next to note title

Browse Source
This commit is contained in:
azivner 2017-09-24 11:34:16 -04:00
parent 21f49ea7c5
commit 398a0bce5e
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/templates/app.html
View File

@ -5,11 +5,6 @@
<title>Notecase web app</title> <title>Notecase web app</title>
</head> </head>
<body> <body>
<div id="top" style="grid-area: messages; text-align: center;">&nbsp;
<span id="top-message"></span>
<span id="error-message"></span>
</div>
<div class="hide-toggle" style="grid-area: search"> <div class="hide-toggle" style="grid-area: search">
<p> <p>
<label>Search:</label> <label>Search:</label>
@ -59,14 +54,17 @@
<input autocomplete="off" value="Welcome to Notecase web app!" id="noteTitle" style="font-size: x-large; border: 0; flex-grow: 100;" tabindex="1"> <input autocomplete="off" value="Welcome to Notecase web app!" id="noteTitle" style="font-size: x-large; border: 0; flex-grow: 100;" tabindex="1">
<div class="hide-toggle"> <div class="hide-toggle">
<form action="logout" method="POST"> <span id="top-message"></span>
<span id="error-message"></span>
<button class="btn btn-sm" onclick="displaySettings();">Settings</button>
&nbsp;
<form action="logout" method="POST" style="display: inline;">
<input type="submit" class="btn btn-sm" value="Logout"> <input type="submit" class="btn btn-sm" value="Logout">
</form> </form>
</div> </div>
<div class="hide-toggle">
<button class="btn btn-sm" onclick="displaySettings();">Settings</button>
</div>
</div> </div>
</div> </div>

4
static/js/utils.js
View File

@ -1,7 +1,7 @@
function message(str) { function message(str) {
const top = $("#top-message"); const top = $("#top-message");
top.fadeIn(1500); top.fadeIn(1500).css("display","inline-block");
top.html(str); top.html(str);
top.fadeOut(1500); top.fadeOut(1500);
} }
@ -9,7 +9,7 @@ function message(str) {
function error(str) { function error(str) {
const error = $("#error-message"); const error = $("#error-message");
error.show(); error.show().css("display","inline-block");
error.html(str); error.html(str);
error.fadeOut(10000); error.fadeOut(10000);
} }

6
static/style.css
View File

@ -17,6 +17,7 @@
} }
#error-message { #error-message {
margin-top: 2px;
display: none; /* initial state is hidden */ display: none; /* initial state is hidden */
background-color: red; background-color: red;
color: white; color: white;
@ -71,11 +72,6 @@ span.fancytree-node.encrypted.fancytree-folder > span.fancytree-icon {
display: none; display: none;
} }
#encryptButton img, #decryptButton img {
top: -5px;
position: relative;
}
body { body {
display: grid; display: grid;
height: 100vh; height: 100vh;