From 8259b4a32c2555e8f4096decaecedaa23f92d5c0 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Fri, 28 Aug 2020 14:52:38 +0200
Subject: [PATCH] close down dropdown menus on click + smaller tweaks

---
 package.json                                          | 2 +-
 src/public/app/layouts/desktop_extra_window_layout.js | 2 +-
 src/public/app/layouts/desktop_main_window_layout.js  | 2 +-
 src/public/app/widgets/attribute_list.js              | 6 +++---
 src/public/app/widgets/global_menu.js                 | 3 +++
 src/public/app/widgets/note_actions.js                | 3 +++
 src/public/app/widgets/type_widgets/book.js           | 2 +-
 7 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index a11f7c104..5d3811ddf 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "mime-types": "2.1.27",
     "multer": "1.4.2",
     "node-abi": "2.19.1",
-    "open": "7.2.0",
+    "open": "7.2.1",
     "portscanner": "2.2.0",
     "rand-token": "1.0.1",
     "request": "^2.88.2",
diff --git a/src/public/app/layouts/desktop_extra_window_layout.js b/src/public/app/layouts/desktop_extra_window_layout.js
index 0c574bb4d..ad5e72cb0 100644
--- a/src/public/app/layouts/desktop_extra_window_layout.js
+++ b/src/public/app/layouts/desktop_extra_window_layout.js
@@ -32,7 +32,7 @@ export default class DesktopExtraWindowLayout {
                 .child(new FlexContainer('column').id('center-pane').css('flex-grow', '1')
                     .child(new FlexContainer('row').class('title-row')
                         .overflowing()
-                        .cssBlock('.title-row > * { margin: 5px; }')
+                        .cssBlock('.title-row > * { margin: 5px 5px 0 5px; }')
                         .child(new NoteTitleWidget())
                         .child(new RunScriptButtonsWidget().hideInZenMode())
                         .child(new NoteTypeWidget().hideInZenMode())
diff --git a/src/public/app/layouts/desktop_main_window_layout.js b/src/public/app/layouts/desktop_main_window_layout.js
index 049bc7107..9ebfd199a 100644
--- a/src/public/app/layouts/desktop_main_window_layout.js
+++ b/src/public/app/layouts/desktop_main_window_layout.js
@@ -130,7 +130,7 @@ export default class DesktopMainWindowLayout {
                 )
                 .child(new FlexContainer('column').id('center-pane')
                     .child(new FlexContainer('row').class('title-row')
-                        .cssBlock('.title-row > * { margin: 5px; }')
+                        .cssBlock('.title-row > * { margin: 5px 5px 0 5px; }')
                         .overflowing()
                         .child(new NoteTitleWidget())
                         .child(new RunScriptButtonsWidget().hideInZenMode())
diff --git a/src/public/app/widgets/attribute_list.js b/src/public/app/widgets/attribute_list.js
index bf88a2560..ee5a4763e 100644
--- a/src/public/app/widgets/attribute_list.js
+++ b/src/public/app/widgets/attribute_list.js
@@ -57,11 +57,11 @@ const TPL = `
         }
         
         .attr-expander:not(.error):hover hr {
-            border-color: black;
+            border-color: var(--main-text-color);
         }
         
-        .attr-expander:not(.error):hover .attr-expander-text {
-            color: black;
+        .attr-expander:hover .attr-expander-text {
+            color: var(--main-text-color);
         }
     </style>
     
diff --git a/src/public/app/widgets/global_menu.js b/src/public/app/widgets/global_menu.js
index a9e134e70..ea0c0bde8 100644
--- a/src/public/app/widgets/global_menu.js
+++ b/src/public/app/widgets/global_menu.js
@@ -120,5 +120,8 @@ export default class GlobalMenuWidget extends BasicWidget {
         this.$widget.find(".logout-button").toggle(!utils.isElectron());
 
         this.$widget.find(".open-dev-tools-button").toggle(utils.isElectron());
+
+        this.$widget.on('click', '.dropdown-item',
+            () => this.$widget.find('.dropdown-toggle').dropdown('toggle'));
     }
 }
diff --git a/src/public/app/widgets/note_actions.js b/src/public/app/widgets/note_actions.js
index d9b6b0017..60eba0229 100644
--- a/src/public/app/widgets/note_actions.js
+++ b/src/public/app/widgets/note_actions.js
@@ -114,6 +114,9 @@ export default class NoteActionsWidget extends TabAwareWidget {
 
         this.$unprotectButton = this.$widget.find(".unprotect-button");
         this.$unprotectButton.on('click', () => protectedSessionService.protectNote(this.noteId, false, false));
+
+        this.$widget.on('click', '.dropdown-item',
+            () => this.$widget.find('.dropdown-toggle').dropdown('toggle'));
     }
 
     refreshWithNote(note) {
diff --git a/src/public/app/widgets/type_widgets/book.js b/src/public/app/widgets/type_widgets/book.js
index 451a44083..44b977d46 100644
--- a/src/public/app/widgets/type_widgets/book.js
+++ b/src/public/app/widgets/type_widgets/book.js
@@ -42,7 +42,7 @@ const TPL = `
     
     .note-detail-book {
         height: 100%;
-        padding: 10px;
+        padding: 0 10px 10px 10px;
         position: relative;
     }