Просмотр исходного кода

Merge branch 'test/db' into feat/db

Tienson Qin 1 год назад
Родитель
Сommit
21a4df559c
2 измененных файлов с 2 добавлено и 3 удалено
  1. 0 1
      src/main/frontend/components/container.css
  2. 2 2
      src/main/frontend/components/icon.cljs

+ 0 - 1
src/main/frontend/components/container.css

@@ -130,7 +130,6 @@
 
 
     width: 20px;
     width: 20px;
     flex-shrink: 0;
     flex-shrink: 0;
-    height: 18px;
     line-height: 1em;
     line-height: 1em;
   }
   }
 
 

+ 2 - 2
src/main/frontend/components/icon.cljs

@@ -63,9 +63,9 @@
   (let [opts' (merge {:size 14} opts)
   (let [opts' (merge {:size 14} opts)
         node-icon (get-node-icon node-entity)]
         node-icon (get-node-icon node-entity)]
     (when-not (or (string/blank? node-icon) (and (contains? #{"letter-n" "page"} node-icon) (:not-text-or-page? opts)))
     (when-not (or (string/blank? node-icon) (and (contains? #{"letter-n" "page"} node-icon) (:not-text-or-page? opts)))
-      [:span.icon-cp-container
+      [:div.icon-cp-container.flex.items-center
        (merge {:style {:color (or (:color node-icon) "inherit")}}
        (merge {:style {:color (or (:color node-icon) "inherit")}}
-         (select-keys opts [:class]))
+              (select-keys opts [:class]))
        (icon node-icon opts')])))
        (icon node-icon opts')])))
 
 
 (defn- search-emojis
 (defn- search-emojis