merge with resolved conflict

web_src/css/base.css

@@ -278,6 +278,7 @@ a {
 
 a:hover {
   text-decoration-line: underline;
+  text-underline-position: under; /* necessary for CJK fonts, otherwise, default "auto" makes the underline cross-over the CJK text bottom */
 }
 
 /* a = always colored, underlined on hover */
@@ -848,6 +849,7 @@ table th[data-sortt-desc] .svg {
 }
 
 /* this is useful to make a left-right (e.g.: title .... operations) layout with default gap, and it wrap for small widths */
+.ui.modal .header.flex-left-right,
 .flex-left-right {
   display: flex;
   flex-wrap: wrap;

web_src/css/modules/label.css

@@ -39,25 +39,16 @@ a.ui.label {
   height: 2.1666em;
 }
 
-.ui.label > .color-icon {
-  margin-left: 0;
-}
-
 .ui.label > .icon {
   width: auto;
   margin: 0 0.75em 0 0;
 }
 
 .ui.label > .detail {
-  display: inline-block;
-  vertical-align: top;
   font-weight: var(--font-weight-medium);
-  margin-left: 1em;
+  margin-left: 0.5em; /* our .ui.label already provides flex gap, so the margin here shouldn't be too large */
   opacity: 0.8;
 }
-.ui.label > .detail .icon {
-  margin: 0 0.25em 0 0;
-}
 
 .ui.label > .close.icon,
 .ui.label > .delete.icon {

web_src/css/modules/toast.css

@@ -22,6 +22,10 @@
   overflow-wrap: anywhere;
 }
 
+.toast-body pre {
+  white-space: pre-wrap; /* online editor, when git hook fails, the rendered message uses "pre" */
+}
+
 .toast-close {
   border-radius: var(--border-radius);
   width: 30px;

web_src/css/repo.css

@@ -1855,8 +1855,10 @@ tbody.commit-list {
   width: 100%;
 }
 
-.commit-status-item {
+.commit-status-item { /* the item can be used at 2 places: PR's merge box (commit-status-list), commit's status popup (no commit-status-list) */
   height: 40px;
+  padding-top: 0 !important; /* use "height" + "align items center", don't use padding-y (from the list container) to layout */
+  padding-bottom: 0 !important;
   display: flex;
   gap: var(--gap-block);
   align-items: center;