menubar: move new button

mhuebert · Aug 7, 2023 · e16ade5 · e16ade5
1 parent 2fa8539
commit e16ade5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/editor2/deps.edn b/editor2/deps.edn
@@ -27,7 +27,7 @@
 
         ;; emmy / clerk
         org.mentat/emmy {:git/url "https://github.com/mhuebert/emmy"
-                         :git/sha "d2d8c9d7649f5a75437f070c44acc9c8199486cd"}
+                         :git/sha "4f525ff32c537dba680801008475f6a258f584c1"}
         org.mentat/emmy-viewers {:mvn/version "0.2.0"}
         io.github.nextjournal/clerk {:git/sha "d80187013d7b7b96db3d8b114b8d99f687170668"}
         io.github.nextjournal/clerk.render {:git/url "https://github.com/nextjournal/clerk"
@@ -39,7 +39,7 @@
 
         }
  :aliases
- {:local {:extra-deps {org.mentat/emmy {:local/root "../../emmy"}
+ {:local {:extra-deps {#_#_org.mentat/emmy {:local/root "../../emmy"}
                        #_#_io.github.babashka/sci {:local/root "../../sci"}
                        #_#_applied-science/js-interop {:local/root "../../js-interop"}
                        #_#_nextjournal/clojure-mode {:local/root "../../clojure-mode"}

diff --git a/editor2/src/main/maria/cloud/menubar.cljs b/editor2/src/main/maria/cloud/menubar.cljs
@@ -188,6 +188,7 @@
       [:el Root {:class "flex flex-row w-full items-center gap-1"}
        [:div.flex-grow]
        menubar-content
+       [:div.flex-grow]
        (let [cmd (keymaps/resolve-command :file/new)]
          [ui/tooltip
           [:div.cursor-pointer.p-1
@@ -196,7 +197,6 @@
             :on-click #(keymaps/run-command cmd)}
            [icons/document-plus:mini "w-5 h-5 -mt-[2px]"]]
           (:title (keymaps/resolve-command :file/new))])
-       [:div.flex-grow]
        [command-bar/input]
        (if-let [{:keys [photo-url display-name]} (gh/get-user)]
          [menu [:el menu/Trigger {:class [trigger-classes

diff --git a/editor2/src/main/maria/ui.cljc b/editor2/src/main/maria/ui.cljc
@@ -92,7 +92,7 @@
 
 #?(:cljs
    (ui/defview tooltip [trigger content]
-     [:el Tooltip/Provider {:delay-duration 400}
+     [:el Tooltip/Provider {:delay-duration 200}
       [:el Tooltip/Root
        [:el Tooltip/Trigger {:asChild true} trigger]