chore(release): 1.20.2 [skip ci]

## [1.20.2](v1.20.1...v1.20.2) (2021-08-12) ### Bug Fixes * code cleanup ([49e9cbd](49e9cbd))
pengx17 · Aug 12, 2021 · 68ae670 · 68ae670
1 parent 49e9cbd
commit 68ae670
Show file tree

Hide file tree

Showing 4 changed files with 118 additions and 144 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [1.20.2](https://github.com/pengx17/logseq-dev-theme/compare/v1.20.1...v1.20.2) (2021-08-12)
+
+
+### Bug Fixes
+
+* code cleanup ([49e9cbd](https://github.com/pengx17/logseq-dev-theme/commit/49e9cbde05c2d425c62b1e4237e65e50789c1b49))
+
 ## [1.20.1](https://github.com/pengx17/logseq-dev-theme/compare/v1.20.0...v1.20.1) (2021-08-11)
 
 

diff --git a/bullet_threading.css b/bullet_threading.css
@@ -30,6 +30,7 @@
 }
 .ls-block .bullet {
   background-color: var(--ls-block-bullet-active-color);
+  box-shadow: 0 0 0 1px var(--ls-block-bullet-active-color);
 }
 .ls-block div.items-center {
   position: relative;
@@ -38,6 +39,7 @@
 .ls-block:not(:focus-within) .bullet {
   background-color: var(--ls-block-bullet-color);
   transform: scale(1);
+  box-shadow: none;
 }
 .ls-block .ls-block > div > div.items-center::before {
   pointer-events: none;

diff --git a/custom.css b/custom.css
@@ -351,10 +351,106 @@ a.title h1.title {
   margin: 0.3em 0 0;
 }
 
+:root {
+  --ls-block-bullet-active-color: var(--ls-link-text-color);
+  --ls-block-bullet-threading-width: 1px;
+}
+
+.block-control {
+  z-index: 1;
+}
+
+.block-children {
+  border-left-width: var(--ls-block-bullet-threading-width);
+}
+
+.block-content-wrapper {
+  position: relative;
+}
+
+.bullet-container {
+  height: 14px !important;
+  width: 14px !important;
+  position: relative;
+  transform: translateX(-1.5px);
+}
+
+/* Block bullet path should only show in a nested block */
+.ls-block {
+  /* Basic "curve" */
+  /* Fix for headings like h1, h2 etc */
+  /* Fix multi-line blocks with children */
+}
+.ls-block .bullet {
+  background-color: var(--ls-block-bullet-active-color);
+  box-shadow: 0 0 0 1px var(--ls-block-bullet-active-color);
+}
+.ls-block div.items-center {
+  position: relative;
+  height: 26px !important;
+}
+.ls-block:not(:focus-within) .bullet {
+  background-color: var(--ls-block-bullet-color);
+  transform: scale(1);
+  box-shadow: none;
+}
+.ls-block .ls-block > div > div.items-center::before {
+  pointer-events: none;
+  content: "";
+  left: calc(var(--ls-block-bullet-threading-width) * -1);
+  right: 6px;
+  top: calc(-50% + var(--ls-block-bullet-threading-width) * 0.5 - 1px);
+  bottom: 50%;
+  /* shift left 1px for border */
+  position: absolute;
+  border-left: var(--ls-block-bullet-threading-width) solid transparent;
+  border-bottom: var(--ls-block-bullet-threading-width) solid transparent;
+  border-bottom-left-radius: 10px;
+}
+.ls-block .ls-block:focus-within > div > div.items-center::before {
+  border-color: var(--ls-block-bullet-active-color);
+}
+.ls-block .block-children > .ls-block::before {
+  pointer-events: none;
+  content: "";
+  top: -1rem;
+  bottom: 0;
+  border-left: var(--ls-block-bullet-threading-width) solid transparent;
+  left: calc(var(--ls-block-bullet-threading-width) * -1);
+  position: absolute;
+}
+.ls-block .block-children:focus-within > .ls-block:not(:focus-within)::before {
+  border-color: var(--ls-block-bullet-active-color);
+}
+.ls-block .block-children:focus-within > .ls-block:focus-within ~ .ls-block::before {
+  border-color: transparent;
+}
+.ls-block > .items-baseline {
+  align-items: initial;
+}
+.ls-block[haschild=true] > div > .block-content-wrapper::before {
+  pointer-events: none;
+  content: "";
+  top: 12px;
+  bottom: 0;
+  left: -17px;
+  position: absolute;
+  border-left: var(--ls-block-bullet-threading-width) solid transparent;
+}
+.ls-block[haschild=true]:focus-within > div > .block-content-wrapper::before {
+  border-color: var(--ls-block-bullet-active-color);
+}
+
+/* Disable for doc mode */
+.doc-mode div.items-center::before,
+.doc-mode div.items-center::after,
+.doc-mode .ls-block::before,
+.doc-mode .ls-block::after {
+  display: none;
+}
+
 :root {
   --ct-bullet-size: 6px;
-  --ct-bullet-color: var(--ct-bold-color);
-  --ct-bullet-active-color: var(--ls-active-primary-color);
   --ct-block-max-width: calc(100% - 38px);
 }
 
@@ -400,18 +496,13 @@ a.title h1.title {
 .bullet-container .bullet {
   width: var(--ct-bullet-size);
   height: var(--ct-bullet-size);
-  background-color: var(--ct-bullet-color);
   transform: scale(1.2);
 }
 
 a:hover > .bullet-container .bullet {
   opacity: 1;
 }
 
-.bullet-container.bullet-closed {
-  background-color: var(--ct-bullet-closed-color);
-}
-
 .block-control svg {
   color: var(--ct-block-arrow-color);
 }
@@ -420,18 +511,6 @@ a:hover > .bullet-container .bullet {
   filter: drop-shadow(2px 4px 6px black);
 }
 
-.ls-block .bullet {
-  background-color: var(--ct-bullet-active-color);
-  box-shadow: 0 0 0 1px var(--ct-bullet-active-color);
-}
-
-.ls-block:not(:focus-within) .bullet {
-  background-color: var(--ct-bullet-color);
-  box-shadow: none;
-  opacity: 0.3;
-  transform: scale(1);
-}
-
 .block-content-wrapper > div > .block-content > span > span > :first-child {
   position: relative;
 }
@@ -467,102 +546,6 @@ a:hover > .bullet-container .bullet {
   max-width: -webkit-fill-available;
 }
 
-:root {
-  --ls-block-bullet-active-color: var(--ls-link-text-color);
-  --ls-block-bullet-threading-width: 1px;
-}
-
-.block-control {
-  z-index: 1;
-}
-
-.block-children {
-  border-left-width: var(--ls-block-bullet-threading-width);
-}
-
-.block-content-wrapper {
-  position: relative;
-}
-
-.bullet-container {
-  height: 14px !important;
-  width: 14px !important;
-  position: relative;
-  transform: translateX(-1.5px);
-}
-
-/* Block bullet path should only show in a nested block */
-.ls-block {
-  /* Basic "curve" */
-  /* Fix for headings like h1, h2 etc */
-  /* Fix multi-line blocks with children */
-}
-.ls-block .bullet {
-  background-color: var(--ls-block-bullet-active-color);
-}
-.ls-block div.items-center {
-  position: relative;
-  height: 26px !important;
-}
-.ls-block:not(:focus-within) .bullet {
-  background-color: var(--ls-block-bullet-color);
-  transform: scale(1);
-}
-.ls-block .ls-block > div > div.items-center::before {
-  pointer-events: none;
-  content: "";
-  left: calc(var(--ls-block-bullet-threading-width) * -1);
-  right: 6px;
-  top: calc(-50% + var(--ls-block-bullet-threading-width) * 0.5 - 1px);
-  bottom: 50%;
-  /* shift left 1px for border */
-  position: absolute;
-  border-left: var(--ls-block-bullet-threading-width) solid transparent;
-  border-bottom: var(--ls-block-bullet-threading-width) solid transparent;
-  border-bottom-left-radius: 10px;
-}
-.ls-block .ls-block:focus-within > div > div.items-center::before {
-  border-color: var(--ls-block-bullet-active-color);
-}
-.ls-block .block-children > .ls-block::before {
-  pointer-events: none;
-  content: "";
-  top: -1rem;
-  bottom: 0;
-  border-left: var(--ls-block-bullet-threading-width) solid transparent;
-  left: calc(var(--ls-block-bullet-threading-width) * -1);
-  position: absolute;
-}
-.ls-block .block-children:focus-within > .ls-block:not(:focus-within)::before {
-  border-color: var(--ls-block-bullet-active-color);
-}
-.ls-block .block-children:focus-within > .ls-block:focus-within ~ .ls-block::before {
-  border-color: transparent;
-}
-.ls-block > .items-baseline {
-  align-items: initial;
-}
-.ls-block[haschild=true] > div > .block-content-wrapper::before {
-  pointer-events: none;
-  content: "";
-  top: 12px;
-  bottom: 0;
-  left: -17px;
-  position: absolute;
-  border-left: var(--ls-block-bullet-threading-width) solid transparent;
-}
-.ls-block[haschild=true]:focus-within > div > .block-content-wrapper::before {
-  border-color: var(--ls-block-bullet-active-color);
-}
-
-/* Disable for doc mode */
-.doc-mode div.items-center::before,
-.doc-mode div.items-center::after,
-.doc-mode .ls-block::before,
-.doc-mode .ls-block::after {
-  display: none;
-}
-
 /* embed */
 .embed,
 .embed-page,
@@ -715,19 +698,6 @@ a.tag:hover {
   background: var(--ls-tertiary-background-color);
 }
 
-kbd {
-  display: inline-block;
-  padding: 3px 5px;
-  line-height: 10px;
-  vertical-align: middle;
-  background-color: var(--ct-kbd-bg-color);
-  border-bottom-color: var(--ct-kbd-border-color);
-  border: 1px solid var(--ct-kbd-border-color);
-  border-radius: 6px;
-  box-shadow: inset 0 -1px 0 var(--ct-kbd-border-color);
-  font-size: 0.8em;
-}
-
 /* Progress bar */
 progress {
   vertical-align: middle;
@@ -838,7 +808,7 @@ progress::-webkit-progress-value {
 }
 
 :root {
-  --ct-query-header-color: #fff;
+  --ct-query-header-color: var(--ls-primary-background-color);
   --ct-query-header-background: var(--ct-primary-color);
 }
 
@@ -863,18 +833,13 @@ progress::-webkit-progress-value {
 :not(.dsl-query) > .custom-query .custom-query-title {
   display: inline-block;
   opacity: 1;
-  padding: 5px 10px 2px 10px !important;
+  padding: 2px 10px !important;
   background: var(--ct-query-header-background);
   color: var(--ct-query-header-color);
   font-family: var(--ct-code-font-family);
   font-size: var(--ct-inline-code-font-size);
   font-style: var(--ct-inline-code-font-style) !important;
   border-radius: var(--ct-inline-code-border-radius);
-  text-shadow: 1px 1px 0px black, 1px 1px 1px #888888;
-}
-
-:not(.dsl-query):not(#today-queries) > .custom-query .custom-query-title {
-  margin-bottom: 1.5em;
 }
 
 :not(.dsl-query) > .custom-query .custom-query-title > .flex-row {
@@ -1053,23 +1018,23 @@ html[data-theme=dark] {
   --ls-primary-text-color: rgb(235, 235, 235);
   --ls-secondary-text-color: rgb(200, 200, 200);
   --ct-bold-color: #fff;
-  --ct-bold-color-transparent: rgba(255, 255, 255, 0.3);
   --ls-link-text-color: var(--ct-primary-color);
   --ls-link-ref-text-color: var(--ct-primary-color);
   --ls-link-ref-text-hover-color: var(--ct-secondary-color);
   --ls-active-primary-color: var(--ct-primary-color);
   --ls-active-secondary-color: var(--ct-secondary-color);
   --ls-external-link-color: var(--ct-secondary-color);
-  --ct-bullet-closed-color: #555;
+  --ls-guideline-color: var(--ls-tertiary-background-color);
+  --ls-block-bullet-color: var(--ls-tertiary-background-color);
+  --ls-bullet-closed-color: var(--ls-secondary-text-color);
+  --ls-block-bullet-border-color: var(--ls-quaternary-background-color);
   --ct-block-arrow-color: rgb(165, 165, 165);
   --ct-page-reference-color: var(--ls-active-primary-color);
   --ls-icon-color: var(--ls-primary-text-color);
   --ct-block-reference-background: rgba(16, 107, 163, 0.2);
   --ct-block-reference-background-hover: rgba(16, 107, 163, 0.3);
   --ls-page-properties-background-color: var(--ls-tertiary-background-color);
   --ls-scrollbar-foreground-color: var(--ls-secondary-background-color);
-  --ct-kbd-bg-color: #0d1117;
-  --ct-kbd-border-color: #6e7681;
   /* Will be used if backdrop-filter not supported */
   --ct-header-bg-color: #272c35ee;
   --ls-selection-color: #000;
@@ -1096,22 +1061,22 @@ html[data-theme=light] {
   --ls-primary-text-color: rgb(40, 40, 40);
   --ls-secondary-text-color: #161e2e;
   --ct-bold-color: #000;
-  --ct-bold-color-transparent: rgba(0, 0, 0, 0.2);
   --ls-link-text-color: var(--ct-primary-color);
   --ls-link-ref-text-color: var(--ct-primary-color);
   --ls-link-ref-text-hover-color: var(--ct-secondary-color);
   --ls-active-primary-color: var(--ct-primary-color);
   --ls-active-secondary-color: var(--ct-secondary-color);
   --ls-external-link-color: var(--ct-secondary-color);
-  --ct-bullet-closed-color: rgb(200, 200, 200);
+  --ls-guideline-color: var(--ls-tertiary-background-color);
+  --ls-block-bullet-color: var(--ls-tertiary-background-color);
+  --ls-bullet-closed-color: var(--ls-secondary-text-color);
+  --ls-block-bullet-border-color: var(--ls-quaternary-background-color);
   --ct-block-arrow-color: rgb(98, 98, 98);
   --ct-page-reference-color: var(--ls-active-primary-color);
   --ls-icon-color: var(--ls-primary-text-color);
   --ct-block-reference-background: rgba(16, 107, 163, 0.1);
   --ct-block-reference-background-hover: rgba(16, 107, 163, 0.3);
   --ls-page-properties-background-color: var(--ls-tertiary-background-color);
-  --ct-kbd-bg-color: #fafbfc;
-  --ct-kbd-border-color: #d1d5da;
   --ls-selection-color: #fff;
   /* Will be used if backdrop-filter not supported */
   --ct-header-bg-color: rgba(255, 255, 255, 0.9);

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