chore(release): bump version to 2.0.8 in theme.yaml

package.json

@@ -1,7 +1,6 @@
 {
   "name": "theme-terminal",
   "private": true,
-  "version": "2.0.5",
   "description": "A terminal like theme for Halo.",
   "scripts": {
     "dev": "vite build --watch",

settings.yaml

@@ -71,21 +71,21 @@ spec:
               position: up
               label: 归档
               icon: archive
-              url: /archives
+              url: ""
               external: false
             - enabled: true
               type: categories
               position: up
               label: 分类
               icon: script-text
-              url: /categories
+              url: ""
               external: false
             - enabled: true
               type: tags
               position: up
               label: 标签
               icon: label
-              url: /tags
+              url: ""
               external: false
             - enabled: true
               type: login
@@ -279,7 +279,7 @@ spec:
             - $formkit: text
               name: url
               label: 链接地址
-              help: 搜索入口可留空；其他入口留空时不会跳转。
+              help: 内置入口可留空并自动使用 Halo 路由；自定义入口留空时不会跳转。
             - $formkit: select
               name: position
               label: 所在位置

src/styles/devcm-editor.scss

@@ -70,7 +70,7 @@ html[data-color-scheme="light"] .devcm-category-card,
 html[data-color-scheme="light"] .devcm-archive-table,
 html[data-color-scheme="light"] .devcm-comments {
   border-color: rgba(181, 137, 0, 0.28);
-  background: rgba(253, 246, 227, 0.9);
+  background: rgba(255, 250, 235, 0.78);
 }
 
 html[data-color-scheme="light"] .devcm-terminal-window::before,
@@ -110,7 +110,7 @@ html[data-color-scheme="light"] .devcm-window-titlebar,
 html[data-color-scheme="light"] .devcm-editor-tabs,
 html[data-color-scheme="light"] .devcm-comment-titlebar {
   border-bottom-color: rgba(101, 123, 131, 0.18);
-  background: rgba(238, 232, 213, 0.78);
+  background: rgba(244, 238, 220, 0.42);
 }
 
 .devcm-window-titlebar {
@@ -335,7 +335,7 @@ html[data-color-scheme="light"] .devcm-article-title {
 
 html[data-color-scheme="light"] .devcm-ascii-badge {
   border-color: rgba(181, 137, 0, 0.42);
-  background: rgba(238, 232, 213, 0.72);
+  background: rgba(244, 238, 220, 0.42);
   box-shadow: none;
   color: var(--devcm-amber);
 }
@@ -507,7 +507,7 @@ html[data-color-scheme="light"] .devcm-ascii-badge pre {
 }
 
 html[data-color-scheme="light"] .devcm-post-card {
-  background: rgba(253, 246, 227, 0.86);
+  background: rgba(255, 250, 235, 0.7);
 }
 
 html[data-color-scheme="light"] .devcm-post-card:hover {
@@ -672,7 +672,7 @@ html[data-color-scheme="light"] .devcm-article-content li {
 
 html[data-color-scheme="light"] .devcm-article-content pre {
   border-color: rgba(101, 123, 131, 0.24);
-  background: rgba(238, 232, 213, 0.55);
+  background: rgba(244, 238, 220, 0.34);
   color: #586e75;
 }
 
@@ -700,7 +700,7 @@ html[data-color-scheme="light"] .devcm-article-content code {
 }
 
 html[data-color-scheme="light"] .devcm-comments {
-  background: rgba(253, 246, 227, 0.9);
+  background: rgba(255, 250, 235, 0.78);
 }
 
 .devcm-comments h2 {
@@ -779,7 +779,7 @@ html[data-color-scheme="light"] .devcm-comments {
 }
 
 html[data-color-scheme="light"] .devcm-category-card {
-  background: rgba(253, 246, 227, 0.86);
+  background: rgba(255, 250, 235, 0.7);
   color: var(--devcm-text);
 }
 
@@ -849,7 +849,7 @@ html[data-color-scheme="light"] .devcm-archive-row {
 }
 
 html[data-color-scheme="light"] .devcm-archive-row--header {
-  background: rgba(238, 232, 213, 0.64);
+  background: rgba(244, 238, 220, 0.38);
   color: var(--devcm-muted);
 }
 
@@ -861,7 +861,7 @@ html[data-color-scheme="light"] .devcm-archive-row--header {
 }
 
 html[data-color-scheme="light"] .devcm-archive-row--month {
-  background: rgba(238, 232, 213, 0.78);
+  background: rgba(244, 238, 220, 0.46);
 }
 
 .devcm-archive-row b {
@@ -946,7 +946,7 @@ html[data-color-scheme="light"] .devcm-archive-row--month {
 
 html[data-color-scheme="light"] .devcm-link-card {
   border-color: rgba(101, 123, 131, 0.2);
-  background: rgba(238, 232, 213, 0.42);
+  background: rgba(244, 238, 220, 0.3);
   color: var(--devcm-text);
 }
 

src/styles/devcm-shell.scss

@@ -22,22 +22,22 @@ body.devcm-body.pixel_style {
 }
 
 html[data-color-scheme="light"] body.devcm-body {
-  background: #eee8d5;
+  background: var(--devcm-bg-deep);
 }
 
 html[data-color-scheme="light"] body.devcm-body::before {
-  opacity: 0.34;
+  opacity: 0.26;
   background: repeating-linear-gradient(
       0deg,
-      rgba(147, 161, 161, 0.08) 0,
-      rgba(147, 161, 161, 0.08) 1px,
+      rgba(131, 145, 149, 0.045) 0,
+      rgba(131, 145, 149, 0.045) 1px,
       transparent 1px,
       transparent 28px
     ),
     repeating-linear-gradient(
       90deg,
-      rgba(147, 161, 161, 0.08) 0,
-      rgba(147, 161, 161, 0.08) 1px,
+      rgba(131, 145, 149, 0.045) 0,
+      rgba(131, 145, 149, 0.045) 1px,
       transparent 1px,
       transparent 28px
     );
@@ -111,8 +111,8 @@ html[data-color-scheme="light"] .devcm-shell {
 }
 
 html[data-color-scheme="light"] .devcm-app {
-  background: linear-gradient(90deg, rgba(147, 161, 161, 0.12) 1px, transparent 1px) 0 0 / 28px 28px,
-    linear-gradient(180deg, rgba(147, 161, 161, 0.1) 1px, transparent 1px) 0 0 / 28px 28px, #fdf6e3;
+  background: linear-gradient(90deg, rgba(117, 135, 70, 0.06) 1px, transparent 1px) 0 0 / 28px 28px,
+    linear-gradient(180deg, rgba(157, 129, 50, 0.055) 1px, transparent 1px) 0 0 / 28px 28px, var(--devcm-bg);
 }
 
 .devcm-topbar {
@@ -128,7 +128,7 @@ html[data-color-scheme="light"] .devcm-app {
 
 html[data-color-scheme="light"] .devcm-topbar {
   border-bottom-color: rgba(101, 123, 131, 0.22);
-  background: #eee8d5;
+  background: var(--devcm-bg-deep);
   box-shadow: none;
 }
 
@@ -354,12 +354,12 @@ html[data-color-scheme="light"] .devcm-topbar {
 
 html[data-color-scheme="light"] .devcm-sidebar,
 html[data-color-scheme="light"] .devcm-rightbar {
-  background: rgba(238, 232, 213, 0.72);
+  background: rgba(244, 238, 220, 0.5);
 }
 
 html[data-color-scheme="light"] .devcm-activity {
   border-right-color: rgba(101, 123, 131, 0.22);
-  background: #eee8d5;
+  background: var(--devcm-bg-deep);
 }
 
 html[data-color-scheme="light"] .devcm-activity__button {
@@ -587,7 +587,7 @@ html[data-color-scheme="light"] .devcm-tree__item--root {
 
 html[data-color-scheme="light"] .devcm-tag {
   border-color: rgba(101, 123, 131, 0.22);
-  background: rgba(238, 232, 213, 0.62);
+  background: rgba(244, 238, 220, 0.42);
   color: #657b83;
 }
 
@@ -608,7 +608,7 @@ html[data-color-scheme="light"] .devcm-tag {
 }
 
 html[data-color-scheme="light"] .devcm-widget {
-  background: rgba(253, 246, 227, 0.88);
+  background: rgba(255, 250, 235, 0.78);
 }
 
 .devcm-widget::before {
@@ -723,7 +723,7 @@ html[data-color-scheme="light"] .devcm-info-list__row {
 
 html[data-color-scheme="light"] .devcm-statusbar {
   border-top-color: rgba(101, 123, 131, 0.22);
-  background: #eee8d5;
+  background: var(--devcm-bg-deep);
   color: #657b83;
 }
 

src/styles/devcm-tokens.scss

@@ -42,11 +42,11 @@ html[data-color-scheme="dark"] {
 
 html[data-color-scheme="light"] {
   color-scheme: light;
-  --devcm-bg: #fdf6e3;
-  --devcm-bg-deep: #eee8d5;
-  --devcm-panel: rgba(253, 246, 227, 0.94);
-  --devcm-panel-soft: rgba(238, 232, 213, 0.78);
-  --devcm-panel-warm: rgba(238, 232, 213, 0.62);
+  --devcm-bg: #fdf8e8;
+  --devcm-bg-deep: #f4eedc;
+  --devcm-panel: rgba(255, 250, 235, 0.9);
+  --devcm-panel-soft: rgba(244, 238, 220, 0.5);
+  --devcm-panel-warm: rgba(244, 238, 220, 0.34);
   --devcm-line: rgba(101, 123, 131, 0.2);
   --devcm-line-strong: rgba(181, 137, 0, 0.42);
   --devcm-text: #586e75;

templates/category.html

@@ -10,7 +10,8 @@
           <span th:text="${category.spec.displayName} + '.md'">category.md</span>
           <a
             class="devcm-editor-tab__close"
-            href="/categories"
+            href="#"
+            th:href="${!#strings.isEmpty(site.routes.categoriesUri) ? site.routes.categoriesUri : '/categories'}"
             th:aria-label="#{devcm.action.closeCategoryTab}"
             th:title="#{devcm.action.closeCategoryTab}"
             >×</a

templates/modules/activity-bar.html

@@ -14,7 +14,15 @@
     <i class="i-pixelarticons-github"></i>
   </span>
 
-  <th:block th:with="items=${theme.config.activity.activity_items}">
+  <th:block
+    th:with="items=${theme.config.activity.activity_items},
+      archiveActivityItem=${items != null and !#lists.isEmpty(items) ? items.^[type == 'archive' or key == 'archive'] : null},
+      categoriesActivityItem=${items != null and !#lists.isEmpty(items) ? items.^[type == 'categories' or key == 'categories'] : null},
+      tagsActivityItem=${items != null and !#lists.isEmpty(items) ? items.^[type == 'tags' or key == 'tags'] : null},
+      activityArchiveHref=${!#strings.isEmpty(site.routes.archivesUri) ? site.routes.archivesUri : (archiveActivityItem != null and !#strings.isEmpty(archiveActivityItem.url) ? archiveActivityItem.url : (archiveActivityItem != null and !#strings.isEmpty(archiveActivityItem.href) ? archiveActivityItem.href : '/archives'))},
+      activityCategoriesHref=${!#strings.isEmpty(site.routes.categoriesUri) ? site.routes.categoriesUri : (categoriesActivityItem != null and !#strings.isEmpty(categoriesActivityItem.url) ? categoriesActivityItem.url : (categoriesActivityItem != null and !#strings.isEmpty(categoriesActivityItem.href) ? categoriesActivityItem.href : '/categories'))},
+      activityTagsHref=${!#strings.isEmpty(site.routes.tagsUri) ? site.routes.tagsUri : (tagsActivityItem != null and !#strings.isEmpty(tagsActivityItem.url) ? tagsActivityItem.url : (tagsActivityItem != null and !#strings.isEmpty(tagsActivityItem.href) ? tagsActivityItem.href : '/tags'))}"
+  >
     <div class="devcm-activity__group devcm-activity__group--up">
       <th:block th:if="${items != null and !#lists.isEmpty(items)}">
         <th:block
@@ -22,7 +30,8 @@
           th:with="placement=${#strings.isEmpty(item.position) ? 'up' : item.position},
             itemType=${!#strings.isEmpty(item.type) ? item.type : (!#strings.isEmpty(item.key) ? item.key : 'custom')},
             entryAction=${itemType == 'search' or item.action == 'search' ? 'search' : 'link'},
-            entryHref=${entryAction == 'search' ? '#' : (!#strings.isEmpty(item.url) ? item.url : (!#strings.isEmpty(item.href) ? item.href : '#'))},
+            entryConfiguredHref=${!#strings.isEmpty(item.url) ? item.url : (!#strings.isEmpty(item.href) ? item.href : '#')},
+            entryHref=${entryAction == 'search' ? '#' : (itemType == 'archive' ? activityArchiveHref : (itemType == 'categories' ? activityCategoriesHref : (itemType == 'tags' ? activityTagsHref : entryConfiguredHref)))},
             entryLabel=${!#strings.isEmpty(item.label) ? item.label : (!#strings.isEmpty(item.labelKey) ? #messages.msg(item.labelKey) : #messages.msg('devcm.activity.link'))}"
         >
           <a
@@ -95,7 +104,8 @@
         <a
           class="devcm-activity__button"
           th:classappend="${pageType == 'archive' or pageType == 'post'} ? ' devcm-activity__button--active' : ''"
-          href="/archives"
+          href="#"
+          th:href="${activityArchiveHref}"
           th:title="#{devcm.activity.archive}"
           th:attr="data-label=#{devcm.activity.archive},aria-label=#{devcm.activity.archive}"
         >
@@ -104,7 +114,8 @@
         <a
           class="devcm-activity__button"
           th:classappend="${pageType == 'categories' or pageType == 'category'} ? ' devcm-activity__button--active' : ''"
-          href="/categories"
+          href="#"
+          th:href="${activityCategoriesHref}"
           th:title="#{devcm.activity.categories}"
           th:attr="data-label=#{devcm.activity.categories},aria-label=#{devcm.activity.categories}"
         >
@@ -113,7 +124,8 @@
         <a
           class="devcm-activity__button"
           th:classappend="${pageType == 'tags' or pageType == 'tag'} ? ' devcm-activity__button--active' : ''"
-          href="/tags"
+          href="#"
+          th:href="${activityTagsHref}"
           th:title="#{devcm.activity.tags}"
           th:attr="data-label=#{devcm.activity.tags},aria-label=#{devcm.activity.tags}"
         >
@@ -129,7 +141,8 @@
           th:with="placement=${#strings.isEmpty(item.position) ? 'up' : item.position},
             itemType=${!#strings.isEmpty(item.type) ? item.type : (!#strings.isEmpty(item.key) ? item.key : 'custom')},
             entryAction=${itemType == 'search' or item.action == 'search' ? 'search' : 'link'},
-            entryHref=${entryAction == 'search' ? '#' : (!#strings.isEmpty(item.url) ? item.url : (!#strings.isEmpty(item.href) ? item.href : '#'))},
+            entryConfiguredHref=${!#strings.isEmpty(item.url) ? item.url : (!#strings.isEmpty(item.href) ? item.href : '#')},
+            entryHref=${entryAction == 'search' ? '#' : (itemType == 'archive' ? activityArchiveHref : (itemType == 'categories' ? activityCategoriesHref : (itemType == 'tags' ? activityTagsHref : entryConfiguredHref)))},
             entryLabel=${!#strings.isEmpty(item.label) ? item.label : (!#strings.isEmpty(item.labelKey) ? #messages.msg(item.labelKey) : #messages.msg('devcm.activity.link'))}"
         >
           <a

templates/modules/layout.html

@@ -14,7 +14,7 @@
     <link rel="manifest" th:href="@{/assets/dist/manifest.json}" />
     <link
       rel="stylesheet"
-      th:href="@{/assets/dist/main.css?version={version}&amp;build=devcm-ide-1.2.9-scroll5(version=${theme.spec.version})}"
+      th:href="@{/assets/dist/main.css?version={version}&amp;build=devcm-ide-1.2.10-softlight1(version=${theme.spec.version})}"
       href="./assets/dist/style.css"
     />
   </head>
@@ -43,7 +43,7 @@
       </div>
     </div>
     <script
-      th:src="@{/assets/dist/main.js?version={version}&amp;build=devcm-ide-1.2.9-scroll5(version=${theme.spec.version})}"
+      th:src="@{/assets/dist/main.js?version={version}&amp;build=devcm-ide-1.2.10-softlight1(version=${theme.spec.version})}"
     ></script>
   </body>
 </html>

templates/post.html

@@ -8,12 +8,16 @@
       <div class="devcm-editor-tabs">
         <div
           class="devcm-editor-tab devcm-editor-tab--active"
-          th:with="postTabName=${!#strings.isEmpty(post.spec.slug) ? post.spec.slug : post.metadata.name}"
+          th:with="postTabBaseName=${!#strings.isEmpty(post.spec.slug) ? post.spec.slug : post.metadata.name},
+            postTabName=${#strings.endsWith(postTabBaseName, '.md') ? postTabBaseName : postTabBaseName + '.md'},
+            archiveActivityItem=${theme.config.activity.activity_items != null and !#lists.isEmpty(theme.config.activity.activity_items) ? theme.config.activity.activity_items.^[type == 'archive' or key == 'archive'] : null},
+            postCloseHref=${!#strings.isEmpty(site.routes.archivesUri) ? site.routes.archivesUri : (archiveActivityItem != null and !#strings.isEmpty(archiveActivityItem.url) ? archiveActivityItem.url : (archiveActivityItem != null and !#strings.isEmpty(archiveActivityItem.href) ? archiveActivityItem.href : '/archives'))}"
         >
           <span th:text="${postTabName}">post</span>
           <a
             class="devcm-editor-tab__close"
-            href="/archives"
+            href="#"
+            th:href="${postCloseHref}"
             th:aria-label="#{devcm.action.closePostTab}"
             th:title="#{devcm.action.closePostTab}"
             >×</a

templates/tag.html

@@ -10,7 +10,8 @@
           <span th:text="'#' + ${tag.spec.displayName} + '.md'">tag.md</span>
           <a
             class="devcm-editor-tab__close"
-            href="/tags"
+            href="#"
+            th:href="${!#strings.isEmpty(site.routes.tagsUri) ? site.routes.tagsUri : '/tags'}"
             th:aria-label="#{devcm.action.closeTagTab}"
             th:title="#{devcm.action.closeTagTab}"
             >×</a

theme.yaml

@@ -13,5 +13,5 @@ spec:
   repo: https://git.dev.cm/theme-terminal
   settingName: "theme-terminal-setting"
   configMapName: "theme-terminal-configMap"
-  version: 2.0.5
+  version: 2.0.8
   require: ">=2.22.0"