소스 검색

fix: property value alignment

Tienson Qin 1 년 전
부모
커밋
170e8bbc15
3개의 변경된 파일25개의 추가작업 그리고 18개의 파일을 삭제
  1. 1 1
      src/main/frontend/components/db_based/page.cljs
  2. 12 15
      src/main/frontend/components/property.cljs
  3. 12 2
      src/main/frontend/components/property.css

+ 1 - 1
src/main/frontend/components/db_based/page.cljs

@@ -157,7 +157,7 @@
         (if collapsed?
         (if collapsed?
           (when (or (seq (:block/properties page))
           (when (or (seq (:block/properties page))
                     (and class? (seq (:class/schema.properties page))))
                     (and class? (seq (:class/schema.properties page))))
-            [:div.px-2 {:style {:margin-left 2}}
+            [:div {:style {:margin-left 5}}
              (page-properties page {:mode @*mode})])
              (page-properties page {:mode @*mode})])
           [:div.px-3
           [:div.px-3
            (page-configure page *mode)])]])))
            (page-configure page *mode)])]])))

+ 12 - 15
src/main/frontend/components/property.cljs

@@ -613,17 +613,14 @@
     (when-let [property (db/sub-block (:db/id (db/entity k)))]
     (when-let [property (db/sub-block (:db/id (db/entity k)))]
       (let [type (get-in property [:block/schema :type] :default)
       (let [type (get-in property [:block/schema :type] :default)
             closed-values? (seq (:property/closed-values property))
             closed-values? (seq (:property/closed-values property))
-            v-block (when (integer? v) (db/entity v))
-            block? (and v-block
+            block? (and v
                         (not closed-values?)
                         (not closed-values?)
-                        (:block/page v-block)
+                        (:block/page v)
                         (contains? #{:default :template} type))
                         (contains? #{:default :template} type))
             collapsed? (when block? (property-collapsed? block property))
             collapsed? (when block? (property-collapsed? block property))
             date? (= type :date)
             date? (= type :date)
             checkbox? (= type :checkbox)]
             checkbox? (= type :checkbox)]
         [:div {:class (cond
         [:div {:class (cond
-                        (and block? (not closed-values?))
-                        "flex flex-1 flex-col gap-1 property-block"
                         (or date? checkbox?)
                         (or date? checkbox?)
                         "property-pair items-center"
                         "property-pair items-center"
                         :else
                         :else
@@ -634,16 +631,16 @@
                                               :collapsed? collapsed?
                                               :collapsed? collapsed?
                                               :inline-text inline-text
                                               :inline-text inline-text
                                               :page-cp page-cp))]
                                               :page-cp page-cp))]
-         (if (and (:class-schema? opts) (:page-configure? opts))
-           [:div.property-description.text-sm.opacity-70
-            {:class "col-span-3"}
-            (inline-text {} :markdown (get-in property [:block/schema :description]))]
-           (when-not collapsed?
-             [:div.property-value
-              {:class (if block?
-                        "block-property-value"
-                        "col-span-3 inline-grid")}
-              (pv/property-value block property v opts)]))]))))
+         [:div.property-value-container.col-span-3.flex.flex-row.gap-1.items-center
+          (when-not block? [:div.opacity-75 {:style {:margin-left 5}}
+                            [:span.bullet-container.cursor [:span.bullet]]])
+          [:div.flex.flex-1
+           (if (and (:class-schema? opts) (:page-configure? opts))
+             [:div.property-description.text-sm.opacity-70
+              (inline-text {} :markdown (get-in property [:block/schema :description]))]
+             (when-not collapsed?
+               [:div.property-value.flex.flex-1
+                (pv/property-value block property v opts)]))]]]))))
 
 
 (rum/defcs ordered-properties < rum/reactive
 (rum/defcs ordered-properties < rum/reactive
   {:init (fn [state]
   {:init (fn [state]

+ 12 - 2
src/main/frontend/components/property.css

@@ -43,8 +43,12 @@
     grid-template-columns: repeat(auto-fit, 120px);
     grid-template-columns: repeat(auto-fit, 120px);
 }
 }
 
 
+.ls-block .ls-properties-area {
+    margin-top: 2px;
+}
+
 .ls-properties-area {
 .ls-properties-area {
-    @apply grid gap-1;
+    @apply grid;
 
 
     .property-pair {
     .property-pair {
         @apply grid grid-cols-5 gap-1;
         @apply grid grid-cols-5 gap-1;
@@ -235,9 +239,15 @@ a.control-link {
     }
     }
 }
 }
 
 
-.ls-page-properties .property-key, .ls-properties-area .property-key {
+.property-value-container {
+    min-height: 29px;
+}
+
+.ls-page-properties .property-key, .ls-properties-area .property-key
+{
     @apply flex flex-col justify-center;
     @apply flex flex-col justify-center;
 }
 }
+
 .property-key {
 .property-key {
     /* Same height with one-line block container */
     /* Same height with one-line block container */
     min-height: 29px;
     min-height: 29px;