Merge branch 'main' into fix-race-in-virtual-session-provider

go-gitea · Sep 12, 2021 · 9905904 · 9905904
2 parents 0a9e880 + aac7f68
commit 9905904
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/templates/mail/auth/reset_passwd.tmpl b/templates/mail/auth/reset_passwd.tmpl
@@ -9,7 +9,7 @@
 <body>
 	<p>{{.i18n.Tr "mail.hi_user_x" .DisplayName | Str2html}}</p><br>
 	<p>{{.i18n.Tr "mail.reset_password.text" .ResetPwdCodeLives | Str2html}}</p><p><a href="{{$recover_url}}">{{$recover_url}}</a></p><br>
-	<p>{{.i18n.Tr "mail.link_not_working_do_paste" .DisplayName AppName | Str2html}}</p>
+	<p>{{.i18n.Tr "mail.link_not_working_do_paste"}}</p>
 
 	<p>© <a target="_blank" rel="noopener noreferrer" href="{{AppUrl}}">{{AppName}}</a></p>
 </body>

diff --git a/web_src/less/_dashboard.less b/web_src/less/_dashboard.less
@@ -16,6 +16,9 @@
 
       .item {
         text-align: left;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
 
         .text {
           height: 16px;