Merge commit '99212ec78743317bf52063fb165b90fceb70de5e' into dev

# Conflicts: # admin/login.php
2023-10-03 11:16:04 +08:00
parent 438ac35487 99212ec787
commit b00a0ae06f
9 changed files with 18 additions and 18 deletions
@@ -16,8 +16,8 @@ include 'header.php';
        <h1><a href="https://typecho.org" class="i-logo">Typecho</a></h1>
        <form action="<?php $options->loginAction(); ?>" method="post" name="login" role="form">
            <p>
-                <label for="name" class="sr-only"><?php _e('用户名'); ?></label>
-                <input type="text" id="name" name="name" value="<?php echo $rememberName; ?>" placeholder="<?php _e('用户名'); ?>" class="text-l w-100" autofocus required />
+                <label for="name" class="sr-only"><?php _e('用户名或邮箱'); ?></label>
+                <input type="text" id="name" name="name" value="<?php echo $rememberName; ?>" placeholder="<?php _e('用户名或邮箱'); ?>" class="text-l w-100" autofocus />
            </p>
            <p>
                <label for="password" class="sr-only"><?php _e('密码'); ?></label>