Merge branch 'main' into lunny/batch_interface

Author: lunny

routers/web/repo/blame.go

@@ -271,7 +271,7 @@ func renderBlame(ctx *context.Context, blameParts []*gitrepo.BlamePart, commitNa
 	unsafeLines := highlight.UnsafeSplitHighlightedLines(highlighted)
 	for i, br := range rows {
 		var line template.HTML
-		if i < len(rows) {
+		if i < len(unsafeLines) {
 			line = template.HTML(util.UnsafeBytesToString(unsafeLines[i]))
 		}
 		br.EscapeStatus, br.Code = charset.EscapeControlHTML(line, ctx.Locale)

web_src/css/features/captcha.css

@@ -0,0 +1,33 @@
+.m-captcha-style {
+  width: 100%;
+  height: 5em;
+  vertical-align: middle;
+  display: inline-block;
+}
+
+@media (min-width: 768px) {
+  .g-recaptcha-style,
+  .h-captcha-style {
+    margin: 0 auto !important;
+    width: 304px;
+    padding-left: 30px;
+  }
+  .g-recaptcha-style iframe,
+  .h-captcha-style iframe {
+    border-radius: var(--border-radius) !important;
+    width: 302px !important;
+    height: 76px !important;
+  }
+  .m-captcha-style {
+    max-width: 450px;
+  }
+}
+
+@media (max-height: 575px) {
+  #rc-imageselect, /* google recaptcha */
+  .g-recaptcha-style,
+  .h-captcha-style {
+    transform: scale(0.77);
+    transform-origin: 0 0;
+  }
+}

web_src/css/form.css

@@ -19,6 +19,7 @@
 @import "./modules/dimmer.css";
 @import "./modules/modal.css";
 @import "./modules/tab.css";
+@import "./modules/form.css";
 
 @import "./modules/tippy.css";
 @import "./modules/breadcrumb.css";
@@ -42,6 +43,7 @@
 @import "./features/expander.css";
 @import "./features/cropper.css";
 @import "./features/console.css";
+@import "./features/captcha.css";
 
 @import "./markup/content.css";
 @import "./markup/codecopy.css";
@@ -54,7 +56,6 @@
 @import "./base.css";
 @import "./home.css";
 @import "./install.css";
-@import "./form.css";
 
 @import "./repo.css";
 @import "./repo/release-tag.css";