Merge branch 'main' of https://github.com/pengx17/logseq-dev-theme

zhengyu-yang · Jun 7, 2022 · 1082708 · 1082708
2 parents 4153918 + 8951c46
commit 1082708
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+## [1.26.9](https://github.com/pengx17/logseq-dev-theme/compare/v1.26.8...v1.26.9) (2022-06-06)
+
+
+### Bug Fixes
+
+* some color fixes ([2b99bad](https://github.com/pengx17/logseq-dev-theme/commit/2b99bad9f054185af17d5fa2328f548c83bc2b13))
+
+## [1.26.8](https://github.com/pengx17/logseq-dev-theme/compare/v1.26.7...v1.26.8) (2022-06-05)
+
+
+### Bug Fixes
+
+* query header display issue ([1244cdf](https://github.com/pengx17/logseq-dev-theme/commit/1244cdfd196aebfbaf95ade6ec3cbb61b13a3e96))
+
 ## [1.26.7](https://github.com/pengx17/logseq-dev-theme/compare/v1.26.6...v1.26.7) (2022-05-20)
 
 

diff --git a/custom.css b/custom.css
@@ -873,7 +873,7 @@ a.tag:hover {
 /* Page properties */
 .page-properties,
 .block-properties {
-  margin: 0 0 0.5em -8px;
+  margin: 0 0 0.5em;
   font-size: 0.8em;
   background: var(--ls-secondary-background-color);
   width: fit-content;
@@ -964,6 +964,10 @@ progress::-webkit-progress-value {
   max-width: 100%;
 }
 
+.page-icon {
+  font-family: "Inter", sans-serif;
+}
+
 /* Popups */
 .tippy-tooltip {
   padding: 0.5em 0;
@@ -1076,6 +1080,7 @@ progress::-webkit-progress-value {
   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);
+  width: auto;
 }
 
 :not(.dsl-query) > .custom-query .custom-query-title > .flex-row {
@@ -1097,6 +1102,10 @@ progress::-webkit-progress-value {
   color: var(--ct-query-header-color);
 }
 
+.custom-query-title > .svg-small {
+  display: none;
+}
+
 :root {
   --ct-marker-border-radius: 4px;
   --ct-task-done-text-decoration: none;
@@ -1229,7 +1238,7 @@ html[data-theme=dark] {
   --ct-secondary-color: #6096ba;
   --ct-warning-color: #ff7262;
   --ct-success-color: #0dcf82;
-  --ct-highlight-color: #ffc600;
+  --ct-highlight-color: #d3a400;
   --color-level-1: #313942;
   --color-level-2: #38434c;
   --color-level-3: #404b55;

diff --git a/no_bullet_threading.css b/no_bullet_threading.css
@@ -724,7 +724,7 @@ a.tag:hover {
 /* Page properties */
 .page-properties,
 .block-properties {
-  margin: 0 0 0.5em -8px;
+  margin: 0 0 0.5em;
   font-size: 0.8em;
   background: var(--ls-secondary-background-color);
   width: fit-content;
@@ -815,6 +815,10 @@ progress::-webkit-progress-value {
   max-width: 100%;
 }
 
+.page-icon {
+  font-family: "Inter", sans-serif;
+}
+
 /* Popups */
 .tippy-tooltip {
   padding: 0.5em 0;
@@ -927,6 +931,7 @@ progress::-webkit-progress-value {
   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);
+  width: auto;
 }
 
 :not(.dsl-query) > .custom-query .custom-query-title > .flex-row {
@@ -948,6 +953,10 @@ progress::-webkit-progress-value {
   color: var(--ct-query-header-color);
 }
 
+.custom-query-title > .svg-small {
+  display: none;
+}
+
 :root {
   --ct-marker-border-radius: 4px;
   --ct-task-done-text-decoration: none;
@@ -1080,7 +1089,7 @@ html[data-theme=dark] {
   --ct-secondary-color: #6096ba;
   --ct-warning-color: #ff7262;
   --ct-success-color: #0dcf82;
-  --ct-highlight-color: #ffc600;
+  --ct-highlight-color: #d3a400;
   --color-level-1: #313942;
   --color-level-2: #38434c;
   --color-level-3: #404b55;

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

diff --git a/src/_miscs.scss b/src/_miscs.scss
@@ -111,7 +111,7 @@ a.tag:hover {
 /* Page properties */
 .page-properties,
 .block-properties {
-  margin: 0 0 0.5em -8px;
+  margin: 0 0 0.5em;
   font-size: 0.8em;
   background: var(--ls-secondary-background-color);
   width: fit-content;
@@ -204,3 +204,7 @@ progress::-webkit-progress-value {
 .link_preview__root {
   max-width: 100%;
 }
+
+.page-icon {
+  font-family: 'Inter', sans-serif;
+}
diff --git a/src/_queries.scss b/src/_queries.scss
@@ -28,6 +28,7 @@
   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);
+  width: auto;
 }
 
 :not(.dsl-query) > .custom-query .custom-query-title > .flex-row {
@@ -48,3 +49,8 @@
 .block-body > .custom-query .foldable-title .opacity-70 > * {
   color: var(--ct-query-header-color);
 }
+
+// what is this? should we remove it in upstream instead?
+.custom-query-title > .svg-small {
+  display: none;
+}
diff --git a/src/_theme_dark.scss b/src/_theme_dark.scss
@@ -8,7 +8,7 @@ html[data-theme="dark"] {
   --ct-secondary-color: #6096ba;
   --ct-warning-color: #ff7262;
   --ct-success-color: #0dcf82;
-  --ct-highlight-color: #ffc600;
+  --ct-highlight-color: #d3a400;
 
   --color-level-1: #313942;
   --color-level-2: #38434c;