Fix line number widths (#31341) (#31343)

Backport #31341 by silverwind

Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

diff --git a/web_src/css/base.css b/web_src/css/base.css
index 56425fb1a1d841c91b36972330d2e6619f44f337..067772ef592939121d5541148f8b0ce033760619 100644 (file)
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -1005,6 +1005,13 @@ overflow-menu .ui.label {
   padding: 0 8px;
   text-align: right !important;
   color: var(--color-text-light-2);
+  width: 1%; /* this apparently needs to be a percentage so that code column stretches in diffs */
+  min-width: 72px;
+  white-space: nowrap;
+}
+
+.code-diff .lines-num {
+  min-width: 50px;
 }
 
 .lines-num span.bottom-line::after {
@@ -1024,6 +1031,7 @@ overflow-menu .ui.label {
 
 .lines-type-marker {
   vertical-align: top;
+  white-space: nowrap;
 }
 
 .lines-num,
@@ -1056,6 +1064,7 @@ overflow-menu .ui.label {
 
 .lines-escape {
   width: 0;
+  white-space: nowrap;
 }
 
 .lines-code {

diff --git a/web_src/css/repo.css b/web_src/css/repo.css
index b5a73bc502d4b4a38d8a9cafad389350c8ec8e98..c79f0ae1cbeb7a6fc87aa5ee45eb010bc9b00c72 100644 (file)
--- a/web_src/css/repo.css
+++ b/web_src/css/repo.css
@@ -1555,8 +1555,6 @@ td .commit-summary {
 
 .repository .diff-file-box .file-body.file-code .lines-num {
   text-align: right;
-  width: 1%;
-  min-width: 50px;
 }
 
 .repository .diff-file-box .file-body.file-code .lines-num span.fold {
@@ -1582,12 +1580,6 @@ td .commit-summary {
   table-layout: fixed;
 }
 
-.repository .diff-file-box .code-diff tbody tr td.lines-num,
-.repository .diff-file-box .code-diff tbody tr td.lines-escape,
-.repository .diff-file-box .code-diff tbody tr td.lines-type-marker {
-  white-space: nowrap;
-}
-
 .repository .diff-file-box .code-diff tbody tr td.center {
   text-align: center;
 }