From 95dfd945bc03510064038ae93f381b2b96bda3b0 Mon Sep 17 00:00:00 2001
From: Giteabot <teabot@gitea.io>
Date: Thu, 13 Jun 2024 08:13:35 +0800
Subject: [PATCH] Fix line number widths (#31341) (#31343)
Backport #31341 by silverwind
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
---
web_src/css/base.css | 9 +++++++++
web_src/css/repo.css | 8 --------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/web_src/css/base.css b/web_src/css/base.css
index 56425fb1a1..067772ef59 100644
--- 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 b5a73bc502..c79f0ae1cb 100644
--- 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;
}