Merge branch 'master' into feat/light-theme

resources/css/common.css

@@ -31,6 +31,7 @@
     --ls-link-ref-text-hover-color: var(--ls-link-text-hover-color);
         --ls-tag-text-color: var(--ls-link-text-color);
         --ls-tag-text-hover-color: var(--ls-link-text-hover-color);
+        --ls-slide-background-color: var(--ls-primary-background-color);
 
     --ls-block-bullet-border-color: #0f4958;
     --ls-block-bullet-color: #608e91;
@@ -79,6 +80,7 @@
     --ls-link-ref-text-hover-color: var(--ls-link-text-hover-color);
 	  --ls-tag-text-color: var(--ls-link-text-color);
 	  --ls-tag-text-hover-color: var(--ls-link-text-hover-color);
+    --ls-slide-background-color: #002b36;
 
     --ls-block-bullet-border-color: #afcabe;
     --ls-block-bullet-color: #394b59;
@@ -1415,3 +1417,15 @@ a.tag:hover {
 .right {
     float: right;
 }
+
+.reveal {
+    background: var(--ls-slide-background-color);
+}
+
+#right-sidebar .reveal pre.code {
+    background: transparent;
+}
+
+.reveal .hljs {
+    background: none;
+}

src/main/frontend/components/block.cljs

@@ -997,9 +997,19 @@
 (defn- pre-block-cp
   [config content format]
   (let [ast (mldoc/->edn content (mldoc/default-config format))
-        ast (map first ast)]
-    [:div.pre-block.bg-base-2.p-2
-     (markup-elements-cp (assoc config :block/format format) ast)]))
+        ast (map first ast)
+        slide? (:slide? config)
+        only-title? (and (= 1 (count ast))
+                         (= "Properties" (ffirst ast))
+                         (let [m (second (first ast))]
+                           (= (keys m) [:title])))
+        block-cp [:div.pre-block.bg-base-2.p-2
+                  (markup-elements-cp (assoc config :block/format format) ast)]]
+    (if slide?
+      [:div [:h1 (:page-name config)]
+       (when-not only-title?
+         block-cp)]
+      block-cp)))
 
 (rum/defc properties-cp
   [block]
@@ -1114,7 +1124,8 @@
 
       (when (and (seq properties)
                  (let [hidden? (text/properties-hidden? properties)]
-                   (not hidden?)))
+                   (not hidden?))
+                 (not (:slide? config)))
         (properties-cp block))
 
       (when (and (not pre-block?) (seq body))
@@ -1649,10 +1660,12 @@
 
           :else
           (let [language (if (contains? #{"edn" "clj" "cljc" "cljs" "clojure"} language) "text/x-clojure" language)]
-            [:div
-             (lazy-editor/editor config (str (dc/squuid)) attr code pos_meta)
-             (when (and (= language "text/x-clojure") (contains? (set options) ":results"))
-               (sci/eval-result code))])))
+            (if (:slide? config)
+              (highlight/highlight (str (medley/random-uuid)) {:data-lang language} code)
+              [:div
+               (lazy-editor/editor config (str (dc/squuid)) attr code pos_meta)
+               (when (and (= language "text/x-clojure") (contains? (set options) ":results"))
+                 (sci/eval-result code))]))))
       ["Quote" l]
       (->elem
        :blockquote

src/main/frontend/components/right_sidebar.cljs

@@ -151,7 +151,8 @@
           sections (block/build-slide-sections blocks {:id "slide-reveal-js"
                                                        :start-level 2
                                                        :slide? true
-                                                       :sidebar? true})]
+                                                       :sidebar? true
+                                                       :page-name page-name})]
       [[:a {:href (str "/page/" (util/url-encode page-name))}
         (util/capitalize-all page-name)]
        [:div.ml-2.slide.mt-2

src/main/frontend/handler/editor.cljs

@@ -1353,7 +1353,11 @@
         (when (and block value db-content-without-heading
                    (not= (string/trim db-content-without-heading)
                          (string/trim value)))
-          (save-block-aux! block value (:block/format block)))))))
+          (let [cur-pos (util/get-input-pos elem)]
+            (save-block-aux! block value (:block/format block))
+            ;; Restore the cursor after saving the block
+            (when (and elem cur-pos)
+              (util/set-caret-pos! elem cur-pos))))))))
 
 (defn on-up-down
   [state e up?]

src/main/frontend/state.cljs

@@ -549,7 +549,12 @@
                           expires-at (->> (t/plus (t/now) (t/minutes 40))
                                           (tf/unparse formatter))]
                       (merge repo {:token token :expires_at expires-at}))
-                    (do (log/error :token/cannot-set-token {:repo-m repo :token-m m}) repo))))
+                    (do
+                      (when (and
+                             (:url repo)
+                             (string/starts-with? (:url repo) "https://"))
+                        (log/error :token/cannot-set-token {:repo-m repo :token-m m}))
+                      repo))))
               repos (mapv set-token-f repos)]
           (swap! state assoc-in [:me :repos] repos))))))
 

src/main/frontend/text.cljs

@@ -124,8 +124,8 @@
           (string/starts-with? content' (string/lower-case properties-text)))
          (and (contains-properties? content)
               ;; not changed
-              (= (:block/properties (db/entity [:block/uuid (:block/uuid block)]))
-                 properties)))
+              (= (seq (:block/properties (db/entity [:block/uuid (:block/uuid block)])))
+                 (seq properties))))
       content
       (-> (remove-properties! content)
           (rejoin-properties properties)))))

src/main/frontend/tools/html_export.cljs

@@ -40,7 +40,8 @@
                                                                 (merge
                                                                  config
                                                                  {:id "slide"
-                                                                  :start-level 2})
+                                                                  :start-level 2
+                                                                  :page-name page-name})
                                                                 build-block)]
                        (slide/slide-content false "" sections))
                      [:div.page