Merge branch 'v2-dev' into v2_admin_mode

packages/ui/certd-client/src/layout/layout-outside.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="userLayout" :class="['user-layout-wrapper']">
-    <div class="login-container flex justify-start">
+    <div class="login-container flex justify-start dark:background-[#141414]">
       <div class="user-layout-content flex-col justify-start">
         <div class="top flex flex-col items-center justify-start">
           <div class="header flex flex-row items-center">
@@ -59,6 +59,14 @@ const sysPublic: Ref<SysPublicSetting> = computed(() => {
 </script>
 
 <style lang="less">
+.dark {
+  .login-container {
+    background: #141414 !important;
+    .desc {
+      color: rgba(227, 227, 227, 0.45) !important;
+    }
+  }
+}
 #userLayout.user-layout-wrapper {
   height: 100%;
 

packages/ui/certd-client/src/locales/langs/en-US/certd.ts

@@ -698,6 +698,7 @@ export default {
   password: "Password",
   pleaseEnterPassword: "Please enter password",
   qqEmailAuthCodeHelper: "If using QQ email, get an authorization code in QQ email settings as the password",
+  senderEmailHelper: "You can use the format: Name<Email> to set the sender name, e.g.: autossl<certd@example.com>",
   senderEmail: "Sender Email",
   pleaseEnterSenderEmail: "Please enter sender email",
   useSsl: "Use SSL",

packages/ui/certd-client/src/locales/langs/zh-CN/certd.ts

@@ -711,6 +711,7 @@ export default {
   password: "密码",
   pleaseEnterPassword: "请输入密码",
   qqEmailAuthCodeHelper: "如果是qq邮箱，需要到qq邮箱的设置里面申请授权码作为密码",
+  senderEmailHelper: "您可以使用 名称<邮箱> 的格式，来修改发件人名称，例如: autossl<certd@example.com>",
   senderEmail: "发件邮箱",
   pleaseEnterSenderEmail: "请输入发件邮箱",
   useSsl: "是否ssl",

packages/ui/certd-client/src/style/scroll.less

@@ -18,8 +18,8 @@
   -webkit-border-radius: 4em;
   -moz-border-radius: 4em;
   border-radius: 4em;
-  background-color: #b3b3b3;
-  box-shadow: 0px 1px 1px #eee inset;
+  background-color: #757575;
+  
 }
 
 ::-webkit-scrollbar-thumb:hover {

packages/ui/certd-client/src/views/framework/home/dashboard/statistic-card.vue

@@ -74,6 +74,13 @@ function goDetail(link: any) {
 }
 </script>
 <style lang="less">
+.dark {
+  .data-item {
+    .header {
+      color: rgba(242, 242, 242, 0.85) !important;
+    }
+  }
+}
 .statistic-card {
   margin-bottom: 10px;
   .icon-text {

packages/ui/certd-client/src/views/framework/login/index.vue

@@ -311,6 +311,7 @@ export default defineComponent({
     .input-right {
       width: 160px;
       margin-left: 10px;
+      background: #cfcfcf !important;
     }
 
     .forge-password {

packages/ui/certd-client/src/views/sys/settings/email/index.vue

@@ -30,6 +30,7 @@
               </a-form-item>
               <a-form-item :label="t('certd.senderEmail')" name="sender" :rules="[{ required: true, message: t('certd.pleaseEnterSenderEmail') }]">
                 <a-input v-model:value="formState.sender" />
+                <div class="helper">{{ t("certd.senderEmailHelper") }}</div>
               </a-form-item>
               <a-form-item :label="t('certd.useSsl')" name="secure">
                 <a-switch v-model:checked="formState.secure" />