From 11da8740ba7f5889f919f10d411fcb948f39e190 Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Thu, 12 Oct 2023 12:32:33 +0200
Subject: [PATCH 1/2] Fix required checkboxes in issue forms

---
 templates/repo/issue/fields/checkboxes.tmpl | 11 +++++++----
 web_src/css/form.css                        |  4 ++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/templates/repo/issue/fields/checkboxes.tmpl b/templates/repo/issue/fields/checkboxes.tmpl
index 035ad8e539d1a..1078af3fc54dd 100644
--- a/templates/repo/issue/fields/checkboxes.tmpl
+++ b/templates/repo/issue/fields/checkboxes.tmpl
@@ -1,11 +1,14 @@
 <div class="field">
 	{{template "repo/issue/fields/header" .}}
 	{{range $i, $opt := .item.Attributes.options}}
-		<div class="field">
-			<div class="ui checkbox">
-				<input type="checkbox" name="form-field-{{$.item.ID}}-{{$i}}" {{if $opt.required}}readonly checked{{end}}>
-				<label>{{$opt.label}}</label>
+		<div class="field inline">
+			<div class="ui checkbox no-right-margin">
+				<input type="checkbox" name="form-field-{{$.item.ID}}-{{$i}}" {{if $opt.required}}required{{end}}>
+				<label>{{RenderMarkdownToHtml $.context $opt.label}}</label>
 			</div>
+			{{if $opt.required}}
+				<label class="required"></label>
+			{{end}}
 		</div>
 	{{end}}
 </div>
diff --git a/web_src/css/form.css b/web_src/css/form.css
index e4efa349486e0..ef51e2c2ca020 100644
--- a/web_src/css/form.css
+++ b/web_src/css/form.css
@@ -544,3 +544,7 @@ textarea:focus,
     width: 100% !important;
   }
 }
+
+.no-right-margin {
+  margin-right: 0px !important;
+}

From c993dcf73d79258b561e5090fa1a53f48ea48d65 Mon Sep 17 00:00:00 2001
From: JakobDev <jakobdev@gmx.de>
Date: Thu, 12 Oct 2023 16:20:45 +0200
Subject: [PATCH 2/2] Use gt-mr-0

---
 templates/repo/issue/fields/checkboxes.tmpl | 2 +-
 web_src/css/form.css                        | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/templates/repo/issue/fields/checkboxes.tmpl b/templates/repo/issue/fields/checkboxes.tmpl
index 1078af3fc54dd..237f2eb5dd937 100644
--- a/templates/repo/issue/fields/checkboxes.tmpl
+++ b/templates/repo/issue/fields/checkboxes.tmpl
@@ -2,7 +2,7 @@
 	{{template "repo/issue/fields/header" .}}
 	{{range $i, $opt := .item.Attributes.options}}
 		<div class="field inline">
-			<div class="ui checkbox no-right-margin">
+			<div class="ui checkbox gt-mr-0">
 				<input type="checkbox" name="form-field-{{$.item.ID}}-{{$i}}" {{if $opt.required}}required{{end}}>
 				<label>{{RenderMarkdownToHtml $.context $opt.label}}</label>
 			</div>
diff --git a/web_src/css/form.css b/web_src/css/form.css
index ef51e2c2ca020..e4efa349486e0 100644
--- a/web_src/css/form.css
+++ b/web_src/css/form.css
@@ -544,7 +544,3 @@ textarea:focus,
     width: 100% !important;
   }
 }
-
-.no-right-margin {
-  margin-right: 0px !important;
-}