chore(release): 1.26.0 [skip ci]

# [1.26.0](v1.25.0...v1.26.0) (2022-04-29) ### Bug Fixes * #main-container min height ([4623f47](4623f47)) * block content sometimes overflow ([61ee122](61ee122)) * build is missing no_bullet_threading.css ([5b4a2b1](5b4a2b1)) * dates in date picker is not visible ([6cede63](6cede63)), closes [pengx17#50](https://github.com/zhengyu-yang/logseq-dev-theme/issues/50) * default active threading color ([2aa32d1](2aa32d1)) * edit layout shift issue ([8926098](8926098)) * fix previous not properly ([a12e47e](a12e47e)) * journal load issue ([20498fd](20498fd)) * multiline threading sometimes got covered ([4c8067c](4c8067c)) * query border is not shown ([b5b61e4](b5b61e4)) * remove backdrop-filter for headers ([45788a6](45788a6)) * remove large padding ([326d306](326d306)) * solid left border in doc mod ([c94113b](c94113b)) ### Features * allow users to overwrite the threading color in plugin ([218a1d8](218a1d8))
zhengyu-yang · Apr 29, 2022 · 5221cbb · 5221cbb
1 parent 51f8922
commit 5221cbb
Show file tree

Hide file tree

Showing 4 changed files with 102 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,27 @@
+# [1.26.0](https://github.com/zhengyu-yang/logseq-dev-theme/compare/v1.25.0...v1.26.0) (2022-04-29)
+
+
+### Bug Fixes
+
+* #main-container min height ([4623f47](https://github.com/zhengyu-yang/logseq-dev-theme/commit/4623f4781778de591154e7c1028188baa1d86814))
+* block content sometimes overflow ([61ee122](https://github.com/zhengyu-yang/logseq-dev-theme/commit/61ee1222515088a95d503aa478bb17e79aec14fd))
+* build is missing no_bullet_threading.css ([5b4a2b1](https://github.com/zhengyu-yang/logseq-dev-theme/commit/5b4a2b15db66edee5d9816a190d68d444f0978b9))
+* dates in date picker is not visible ([6cede63](https://github.com/zhengyu-yang/logseq-dev-theme/commit/6cede636f8b3ee42e649b4439a95dc456af75c94)), closes [#50](https://github.com/zhengyu-yang/logseq-dev-theme/issues/50)
+* default active threading color ([2aa32d1](https://github.com/zhengyu-yang/logseq-dev-theme/commit/2aa32d16b4330e77966b9a8350b013f04b200126))
+* edit layout shift issue ([8926098](https://github.com/zhengyu-yang/logseq-dev-theme/commit/89260981146c545c25dab5d38e98367c1d87dfe1))
+* fix previous not properly ([a12e47e](https://github.com/zhengyu-yang/logseq-dev-theme/commit/a12e47e3f66f5a8ba94ad7e7f2415042147584ea))
+* journal load issue ([20498fd](https://github.com/zhengyu-yang/logseq-dev-theme/commit/20498fdda9a651dfca535ac172f1fd2b3d864f78))
+* multiline threading sometimes got covered ([4c8067c](https://github.com/zhengyu-yang/logseq-dev-theme/commit/4c8067c7ed88dd18234dae9ef9841bfef625fa24))
+* query border is not shown ([b5b61e4](https://github.com/zhengyu-yang/logseq-dev-theme/commit/b5b61e4d8e9d7166da90be6069dffc47ebb0d24a))
+* remove backdrop-filter for headers ([45788a6](https://github.com/zhengyu-yang/logseq-dev-theme/commit/45788a6f9b87655eefba60f7635d115f84c4ce3c))
+* remove large padding ([326d306](https://github.com/zhengyu-yang/logseq-dev-theme/commit/326d306ed1361b306895a2b44803893ce88b0931))
+* solid left border in doc mod ([c94113b](https://github.com/zhengyu-yang/logseq-dev-theme/commit/c94113bd8acb6ff9443e53a6cbdf301bba036722))
+
+
+### Features
+
+* allow users to overwrite the threading color in plugin ([218a1d8](https://github.com/zhengyu-yang/logseq-dev-theme/commit/218a1d86d8bdde7e7d865ba28d7346e13228abec))
+
 ## [1.26.1](https://github.com/pengx17/logseq-dev-theme/compare/v1.26.0...v1.26.1) (2022-04-27)
 
 

diff --git a/custom.css b/custom.css
@@ -524,9 +524,16 @@ a.title h1.title {
   border-left-width: 0px !important;
 }
 
+/* @import "bullet_threading.scss"; */
 :root {
   --ct-bullet-size: 6px;
   --ct-block-max-width: calc(100% - 38px);
+  --ct-bullet-color: #4d4d4d;
+  --ct-bullet-closed-color: #8e8e8e;
+  --ct-guideline-color: #cacaca;
+  --ct-guideline-size: 1px;
+  --ct-guideline-style: solid;
+  --ls-block-bullet-active-color: var(--ls-link-text-color);
 }
 
 /* block reference */
@@ -583,34 +590,83 @@ a:hover > .bullet-container .bullet {
   opacity: 1;
 }
 
+/* ======================================= */
+/* from bullet_threading.scss              */
+/* remove drifting of blocks               */
+.ls-block div.items-center {
+  position: relative;
+  height: 26px !important;
+}
+
+/* ======================================= */
+/* ======================================= */
+/* from logseq-laurel-theme                */
+/* vertical lines and bullets highlights   */
+.block-children {
+  border-left: var(--ct-guideline-size) var(--ct-guideline-style) var(--ct-guideline-color);
+}
+
+.block-children:focus-within {
+  border-color: var(--ct-page-reference-color);
+}
+
+/*=============================================================================================================================
+==== highlight current path by cannnibalox v0.2 https://discuss.logseq.com/t/css-highlights-current-path-bullets-color/371 ====
+=============================================================================================================================*/
+.ls-block .bullet {
+  background-color: var(--ct-page-reference-color);
+  box-shadow: 0 0 0 2px var(--ct-background), 0 0 0 3px var(--ct-page-reference-color);
+}
+
+.ls-block:not(:focus-within) .bullet {
+  background-color: var(--ct-bullet-color);
+  box-shadow: none;
+}
+
+.block-children-container {
+  position: relative;
+}
+
+.block-children-left-border {
+  z-index: 10;
+  position: absolute;
+  height: 100%;
+  width: 4px;
+  padding-right: 0px;
+  border-radius: 2px;
+  background-color: transparent;
+  left: -1px;
+  transition: background-color 0.2s;
+}
+
+.block-children-left-border:hover {
+  background-color: var(--ls-block-bullet-active-color);
+}
+
+/* ======================================= */
 .block-control svg {
   color: var(--ct-block-arrow-color);
 }
 
+/* remove the shadow of the block controller */
+/*
 .block-control:hover svg {
   filter: drop-shadow(2px 4px 6px black);
 }
-
+*/
+/* remove the shadow of the block controller */
 .block-control .rotating-arrow {
   display: block;
-  border-radius: 50%;
-  background-color: var(--ls-primary-background-color);
   width: 1rem;
   height: 1rem;
   margin-left: 2px;
   margin-top: 2px;
-  box-shadow: 0 0 4px 2px var(--ls-primary-background-color);
 }
 
 .block-control .rotating-arrow > svg {
   margin-left: 0 !important;
 }
 
-.ls-block div.items-center {
-  position: relative;
-  height: 26px !important;
-}
-
 .block-content-wrapper > div > .block-content > span > span > :first-child {
   position: relative;
 }
@@ -658,11 +714,13 @@ a:hover > .bullet-container .bullet {
   transition: all ease-in 0.3s;
 }
 
+/* remove animation of embedding blocks */
+/*
 :is(.embed, .embed-page, .embed-block):is(:hover, :focus-within) {
-  box-shadow: 8px 8px black;
+  box-shadow: 8px 8px rgba(0, 0, 0);
   transform: translate(-7px, -6px);
 }
-
+*/
 /* page embed */
 .embed-page,
 .cp__right-sidebar .embed-page {

diff --git a/no_bullet_threading.css b/no_bullet_threading.css
@@ -375,9 +375,16 @@ a.title h1.title {
   content: "h5";
 }
 
+/* @import "bullet_threading.scss"; */
 :root {
   --ct-bullet-size: 6px;
   --ct-block-max-width: calc(100% - 38px);
+  --ct-bullet-color: #4d4d4d;
+  --ct-bullet-closed-color: #8e8e8e;
+  --ct-guideline-color: #cacaca;
+  --ct-guideline-size: 1px;
+  --ct-guideline-style: solid;
+  --ls-block-bullet-active-color: var(--ls-link-text-color);
 }
 
 /* block reference */
@@ -498,32 +505,19 @@ a:hover > .bullet-container .bullet {
   filter: drop-shadow(2px 4px 6px black);
 }
 */
-
 /* remove the shadow of the block controller */
 .block-control .rotating-arrow {
   display: block;
-  /*
-  border-radius: 50%;
-  background-color: var(--ls-primary-background-color);
-  */
   width: 1rem;
   height: 1rem;
   margin-left: 2px;
   margin-top: 2px;
-  /*
-  box-shadow: 0 0 4px 2px var(--ls-primary-background-color);
-  */
 }
 
 .block-control .rotating-arrow > svg {
   margin-left: 0 !important;
 }
 
-.ls-block div.items-center {
-  position: relative;
-  height: 26px !important;
-}
-
 .block-content-wrapper > div > .block-content > span > span > :first-child {
   position: relative;
 }
@@ -574,11 +568,10 @@ a:hover > .bullet-container .bullet {
 /* remove animation of embedding blocks */
 /*
 :is(.embed, .embed-page, .embed-block):is(:hover, :focus-within) {
-  box-shadow: 8px 8px black;
+  box-shadow: 8px 8px rgba(0, 0, 0);
   transform: translate(-7px, -6px);
 }
 */
-
 /* page embed */
 .embed-page,
 .cp__right-sidebar .embed-page {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "logseq-dev-theme",
   "author": "pengx17",
-  "version": "1.26.1",
+  "version": "1.26.0",
   "description": "A custom theme for dev",
   "logseq": {
     "themes": [