Merge branch 'master' of github.com:logseq/logseq into master

pull/1039/head
Tienson Qin 2020-12-31 20:47:36 +08:00
commit 234fa34f05
1 changed files with 9 additions and 9 deletions

View File

@ -20,16 +20,16 @@
[:div.mt-4.ml-1 [:div.mt-4.ml-1
(ui/button (ui/button
"Markdown" "Markdown"
:on-click :on-click
#(user-handler/set-preferred-format! :markdown)) #(user-handler/set-preferred-format! :markdown))
[:span.ml-2.mr-2 "-OR-"] [:span.ml-2.mr-2 "-OR-"]
(ui/button (ui/button
"Org Mode" "Org Mode"
:on-click :on-click
#(user-handler/set-preferred-format! :org))]])) #(user-handler/set-preferred-format! :org))]]))
(rum/defcs add-github-repo < (rum/defcs add-github-repo <
(rum/local "" ::repo) (rum/local "" ::repo)
@ -65,7 +65,7 @@
(let [branch (string/trim @branch)] (let [branch (string/trim @branch)]
(if (string/blank? branch) (if (string/blank? branch)
(notification/show! (notification/show!
[:p.text-gray-700 "Please input a branch, make sure it's matched with your setting on Github."] [:p.text-gray-700.dark:text-gray-300 "Please input a branch, make sure it's matched with your setting on Github."]
:error :error
false) false)
(let [repo (util/lowercase-first @repo)] (let [repo (util/lowercase-first @repo)]
@ -74,7 +74,7 @@
(repo-handler/create-repo! repo branch)) (repo-handler/create-repo! repo branch))
(notification/show! (notification/show!
[:p.text-gray-700 "Please input a valid repo url, e.g. https://github.com/username/repo"] [:p.text-gray-700.dark:text-gray-300 "Please input a valid repo url, e.g. https://github.com/username/repo"]
:error :error
false)))))))]]))) false)))))))]])))
@ -115,7 +115,7 @@
:local :local
(rum/with-key (add-local-directory) (rum/with-key (add-local-directory)
"add-local-directory") "add-local-directory")
nil)) nil))
available-graph (->> (set graph-types) available-graph (->> (set graph-types)