From 059e65f0f75c2fd2f4eea8b3311d8efee6e58d0c Mon Sep 17 00:00:00 2001 From: llcc Date: Thu, 5 May 2022 10:13:22 +0800 Subject: [PATCH] move mobile-bar footer components --- src/main/frontend/components/sidebar.cljs | 13 ++++--------- src/main/frontend/mobile/index.css | 3 ++- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/frontend/components/sidebar.cljs b/src/main/frontend/components/sidebar.cljs index 8413860b97..6180c703ae 100644 --- a/src/main/frontend/components/sidebar.cljs +++ b/src/main/frontend/components/sidebar.cljs @@ -389,13 +389,13 @@ :data-is-full-width (or global-graph-pages? (contains? #{:all-files :all-pages :my-publishing} route-name))} + (mobile-bar) + (footer/footer) + (when (and (not (mobile-util/native-platform?)) (contains? #{:page :home} route-name)) (widgets/demo-graph-alert)) - (when (mobile-util/native-platform?) - (mobile-bar)) - (cond (not indexeddb-support?) nil @@ -615,12 +615,7 @@ :indexeddb-support? indexeddb-support? :light? light? :db-restoring? db-restoring? - :main-content main-content}) - - (when (and (mobile-util/native-platform?) - current-repo - (not (state/sub :modal/show?))) - (footer/footer))] + :main-content main-content})] (right-sidebar/sidebar) diff --git a/src/main/frontend/mobile/index.css b/src/main/frontend/mobile/index.css index a755f902ca..348727c315 100644 --- a/src/main/frontend/mobile/index.css +++ b/src/main/frontend/mobile/index.css @@ -1,9 +1,10 @@ .cp__footer { position: absolute; bottom: 0px; + left: 0px; padding: 10px 20px; background-color: var(--ls-primary-background-color); - z-index: 1000; + z-index: 10; display: flex; flex: 0 0 auto; white-space: nowrap;