From 5644c2ac7b0add97efa9760fa61a6ddc6783a84d Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@jermolene.com>
Date: Fri, 28 Feb 2020 16:09:26 +0000
Subject: [PATCH] Menubar tweaks

* Fix old references to "top menu" to the new "menu bar" terminology
* Use vanilla breakpoint for responsive adjustment to menu bar padding
---
 plugins/tiddlywiki/menubar/config.tid       |  4 ++--
 plugins/tiddlywiki/menubar/items/search.tid |  2 +-
 plugins/tiddlywiki/menubar/styles.tid       | 12 ++++++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/plugins/tiddlywiki/menubar/config.tid b/plugins/tiddlywiki/menubar/config.tid
index 54132f988..9b564ee68 100644
--- a/plugins/tiddlywiki/menubar/config.tid
+++ b/plugins/tiddlywiki/menubar/config.tid
@@ -1,10 +1,10 @@
 title: $:/plugins/tiddlywiki/menubar/config
 tags: $:/tags/ControlPanel/Toolbars
-caption: Top Menu Bar
+caption: Menu Bar
 
 \define config-base() $:/config/plugins/menubar/MenuItems/Visibility/
 
-! Top Menu Configuration
+! Menu Bar Configuration
 
 !! Menu Items
 
diff --git a/plugins/tiddlywiki/menubar/items/search.tid b/plugins/tiddlywiki/menubar/items/search.tid
index 0ee37b2c2..edbf773ee 100644
--- a/plugins/tiddlywiki/menubar/items/search.tid
+++ b/plugins/tiddlywiki/menubar/items/search.tid
@@ -4,7 +4,7 @@ description: Search
 caption: Search
 tags: $:/tags/MenuBar
 
-<$set name="searchTiddler" value="$:/temp/topmenusearch">
+<$set name="searchTiddler" value="$:/temp/menubarsearch">
 
 <span style="margin: 0 0.5em;">
 
diff --git a/plugins/tiddlywiki/menubar/styles.tid b/plugins/tiddlywiki/menubar/styles.tid
index f53606a31..e90bf445e 100644
--- a/plugins/tiddlywiki/menubar/styles.tid
+++ b/plugins/tiddlywiki/menubar/styles.tid
@@ -26,6 +26,14 @@ nav.tc-menubar ul.tc-menubar-list {
 	<<box-shadow "1px 1px 5px rgba(0, 0, 0, 0.3)">>
 }
 
+@media (max-width: {{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}}) {
+
+	html nav.tc-menubar ul.tc-menubar-list {
+		padding: 0 0 0 8px;
+	}
+
+}
+
 nav.tc-menubar li.tc-menubar-item {
 	display: inline-block;
 	margin: 0;
@@ -137,10 +145,6 @@ nav.tc-menubar .tc-drop-down ol {
 		display: none;
 	}
 
-	html nav.tc-menubar ul.tc-menubar-list {
-		padding: 0 0 0 8px;
-	}
-
 }
 
 @media (min-width: <<breakpoint-plus-one>>) {