From 2eec4e6c4806a21a0badb32d04edd442baf6665e Mon Sep 17 00:00:00 2001
From: Jos de Jong <wjosdejong@gmail.com>
Date: Wed, 8 Nov 2023 09:55:39 +0100
Subject: [PATCH] fix: #337 some menu styling issues

---
 src/lib/components/controls/Menu.scss         | 30 ++++++++++++-------
 .../components/modes/treemode/JSONNode.scss   |  2 ++
 .../components/modes/treemode/TreeMode.scss   |  2 --
 src/lib/themes/jse-theme-default.css          |  1 +
 4 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/lib/components/controls/Menu.scss b/src/lib/components/controls/Menu.scss
index 51ed4df8..65e462b2 100644
--- a/src/lib/components/controls/Menu.scss
+++ b/src/lib/components/controls/Menu.scss
@@ -2,25 +2,35 @@
 
 .jse-menu {
   background: var(--jse-theme-color);
-  border-bottom: 1px solid var(--jse-theme-color);
+  font-family: var(--jse-font-family);
+  font-size: var(--jse-font-size-main-menu);
   color: var(--jse-menu-color);
   display: flex;
   flex-wrap: wrap;
-  align-items: center;
+  align-items: stretch;
   position: relative;
 
   // FIXME: should utilize the generic styling in styles.scss
   .jse-button {
-    width: var(--jse-menu-button-size);
-    height: var(--jse-menu-button-size);
+    font-family: inherit;
+    font-size: inherit;
+    line-height: 1.5em;
     border: none;
     background: transparent;
     color: inherit;
     cursor: pointer;
+
+    width: var(--jse-menu-button-size);
+    height: var(--jse-menu-button-size);
     padding: $padding-half;
     margin: 0;
     border-radius: 0;
 
+    display: inline-flex;
+    align-items: center;
+    text-align: center;
+    justify-content: center;
+
     &:hover,
     &:focus {
       background: var(--jse-theme-color-highlight);
@@ -36,16 +46,16 @@
     &.jse-group-button {
       $group-button-color: var(--jse-menu-color);
 
+      width: auto;
+      height: calc(var(--jse-menu-button-size) - $padding);
+      margin: $padding-half 0;
+      padding: 0 $padding-half 1px; // 1px bottom padding for better center alignment (text baseline)
       border: 1px solid $group-button-color;
+
       &:not(.jse-last) {
         border-right: none;
       }
 
-      padding: 0 $padding-half;
-      margin: $padding-half 0;
-      height: calc(var(--jse-menu-button-size) - var(--jse-padding));
-      width: auto;
-
       &.jse-first {
         margin-left: $padding-half;
       }
@@ -75,9 +85,7 @@
 
     background: var(--jse-menu-color);
     opacity: 0.3;
-    box-sizing: border-box;
     width: 1px;
-    height: calc(var(--jse-menu-button-size) - 2 * $margin);
     margin: $margin;
   }
 }
diff --git a/src/lib/components/modes/treemode/JSONNode.scss b/src/lib/components/modes/treemode/JSONNode.scss
index a8646dd3..fd729c15 100644
--- a/src/lib/components/modes/treemode/JSONNode.scss
+++ b/src/lib/components/modes/treemode/JSONNode.scss
@@ -2,6 +2,8 @@
 
 .jse-json-node {
   position: relative;
+  font-family: var(--jse-font-family-mono);
+  font-size: var(--jse-font-size-mono);
   color: var(--jse-text-color);
 
   &.jse-root {
diff --git a/src/lib/components/modes/treemode/TreeMode.scss b/src/lib/components/modes/treemode/TreeMode.scss
index 73dab738..8df77b7b 100644
--- a/src/lib/components/modes/treemode/TreeMode.scss
+++ b/src/lib/components/modes/treemode/TreeMode.scss
@@ -8,8 +8,6 @@
   background: var(--jse-background-color);
   min-width: 0;
   min-height: 0;
-  font-family: var(--jse-font-family-mono);
-  font-size: var(--jse-font-size-mono);
   color: var(--jse-text-color);
   line-height: var(--jse-line-height);
 
diff --git a/src/lib/themes/jse-theme-default.css b/src/lib/themes/jse-theme-default.css
index ee5e79d6..cfe171d3 100644
--- a/src/lib/themes/jse-theme-default.css
+++ b/src/lib/themes/jse-theme-default.css
@@ -9,6 +9,7 @@
   --jse-font-family-mono: consolas, menlo, monaco, 'Ubuntu Mono', 'source-code-pro', monospace;
   --jse-font-size-mono: 14px;
   --jse-font-size: 16px;
+  --jse-font-size-main-menu: 14px;
   --jse-font-size-text-mode-search: 80%;
   --jse-line-height: calc(1em + 4px);
   --jse-indent-size: calc(1em + 4px);