greatbody
/
logseq
mirror of https://github.com/logseq/logseq
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into whiteboards

pull/6489/head
Peng Xiao 2022-08-29 11:39:07 +08:00
parent 0ff5324c02 0a11bcbc8e
commit 74aaa378aa
4 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package.json
View File

@ -45,21 +45,21 @@
"clean": "gulp clean",
"test": "run-s cljs:test cljs:run-test",
"report": "run-s cljs:report",
"style:lint": "stylelint \"src/**/*.css\" ",
"style:lint": "stylelint \"src/**/*.css\"",
"gulp:watch": "gulp watch",
"gulp:build": "cross-env NODE_ENV=production gulp build",
"css:build": "postcss tailwind.all.css -o static/css/style.css --verbose --env production",
"css:watch": "cross-env TAILWIND_MODE=watch postcss tailwind.all.css -o static/css/style.css --verbose --watch",
"cljs:watch": "clojure -M:cljs watch app electron",
"cljs:app-watch": "clojure -M:cljs watch app",
"cljs:electron-watch": "clojure -M:cljs watch app electron --config-merge '{:asset-path \"./js\"}'",
"cljs:electron-watch": "clojure -M:cljs watch app electron --config-merge \"{:asset-path \\\"./js\\\"}\"",
"cljs:release": "clojure -M:cljs release app publishing electron",
"cljs:release-electron": "clojure -M:cljs release app electron --debug && clojure -M:cljs release publishing",
"cljs:release-app": "clojure -M:cljs release app --config-merge '{:compiler-options {:output-feature-set :es6}}'",
"cljs:release-android-app": "clojure -M:cljs release app --config-merge '{:compiler-options {:output-feature-set :es6}}'",
"cljs:release-app": "clojure -M:cljs release app --config-merge \"{:compiler-options {:output-feature-set :es6}}\"",
"cljs:release-android-app": "clojure -M:cljs release app --config-merge \"{:compiler-options {:output-feature-set :es6}}\"",
"cljs:test": "clojure -M:test compile test",
"cljs:run-test": "node static/tests.js",
"cljs:dev-release-app": "clojure -M:cljs release app --config-merge '{:closure-defines {frontend.config/DEV-RELEASE true}}'",
"cljs:dev-release-app": "clojure -M:cljs release app --config-merge \"{:closure-defines {frontend.config/DEV-RELEASE true}}\"",
"cljs:debug": "clojure -M:cljs release app --debug",
"cljs:report": "clojure -M:cljs run shadow.cljs.build-report app report.html",
"cljs:build-electron": "clojure -A:cljs compile app electron",

4
src/main/frontend/components/right_sidebar.cljs
View File

@ -113,7 +113,7 @@
([on-close]
(close nil on-close))
([class on-close]
[:a.close.opacity-50.hover:opacity-100.flex.items-center
[:a.close.flex.items-center
(cond-> {:on-click on-close
:style {:margin-right -4}}
class
@ -214,7 +214,7 @@
repo
page
:page-graph)))}
(t :right-side-bar/page)]]
(t :right-side-bar/page-graph)]]
[:div.text-sm
[:button.button.cp__right-sidebar-settings-btn {:on-click (fn [_e]

4
src/main/frontend/components/right_sidebar.css
View File

@ -8,6 +8,10 @@ html[data-theme=light] {
--ls-page-inline-code-bg-color: var(--ls-quaternary-background-color);
--ls-page-blockquote-bg-color: var(--ls-quaternary-background-color);
}
.cp__right-sidebar-topbar button {
opacity: 1;
}
}
}

17
src/main/frontend/dicts.cljc
View File

@ -59,7 +59,6 @@
:right-side-bar/help "Help"
:right-side-bar/switch-theme "Theme modes"
:right-side-bar/theme "{1} theme"
:right-side-bar/page "Page graph"
:right-side-bar/recent "Recent"
:right-side-bar/contents "Contents"
:right-side-bar/favorites "Favorites"
@ -388,7 +387,6 @@
:right-side-bar/help "Hilfe"
:right-side-bar/switch-theme "Zu {1} Thema wechseln"
:right-side-bar/theme "{1} Thema"
:right-side-bar/page "Seiten-Graph"
:right-side-bar/recent "Neueste"
:right-side-bar/contents "Inhalt"
:right-side-bar/block-ref "Blockreferenz"
@ -895,7 +893,6 @@
:right-side-bar/graph-view "Grafiekweergave"
:right-side-bar/help "Help"
:right-side-bar/new-page "Nieuwe pagina"
:right-side-bar/page "Pagina grafiek"
:right-side-bar/page-graph "Pagina grafiek"
:right-side-bar/recent "Recent"
:right-side-bar/show-journals "Toon Journaals"
@ -1003,7 +1000,6 @@
:right-side-bar/help "Aide"
:right-side-bar/switch-theme "Basculer sur le thème {1}"
:right-side-bar/theme "Thème {1}"
:right-side-bar/page "Graphe de la page"
:right-side-bar/recent "Récents"
:right-side-bar/contents "Contenus"
:right-side-bar/block-ref "Référence des blocs"
@ -1184,7 +1180,6 @@
:right-side-bar/help "帮助"
:right-side-bar/switch-theme "主题模式"
:right-side-bar/theme "{1}主题"
:right-side-bar/page "页面图谱"
:right-side-bar/recent "最近"
:right-side-bar/contents "目录"
:right-side-bar/favorites "收藏"
@ -1483,7 +1478,6 @@
:right-side-bar/help "幫助"
:right-side-bar/switch-theme "主題模式"
:right-side-bar/theme "{1}主題"
:right-side-bar/page "頁面圖譜"
:right-side-bar/recent "最近"
:right-side-bar/contents "目錄"
:right-side-bar/block-ref "塊引用"
@ -1646,7 +1640,6 @@
:right-side-bar/help "Hulp"
:right-side-bar/switch-theme "Skakel oor na die {1} tema"
:right-side-bar/theme "{1} tema"
:right-side-bar/page "Grafiek bladsy"
:right-side-bar/recent "Onlangs"
:right-side-bar/contents "Inhoud"
:right-side-bar/block-ref "Blok verwysing"
@ -1802,7 +1795,6 @@
:right-side-bar/help "Ayuda"
:right-side-bar/switch-theme "Temas"
:right-side-bar/theme "Tema {1}"
:right-side-bar/page "Gráfico de la página"
:right-side-bar/recent "Reciente"
:right-side-bar/contents "Contenido"
:right-side-bar/favorites "Favoritos"
@ -2123,7 +2115,6 @@
:right-side-bar/help "Hjelp"
:right-side-bar/switch-theme "Tema moduser"
:right-side-bar/theme "{1} tema"
:right-side-bar/page "Sidegraf"
:right-side-bar/recent "Siste"
:right-side-bar/contents "Innhold"
:right-side-bar/favorites "Favoritter"
@ -2442,7 +2433,6 @@
:right-side-bar/help "Ajuda"
:right-side-bar/switch-theme "Temas"
:right-side-bar/theme "Tema {1}"
:right-side-bar/page "Gráfico da página"
:right-side-bar/recent "Recente"
:right-side-bar/contents "Conteúdo"
:right-side-bar/favorites "Favoritos"
@ -2763,7 +2753,6 @@
:right-side-bar/help "Ajuda"
:right-side-bar/switch-theme "Temas"
:right-side-bar/theme "Tema {1}"
:right-side-bar/page "Grafo da página"
:right-side-bar/recent "Recente"
:right-side-bar/contents "Conteúdo"
:right-side-bar/favorites "Favoritos"
@ -3091,7 +3080,6 @@
:right-side-bar/help "Справка"
:right-side-bar/switch-theme "Тема"
:right-side-bar/theme "{1} тема"
:right-side-bar/page "Граф страницы"
:right-side-bar/recent "Недавние"
:right-side-bar/contents "Содержание"
:right-side-bar/favorites "Избранные"
@ -3423,7 +3411,6 @@
:right-side-bar/help "ヘルプ"
:right-side-bar/switch-theme "テーマ"
:right-side-bar/theme "{1} テーマ"
:right-side-bar/page "ページグラフ"
:right-side-bar/recent "最新"
:right-side-bar/contents "目次"
:right-side-bar/favorites "Favorites"
@ -3746,7 +3733,6 @@
:right-side-bar/help "Aiuto"
:right-side-bar/switch-theme "Modalità tema"
:right-side-bar/theme "{1} tema"
:right-side-bar/page "Grafico della pagina"
:right-side-bar/recent "Recenti"
:right-side-bar/contents "Contenuti"
:right-side-bar/favorites "Preferiti"
@ -4075,7 +4061,6 @@
:right-side-bar/help "Yardım"
:right-side-bar/switch-theme "Tema modları"
:right-side-bar/theme "{1} tema"
:right-side-bar/page "Sayfa grafiği"
:right-side-bar/recent "En son"
:right-side-bar/contents "İçindekiler"
:right-side-bar/favorites "Sık kullanılanlar"
@ -4406,7 +4391,6 @@
:right-side-bar/help "도움말"
:right-side-bar/switch-theme "테마 모드"
:right-side-bar/theme "{1} 테마"
:right-side-bar/page "페이지 그래프"
:right-side-bar/recent "최근 페이지"
:right-side-bar/contents "콘텐츠"
:right-side-bar/favorites "즐겨찾기"
@ -4734,7 +4718,6 @@
:right-side-bar/help "Pomoc"
:right-side-bar/switch-theme "Zmień motyw"
:right-side-bar/theme "Motyw {1}"
:right-side-bar/page "Graf strony"
:right-side-bar/recent "Ostatnio edytowane"
:right-side-bar/contents "Treść"
:right-side-bar/favorites "Ulubione"