Skip to content

Clean up "file-view" related styles #34558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 4 additions & 43 deletions web_src/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -815,10 +815,6 @@ overflow-menu .ui.label {
display: block;
}

.code-view .lines-num span::after {
cursor: pointer;
}

.lines-type-marker {
vertical-align: top;
white-space: nowrap;
Expand Down Expand Up @@ -855,39 +851,13 @@ overflow-menu .ui.label {
.lines-escape {
width: 0;
white-space: nowrap;
padding: 0;
}

.lines-code {
padding-left: 5px;
}

.file-view tr.active {
color: inherit !important;
background: inherit !important;
}

.file-view tr.active .lines-num,
.file-view tr.active .lines-code {
background: var(--color-highlight-bg) !important;
}

.file-view tr.active:last-of-type .lines-code {
border-bottom-right-radius: var(--border-radius);
}

.file-view tr.active .lines-num {
position: relative;
}

.file-view tr.active .lines-num::before {
content: "";
position: absolute;
left: 0;
width: 2px;
height: 100%;
background: var(--color-highlight-fg);
}

.code-inner {
font: 12px var(--fonts-monospace);
white-space: pre-wrap;
Expand Down Expand Up @@ -938,28 +908,19 @@ overflow-menu .ui.label {
margin-right: 4px;
}

.top-line-blame {
tr.top-line-blame {
border-top: 1px solid var(--color-secondary);
}

.code-view tr.top-line-blame:first-of-type {
border-top: none;
tr.top-line-blame:first-of-type {
border-top: none; /* merge code lines belonging to the same commit into one block */
}

.lines-code .bottom-line,
.lines-commit .bottom-line {
border-bottom: 1px solid var(--color-secondary);
}

.code-view {
background: var(--color-code-bg);
border-radius: var(--border-radius);
}

.code-view table {
width: 100%;
}

.migrate .svg.gitea-git {
color: var(--color-git);
}
Expand Down
2 changes: 1 addition & 1 deletion web_src/css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
@import "./repo/issue-label.css";
@import "./repo/issue-list.css";
@import "./repo/list-header.css";
@import "./repo/linebutton.css";
@import "./repo/file-view.css";
@import "./repo/wiki.css";
@import "./repo/header.css";
@import "./repo/home.css";
Expand Down
12 changes: 10 additions & 2 deletions web_src/css/markup/content.css
Original file line number Diff line number Diff line change
Expand Up @@ -309,10 +309,18 @@
box-sizing: initial;
}

.file-view.markup {
padding: 1em 2em;
}

.file-view.markup:has(.file-not-rendered-prompt) {
padding: 0; /* let the file-not-rendered-prompt layout itself */
}

/* this background ensures images can break <hr>. We can only do this on
cases where the background is known and not transparent. */
.markup.file-view img,
.markup.file-view video,
.file-view.markup img,
.file-view.markup video,
.comment-body .markup img, /* regular comment */
.comment-body .markup video,
.comment-content .markup img, /* code comment */
Expand Down
15 changes: 0 additions & 15 deletions web_src/css/repo.css
Original file line number Diff line number Diff line change
Expand Up @@ -1238,21 +1238,6 @@ td .commit-summary {
white-space: nowrap;
}

.file-view.markup {
padding: 1em 2em;
}

.file-view.markup:has(.file-not-rendered-prompt) {
padding: 0; /* let the file-not-rendered-prompt layout itself */
}

.file-not-rendered-prompt {
padding: 1rem;
text-align: center;
font-size: 1rem !important; /* use consistent styles for various containers (code, markup, etc) */
line-height: var(--line-height-default) !important; /* same as above */
}

.repository .activity-header {
display: flex;
justify-content: space-between;
Expand Down
58 changes: 58 additions & 0 deletions web_src/css/repo/file-view.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
.file-view tr.active {
background: var(--color-highlight-bg);
}

.file-view tr.active:last-of-type .lines-code {
border-bottom-right-radius: var(--border-radius);
}

.file-view tr.active .lines-num {
position: relative;
}

.file-view tr.active .lines-num::before {
content: "";
position: absolute;
left: 0;
width: 2px;
height: 100%;
background: var(--color-highlight-fg);
}

.file-view .file-not-rendered-prompt {
padding: 1rem;
text-align: center;
font-size: 1rem !important; /* use consistent styles for various containers (code, markup, etc) */
line-height: var(--line-height-default) !important; /* same as above */
}

/* ".code-view" is always used with ".file-view", to show the code of a file */
.file-view.code-view {
background: var(--color-code-bg);
border-radius: var(--border-radius);
}

.file-view.code-view table {
width: 100%;
}

.file-view.code-view .lines-num span::after {
cursor: pointer;
}

.file-view.code-view .lines-num:hover {
color: var(--color-text-dark);
}

.file-view.code-view .ui.button.code-line-button {
border: 1px solid var(--color-secondary);
padding: 1px 4px;
margin: 0;
min-height: 0;
position: absolute;
left: 6px;
}

.file-view.code-view .ui.button.code-line-button:hover {
background: var(--color-secondary);
}
16 changes: 0 additions & 16 deletions web_src/css/repo/linebutton.css

This file was deleted.