Merge pull request #20 from zsjy/dev

Dev
2025-03-15 17:49:40 +08:00 · 2024-06-10 06:12:10 +08:00 · 2024-06-10 06:12:10 +08:00 · fab25234c0
commit fab25234c0
parent 1ca942a9fe 90922d5f0a
6 changed files with 20 additions and 127 deletions
--- a/src/css/style.less
+++ b/src/css/style.less
@ -3425,6 +3425,11 @@ button.swiper-pagination-bullet {
    }
  }

+  hyperlink-card {
+    margin-top: 0 !important;
+    margin-bottom: 14px !important;
+  }
+
  p {
    line-height: 1.7em;
    margin-bottom: 14px;
--- a/src/css/theme.less
+++ b/src/css/theme.less
@ -3,8 +3,8 @@
 // 全局CSS变量
 html {
  --theme: #50bfff;
-  --main: #505050;
-  --title: #444;
+  --main: #424242;
+  --title: #333;
  --background: rgba(255, 255, 255, 0.94);
  --background-hover: #fff;
  --style-a: #fff;
@ -42,8 +42,8 @@ html {

  &.night {
    --theme: #5d93db;
-    --main: #b0b0b0;
-    --title: #c4c4c4;
+    --main: #ccc;
+    --title: #d0d0d0;
    --background: rgba(40, 44, 52, .6);
    --background-hover: rgba(40, 44, 52, 0.8);
    --style-a: #080c28;
@ -56,7 +56,7 @@ html {
    --light-z: #c2c2c2;
    --dark-a: #888;
    --dark-b: #777;
-    --dark-c: silver;
+    --dark-c: #cacaca;
    --dark-d: #aaa;
    --dark-e: #c0c0c0;
    --color-a: #cbba7d;
@ -118,143 +118,31 @@ html {
  /*插件配置*/
  /*搜索組件*/
  --halo-search-widget-base-font-size: 1rem !important;
-  //基础元素的圆角
-  //--halo-search-widget-base-border-radius:  !important;
-  //基础字体族
  --halo-search-widget-base-font-family: "Dream Font" !important;
-  //模态层颜色
-  //--halo-search-widget-color-modal-layer: var(--theme) !important;
-  //模态内容背景颜色
-  //--halo-search-widget-color-modal-content-bg: var(--theme) !important;
-  //表单输入背景颜色
-  //--halo-search-widget-color-form-input-bg:  !important;
-  //表单输入文字颜色
-  //--halo-search-widget-color-form-input:  !important;
-  //表单输入占位符颜色
-  //--halo-search-widget-color-form-input-placeholder:  !important;
-  //表单分隔线颜色
-  //--halo-search-widget-color-form-divider:  !important;
-  //无结果提示颜色
-  //--halo-search-widget-color-result-empty:  !important;
-  //结果项背景颜色
-  //--halo-search-widget-color-result-item-bg:  !important;
-  //结果项悬停背景颜色
-  //--halo-search-widget-color-result-item-hover-bg:  !important;
-  //结果项标题颜色
-  //--halo-search-widget-color-result-item-title:  !important;
-  //结果项内容颜色
-  //--halo-search-widget-color-result-item-content:  !important;
-  //命令键盘项颜色
-  //--halo-search-widget-color-command-kbd-item:  !important;
-  //命令键盘边框颜色
-  //--halo-search-widget-color-command-kbd-border:  !important;

  /*评论组件：https://github.com/halo-dev/plugin-comment-widget*/
-  //基础文字颜色
  --halo-comment-widget-base-color: var(--light-y) !important;
-  //基础元素的圆角
-  //--halo-comment-widget-base-border-radius:  !important;
-  ////基础字体大小
  --halo-comment-widget-base-font-size: 1rem !important;
-  ////基础行高
-  //--halo-comment-widget-base-line-height:  !important;
-  ////基础字体族
  --halo-comment-widget-base-font-family: "Dream Font" !important;
-  ////头像的圆角大小
-  //--halo-comment-widget-component-avatar-rounded:  !important;
-  ////头像大小
-  //--halo-comment-widget-component-avatar-size:  !important;
-  ////表单输入背景颜色
-  //--halo-comment-widget-component-form-input-bg-color:  !important;
-  ////表单输入文字颜色
-  //--halo-comment-widget-component-form-input-color:  !important;
-  ////表单输入边框颜色
-  //--halo-comment-widget-component-form-input-border-color:  !important;
-  ////表单输入焦点时边框颜色
  --halo-comment-widget-component-form-input-border-color-focus: var(--theme) !important;
-  ////表单输入焦点时的阴影
-  //--halo-comment-widget-component-form-input-box-shadow-focus:  !important;
-  ////登录按钮背景颜色
-  //--halo-comment-widget-component-form-button-login-bg-color: var(--theme) !important;
-  ////登录按钮悬停背景颜色
-  //--halo-comment-widget-component-form-button-login-bg-color-hover: var(--theme) !important;
-  ////登录按钮边框颜色
  --halo-comment-widget-component-form-button-login-border-color: var(--light-c) !important;
-  ////提交按钮背景颜色
  --halo-comment-widget-component-form-button-submit-bg-color: var(--theme) !important;
-  ////提交按钮文字颜色
-  //--halo-comment-widget-component-form-button-submit-color: #f8f8f8 !important;
-  ////提交按钮边框颜色
  --halo-comment-widget-component-form-button-submit-border-color: var(--theme) !important;
-  ////提交按钮悬停边框颜色
  --halo-comment-widget-component-form-button-submit-border-color-hover: var(--theme) !important;
-  ////表情按钮颜色
-  //--halo-comment-widget-component-form-button-emoji-color: var(--theme) !important;
-  ////评论项操作悬停背景颜色
-  //--halo-comment-widget-component-comment-item-action-bg-color-hover:  !important;
-  ////评论项操作颜色
-  //--halo-comment-widget-component-comment-item-action-color:  !important;
-  ////评论项操作悬停颜色
-  //--halo-comment-widget-component-comment-item-action-color-hover:  !important;
-  ////分页按钮悬停背景颜色
-  //--halo-comment-widget-component-pagination-button-bg-color-hover:  !important;
-  ////分页按钮活动状态背景颜色
-  //--halo-comment-widget-component-pagination-button-bg-color-active:  !important;
-  ////分页按钮活动状态边框颜色
-  //--halo-comment-widget-component-pagination-button-border-color-active:  !important;
-  ////表情选择器颜色
-  //--halo-comment-widget-component-emoji-picker-rgb-color: var(--theme) !important;
-  ////表情选择器强调颜色
-  //--halo-comment-widget-component-emoji-picker-rgb-accent:  !important;
-  ////表情选择器背景颜色
-  //--halo-comment-widget-component-emoji-picker-rgb-background:  !important;
-  ////表情选择器输入颜色
-  //--halo-comment-widget-component-emoji-picker-rgb-input:  !important;
-  ////表情选择器边框颜色
-  //--halo-comment-widget-component-emoji-picker-color-border:  !important;
-  ////表情选择器悬停边框颜色
-  //--halo-comment-widget-component-emoji-picker-color-border-over:  !important;

  /*联系表单：https://app-docs.halo.run/docs/plugin-contact-form/development/custom-styles*/
-  //定义表单字体系列。
  --halo-contact-form-font-family: "Dream Font" !important;
-  //定义表单字体大小。
  --halo-contact-form-font-size: 1rem !important;
-  //定义表单行高。
-  //--halo-contact-form-line-height
-  //边框圆角。
-  //--halo-contact-form-border-radius
-  //提交按钮宽度。
  --halo-contact-form-width-submit: 100% !important;
-  //主要颜色。
  --halo-contact-form-color-primary: var(--theme) !important;
-  //标签颜色。
  --halo-contact-form-color-label: var(--light-y) !important;
-  //输入框颜色。
  --halo-contact-form-color-input: var(--light-y) !important;
-  //输入框选中时的背景色。
-  //--halo-contact-form-color-input-selection
-  //边框颜色。
-  //--halo-contact-form-color-border
-  //危险或错误提示颜色。
  --halo-contact-form-color-danger: #ff5656 !important;
-  //帮助文本颜色。
-  //--halo-contact-form-color-help
-  //按钮颜色。
-  //--halo-contact-form-color-button: var(--theme) !important;
-  //按钮悬停颜色。
-  //--halo-contact-form-color-button-hover: var(--theme) !important;
-  //焦点环颜色。
-  //--halo-contact-form-focus-ring-color: var(--theme) !important;
-  //错误环颜色。
-  //--halo-contact-form-error-ring-color
-  //焦点时的错误环颜色。
-  //--halo-contact-form-error-ring-focus-color
-  //输入框背景色。
-  //--halo-contact-form-bg-input
-  //装饰器背景色。
-  //--halo-contact-form-bg-decorator
-  //自动模式下的模态框背景色。
-  //--halo-contact-form-auto-color-modal-bg

+  /*编辑器超链接卡片*/
+  --halo-hyperlink-card-title-color: var(--dark-c) !important;
+  --halo-hyperlink-card-inline-title-color: var(--dark-c) !important;
+  --halo-hyperlink-card-description-color: var(--main) !important;
+  --halo-hyperlink-card-link-color: var(--theme) !important;
+  --halo-hyperlink-card-border-hover-color: var(--theme) !important;
 }
--- a/templates/assets/css/style.min.css
+++ b/templates/assets/css/style.min.css
--- a/templates/assets/css/theme.min.css
+++ b/templates/assets/css/theme.min.css
@ -1 +1 @@
-@charset "utf-8";html{--theme:#50bfff;--main:#505050;--title:#444;--background:rgba(255, 255, 255, 0.94);--background-hover:#fff;--style-a:#fff;--light-a:#ffffff;--light-b:#ebeef5;--light-c:#dcdcdc;--light-d:#c0c4cc;--light-x:#d6d6d6;--light-y:#1f1f1f;--light-z:#ffffff;--dark-a:#4a4a4a;--dark-b:#909399;--dark-c:#333;--dark-d:#9a9a9a;--dark-e:#7a7a7a;--color-a:#409eff;--bg-a:rgba(242, 246, 252, 0.8);--bg-b:#f2f6fc;--bg-c:#f5f5f5;--bg-d:rgba(255, 255, 255, 0.8);--bg-e:var(--theme);--bg-f:#f7f7f7;--bg-g:#e8f3ff;--bg-h:rgba(237, 244, 253, 0.75);--bg-i:#50bfff;--bg-j:rgba(243, 244, 245, 0.25);--bg-k:rgba(250, 250, 250, 0.8);--bg-l:rgba(243, 243, 243, 0.8);--bg-z:rgba(230, 240, 250, 0.75);--radius-wrap:8px;--radius-inner:4px;--radius-img:5px;--box-shadow:0 0px 10px -5px #949494;--halo-search-widget-base-font-size:1rem!important;--halo-search-widget-base-font-family:"Dream Font"!important;--halo-comment-widget-base-color:var(--light-y)!important;--halo-comment-widget-base-font-size:1rem!important;--halo-comment-widget-base-font-family:"Dream Font"!important;--halo-comment-widget-component-form-input-border-color-focus:var(--theme)!important;--halo-comment-widget-component-form-button-login-border-color:var(--light-c)!important;--halo-comment-widget-component-form-button-submit-bg-color:var(--theme)!important;--halo-comment-widget-component-form-button-submit-border-color:var(--theme)!important;--halo-comment-widget-component-form-button-submit-border-color-hover:var(--theme)!important;--halo-contact-form-font-family:"Dream Font"!important;--halo-contact-form-font-size:1rem!important;--halo-contact-form-width-submit:100%!important;--halo-contact-form-color-primary:var(--theme)!important;--halo-contact-form-color-label:var(--light-y)!important;--halo-contact-form-color-input:var(--light-y)!important;--halo-contact-form-color-danger:#ff5656!important}html.night{--theme:#5d93db;--main:#b0b0b0;--title:#c4c4c4;--background:rgba(40, 44, 52, 0.6);--background-hover:rgba(40, 44, 52, 0.8);--style-a:#080c28;--light-a:#232323;--light-b:#414243;--light-c:#303030;--light-d:#666;--light-x:#6e6e6e;--light-y:#fafafa;--light-z:#c2c2c2;--dark-a:#888;--dark-b:#777;--dark-c:silver;--dark-d:#aaa;--dark-e:#c0c0c0;--color-a:#cbba7d;--bg-a:rgba(65, 66, 67, 0.8);--bg-b:#303030;--bg-c:#373d48;--bg-d:rgba(40, 44, 52, 0.8);--bg-e:#434a56;--bg-f:#080c28;--bg-g:rgba(210, 210, 210, 0.2);--bg-h:rgba(65, 68, 74, 0.6);--bg-i:#276b92;--bg-j:rgba(36, 36, 36, 0.15);--bg-k:rgba(30, 33, 41, 0.8);--bg-l:rgba(63, 65, 75, 0.8);--bg-z:rgba(65, 68, 74, 0.6);--box-shadow:1px 1px 3px 1px #1b1b1b}html.night body::before{-webkit-filter:brightness(.3);filter:brightness(.3)}html.night .logo-img{display:none}html.night .logo-img-dark{display:inline-block}html.night .aplayer-pic,html.night .brightness,html.night .cover-image,html.night .small-image,html.night .thumbnail-image,html.night .waifu,html.night comment-widget,html.night iframe,html.night img,html.night svg,html.night video{-webkit-filter:brightness(.8);filter:brightness(.8)}html.night .canvas_effects.night{display:block}html.night .canvas_effects.day{display:none}html.night .main-content figure{color:var(--main);background:var(--bg-k)}html.night .main-content figure pre code{color:var(--color-a);background:0 0}
+@charset "utf-8";html{--theme:#50bfff;--main:#424242;--title:#333;--background:rgba(255, 255, 255, 0.94);--background-hover:#fff;--style-a:#fff;--light-a:#ffffff;--light-b:#ebeef5;--light-c:#dcdcdc;--light-d:#c0c4cc;--light-x:#d6d6d6;--light-y:#1f1f1f;--light-z:#ffffff;--dark-a:#4a4a4a;--dark-b:#909399;--dark-c:#333;--dark-d:#9a9a9a;--dark-e:#7a7a7a;--color-a:#409eff;--bg-a:rgba(242, 246, 252, 0.8);--bg-b:#f2f6fc;--bg-c:#f5f5f5;--bg-d:rgba(255, 255, 255, 0.8);--bg-e:var(--theme);--bg-f:#f7f7f7;--bg-g:#e8f3ff;--bg-h:rgba(237, 244, 253, 0.75);--bg-i:#50bfff;--bg-j:rgba(243, 244, 245, 0.25);--bg-k:rgba(250, 250, 250, 0.8);--bg-l:rgba(243, 243, 243, 0.8);--bg-z:rgba(230, 240, 250, 0.75);--radius-wrap:8px;--radius-inner:4px;--radius-img:5px;--box-shadow:0 0px 10px -5px #949494;--halo-search-widget-base-font-size:1rem!important;--halo-search-widget-base-font-family:"Dream Font"!important;--halo-comment-widget-base-color:var(--light-y)!important;--halo-comment-widget-base-font-size:1rem!important;--halo-comment-widget-base-font-family:"Dream Font"!important;--halo-comment-widget-component-form-input-border-color-focus:var(--theme)!important;--halo-comment-widget-component-form-button-login-border-color:var(--light-c)!important;--halo-comment-widget-component-form-button-submit-bg-color:var(--theme)!important;--halo-comment-widget-component-form-button-submit-border-color:var(--theme)!important;--halo-comment-widget-component-form-button-submit-border-color-hover:var(--theme)!important;--halo-contact-form-font-family:"Dream Font"!important;--halo-contact-form-font-size:1rem!important;--halo-contact-form-width-submit:100%!important;--halo-contact-form-color-primary:var(--theme)!important;--halo-contact-form-color-label:var(--light-y)!important;--halo-contact-form-color-input:var(--light-y)!important;--halo-contact-form-color-danger:#ff5656!important;--halo-hyperlink-card-title-color:var(--dark-c)!important;--halo-hyperlink-card-inline-title-color:var(--dark-c)!important;--halo-hyperlink-card-description-color:var(--main)!important;--halo-hyperlink-card-link-color:var(--theme)!important;--halo-hyperlink-card-border-hover-color:var(--theme)!important}html.night{--theme:#5d93db;--main:#ccc;--title:#d0d0d0;--background:rgba(40, 44, 52, 0.6);--background-hover:rgba(40, 44, 52, 0.8);--style-a:#080c28;--light-a:#232323;--light-b:#414243;--light-c:#303030;--light-d:#666;--light-x:#6e6e6e;--light-y:#fafafa;--light-z:#c2c2c2;--dark-a:#888;--dark-b:#777;--dark-c:#cacaca;--dark-d:#aaa;--dark-e:#c0c0c0;--color-a:#cbba7d;--bg-a:rgba(65, 66, 67, 0.8);--bg-b:#303030;--bg-c:#373d48;--bg-d:rgba(40, 44, 52, 0.8);--bg-e:#434a56;--bg-f:#080c28;--bg-g:rgba(210, 210, 210, 0.2);--bg-h:rgba(65, 68, 74, 0.6);--bg-i:#276b92;--bg-j:rgba(36, 36, 36, 0.15);--bg-k:rgba(30, 33, 41, 0.8);--bg-l:rgba(63, 65, 75, 0.8);--bg-z:rgba(65, 68, 74, 0.6);--box-shadow:1px 1px 3px 1px #1b1b1b}html.night body::before{-webkit-filter:brightness(.3);filter:brightness(.3)}html.night .logo-img{display:none}html.night .logo-img-dark{display:inline-block}html.night .aplayer-pic,html.night .brightness,html.night .cover-image,html.night .small-image,html.night .thumbnail-image,html.night .waifu,html.night comment-widget,html.night iframe,html.night img,html.night svg,html.night video{-webkit-filter:brightness(.8);filter:brightness(.8)}html.night .canvas_effects.night{display:block}html.night .canvas_effects.day{display:none}html.night .main-content figure{color:var(--main);background:var(--bg-k)}html.night .main-content figure pre code{color:var(--color-a);background:0 0}
--- a/theme.yaml
+++ b/theme.yaml
@ -30,7 +30,7 @@ spec:
  settingName: theme-dream2-plus-setting
  configMapName: theme-dream2-plus-configMap
  # 版本号
-  version: 0.0.0.1
+  version: 0.0.0.6
  # 最低支持的 Halo 版本
  require: ">=2.12.0"
  # 许可
--- a/2
+++ b/2
@ -1 +1 @@
-1.2.3
+1.2.4
 @ -1 +1 @@
 .2.3
 .2.4