Skip to content

Commit

Permalink
Fix line number widths (go-gitea#31341)
Browse files Browse the repository at this point in the history
Fixes regression
go-gitea#31307 (comment)

Table CSS is weird. A `auto` value does not work and causes the
regression while any pixel value causes another regression in diff where
the code lines do not stretch. Partially revert that PR and clean up
some related too-deep CSS selectors.

<img width="109" alt="Screenshot 2024-06-12 at 15 07 22"
src="https://github.com/go-gitea/gitea/assets/115237/756c5dea-44b8-49f9-8a08-acef68075f62">
<img width="119" alt="Screenshot 2024-06-12 at 15 07 43"
src="https://github.com/go-gitea/gitea/assets/115237/28ae1adc-118e-4016-8d09-033b9f1c9a6f">
<img width="151" alt="Screenshot 2024-06-12 at 15 07 07"
src="https://github.com/go-gitea/gitea/assets/115237/08db7ed9-de4e-405e-874d-c7ebe3082557">
<img width="141" alt="Screenshot 2024-06-12 at 15 07 14"
src="https://github.com/go-gitea/gitea/assets/115237/c4a5492b-1bf1-4773-bc8d-64eb36d823f9">
  • Loading branch information
silverwind authored and GiteaBot committed Jun 12, 2024
1 parent b1ad8cc commit 222b830
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
9 changes: 9 additions & 0 deletions web_src/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -1024,6 +1031,7 @@ overflow-menu .ui.label {

.lines-type-marker {
vertical-align: top;
white-space: nowrap;
}

.lines-num,
Expand Down Expand Up @@ -1056,6 +1064,7 @@ overflow-menu .ui.label {

.lines-escape {
width: 0;
white-space: nowrap;
}

.lines-code {
Expand Down
8 changes: 0 additions & 8 deletions web_src/css/repo.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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;
}
Expand Down

0 comments on commit 222b830

Please sign in to comment.