From 27bed615ab258bd9d3ceb85a48d61ebdd77ad211 Mon Sep 17 00:00:00 2001
From: Simon Huber <huber.simon@protonmail.com>
Date: Mon, 9 Nov 2020 19:18:30 +0100
Subject: [PATCH] Move styles from menubar plugin to vanilla/base (#5019)

* Update styles.tid

* Update base.tid

* Update styles.tid

* Update base.tid
---
 plugins/tiddlywiki/menubar/styles.tid | 15 ---------------
 themes/tiddlywiki/vanilla/base.tid    | 21 ++++++++++++++++++++-
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/plugins/tiddlywiki/menubar/styles.tid b/plugins/tiddlywiki/menubar/styles.tid
index b33e805c8..7fc56eafe 100644
--- a/plugins/tiddlywiki/menubar/styles.tid
+++ b/plugins/tiddlywiki/menubar/styles.tid
@@ -191,10 +191,6 @@ nav.tc-menubar .tc-more-sidebar > .tc-tab-set > .tc-tab-buttons > button {
 		display: none;
 	}
 
-	nav.tc-menubar .tc-menubar-item .tc-show-sidebar-btn svg.tc-image-chevron-left, nav.tc-menubar .tc-menubar-item .tc-hide-sidebar-btn svg.tc-image-chevron-right {
-		transform: rotate(-90deg);
-	}
-
 }
 
 @media (min-width: <<breakpoint-plus-one>>) {
@@ -209,17 +205,6 @@ nav.tc-menubar .tc-more-sidebar > .tc-tab-set > .tc-tab-buttons > button {
 @media (max-width: <<sidebarbreakpoint-minus-one>>) {
 
 	<<set-sidebar-scrollable-top-if-hamburger>>
-	
-	<<if-no-sidebar """
-
-		.tc-sidebar-header {
-			min-height: 0;
-			padding-top: 0;
-			padding-bottom: 0;
-			transition: min-height {{$:/config/AnimationDuration}}ms ease-in-out, padding-top {{$:/config/AnimationDuration}}ms ease-in-out, padding-bottom {{$:/config/AnimationDuration}}ms ease-in-out;
-		}
-
-	""">>
 
 }
 
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index aad261a08..7225ffcc2 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -769,6 +769,14 @@ button.tc-btn-invisible.tc-remove-tag-button {
 	fill: <<colour foreground>>;
 }
 
+@media (max-width: <<sidebarbreakpoint-minus-one>>) {
+
+	.tc-show-sidebar-btn svg.tc-image-chevron-left, .tc-hide-sidebar-btn svg.tc-image-chevron-right {
+		transform: rotate(-90deg);
+	}
+
+}
+
 .tc-sidebar-header {
 	color: <<colour sidebar-foreground>>;
 	fill: <<colour sidebar-foreground>>;
@@ -848,7 +856,18 @@ button.tc-btn-invisible.tc-remove-tag-button {
 		padding: 14px;
 		min-height: 32px;
 		margin-top: {{$:/themes/tiddlywiki/vanilla/metrics/storytop}};
+		transition:  min-height {{$:/config/AnimationDuration}}ms ease-in-out, padding-top {{$:/config/AnimationDuration}}ms ease-in-out, padding-bottom {{$:/config/AnimationDuration}}ms ease-in-out;
 	}
+	
+	<<if-no-sidebar """
+
+		.tc-sidebar-header {
+			min-height: 0;
+			padding-top: 0;
+			padding-bottom: 0;
+		}
+
+	""">>
 
 	.tc-story-river {
 		position: relative;
@@ -2862,4 +2881,4 @@ select {
 
 .tc-word-break {
 	word-break: break-all;
-}
\ No newline at end of file
+}