Browse Source

fix: some style enhancements to block-control (#3742)

Co-authored-by: Andelf <[email protected]>
Peng Xiao 4 years ago
parent
commit
35b7f71254

+ 1 - 1
src/main/frontend/components/block.cljs

@@ -1451,7 +1451,7 @@
                        (if collapsed?
                        (if collapsed?
                          (editor-handler/expand-block! uuid)
                          (editor-handler/expand-block! uuid)
                          (editor-handler/collapse-block! uuid)))))}
                          (editor-handler/collapse-block! uuid)))))}
-      [:span {:class (if control-show? "control-show" "control-hide")}
+      [:span {:class (if control-show? "control-show cursor-pointer" "control-hide")}
        (ui/rotating-arrow collapsed?)]]
        (ui/rotating-arrow collapsed?)]]
      (let [bullet [:a {:on-click (fn [event]
      (let [bullet [:a {:on-click (fn [event]
                                    (bullet-on-click event block uuid))}
                                    (bullet-on-click event block uuid))}

+ 16 - 5
src/main/frontend/components/block.css

@@ -133,20 +133,31 @@
   }
   }
 }
 }
 
 
+.block-children-container {
+  position: relative;
+}
+
 .block-children-left-border {
 .block-children-left-border {
-  width: 3px;
-  padding-right: 2px;
+  z-index: 1;
+  width: 4px;
+  left: -1px;
+  top: 0;
+  height: 100%;
   cursor: pointer;
   cursor: pointer;
   background-clip: content-box;
   background-clip: content-box;
-  background-color: var(--ls-guideline-color, #ddd);
+  background-color: transparent;
+  position: absolute;
+  border-radius: 2px;
 }
 }
 
 
 .block-children-left-border:hover {
 .block-children-left-border:hover {
-  padding-right: 0px;
   background-color: var(--ls-primary-text-color);
   background-color: var(--ls-primary-text-color);
 }
 }
 
 
 .block-children {
 .block-children {
+  border-left: 1px solid;
+  border-left-color: var(--ls-guideline-color, #ddd);
+
   padding-top: 2px;
   padding-top: 2px;
   padding-bottom: 3px;
   padding-bottom: 3px;
 
 
@@ -159,7 +170,7 @@
 
 
 .block-control, .block-control:hover {
 .block-control, .block-control:hover {
   text-decoration: none;
   text-decoration: none;
-  cursor: pointer;
+  cursor: default;
   font-size: 14px;
   font-size: 14px;
   min-width: 22px;
   min-width: 22px;
   min-height: 22px;
   min-height: 22px;

+ 1 - 1
src/main/frontend/ui.cljs

@@ -689,7 +689,7 @@
                            :margin-left -30}}
                            :margin-left -30}}
              (not title-trigger?)
              (not title-trigger?)
              (assoc :on-mouse-down on-mouse-down))
              (assoc :on-mouse-down on-mouse-down))
-           [:span {:class (if @control? "control-show" "control-hide")}
+           [:span {:class (if @control? "control-show cursor-pointer" "control-hide")}
             (rotating-arrow @collapsed?)]])
             (rotating-arrow @collapsed?)]])
         (if (fn? header)
         (if (fn? header)
           (header @collapsed?)
           (header @collapsed?)