zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-02-22 22:13:07 +08:00
Code Issues Projects Releases Packages Wiki Activity

active protected state button has darker background and is disabled

Browse source
This commit is contained in:
azivner 2019-01-11 23:29:56 +01:00
parent cc27f16088
commit 3c19a712c0
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
package-lock.json generated
View file

@ -1,6 +1,6 @@
{
"name": "trilium",
"version": "0.27.2-beta",
"version": "0.27.4",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -3870,9 +3870,9 @@
}
},
"file-type": {
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz",
"integrity": "sha1-G2AOX8ofvcboDApwxxyNul95BsU="
"version": "10.7.0",
"resolved": "https://registry.npmjs.org/file-type/-/file-type-10.7.0.tgz",
"integrity": "sha512-AbaGtdWYYRaVrv2MwL/65myuRJ9j3e79e7etJ79US18QHuVlzJBcQHUH+HxDUoLtbyWRTUfLzLkGXX3pP9kfZg=="
},
"filename-regex": {
"version": "2.0.1",
@ -5000,6 +5000,13 @@
"integrity": "sha1-FQKvMTX5BuEiyHfDHpSve3qRRsU=",
"requires": {
"file-type": "^4.1.0"
},
"dependencies": {
"file-type": {
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz",
"integrity": "sha1-G2AOX8ofvcboDApwxxyNul95BsU="
}
}
},
"imagemin": {

3
src/public/javascripts/services/note_detail.js
View file

@ -145,8 +145,9 @@ async function saveNoteIfChanged() {
function setNoteBackgroundIfProtected(note) {
$noteDetailWrapper.toggleClass("protected", note.isProtected);
$protectButton.toggleClass("active", note.isProtected);
$protectButton.prop("disabled", note.isProtected);
$unprotectButton.toggleClass("active", !note.isProtected);
$unprotectButton.prop("disabled", !protectedSessionHolder.isProtectedSessionAvailable());
$unprotectButton.prop("disabled", !note.isProtected || !protectedSessionHolder.isProtectedSessionAvailable());
}
async function handleProtectedSession() {

2
src/public/stylesheets/style.css
View file

@ -396,7 +396,7 @@ div.ui-tooltip {
}
.btn.active:not(.btn-primary) {
background-color: #ccc;
background-color: #ccc !important;
}
#note-path-list a.current {