Browse Source

fix(sidebar/main-content): mobile layout issues

Runjuu 5 years ago
parent
commit
db412b0935
2 changed files with 31 additions and 15 deletions
  1. 7 15
      src/main/frontend/components/sidebar.cljs
  2. 24 0
      src/main/frontend/components/sidebar.css

+ 7 - 15
src/main/frontend/components/sidebar.cljs

@@ -417,21 +417,13 @@
                                          (if white? "#f0f8ff" "#073642"))}}
              (when (state/sub :ui/left-sidebar-open?)
                (sidebar-nav route-match nil))])
-          [:div.flex.#main-content-container.justify-center
-           {:class (if global-graph-pages?
-                     "initial"
-                     (util/hiccup->class ".mx-6.my-12"))
-            :style {:position "relative"
-                    :flex "1 1 65%"
-                    :width "100vw"}}
-           [:div.flex-1
-            {:style (cond->
-                     {:max-width 640}
-                      (or global-graph-pages?
-                          (and (not logged?)
-                               home?)
-                          (contains? #{:all-files :all-pages} route-name))
-                      (dissoc :max-width))}
+          [:div#main-content-container.cp__sidebar-main-content-container
+           [:div.cp__sidebar-main-content
+            {:data-is-global-graph-pages global-graph-pages?
+             :data-is-full-width (or global-graph-pages?
+                                  (and (not logged?)
+                                       home?)
+                                  (contains? #{:all-files :all-pages} route-name))}
             (cond
               (not indexeddb-support?)
               nil

+ 24 - 0
src/main/frontend/components/sidebar.css

@@ -0,0 +1,24 @@
+.cp__sidebar-main-content-container {
+    position: relative;
+    flex: 1 1 65%;
+}
+
+.cp__sidebar-main-content {
+    padding: 3rem 1.5rem;
+    margin: 0 auto;
+    max-width: 640px;
+}
+
+@media (max-width: 640px) {
+    .cp__sidebar-main-content {
+        max-width: 100vw;
+    }
+}
+
+.cp__sidebar-main-content[data-is-full-width="true"] {
+    max-width: 100vw;
+}
+
+.cp__sidebar-main-content[data-is-global-graph-pages="true"] {
+    padding: 0;
+}