Skip to content

Commit efc49bd

Browse files
committed
remove code sidebar, remove 1 var and introduce 2
1 parent d89a01d commit efc49bd

File tree

5 files changed

+27
-20
lines changed

5 files changed

+27
-20
lines changed

templates/repo/blame.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
</td>
5454
<td class="lines-blame-btn">
5555
{{if $row.PreviousSha}}
56-
<a href="{{$row.PreviousShaURL}}" data-tooltip-content='{{ctx.Locale.Tr "repo.blame_prior"}}'>
56+
<a role="button" class="muted" href="{{$row.PreviousShaURL}}" data-tooltip-content='{{ctx.Locale.Tr "repo.blame_prior"}}'>
5757
{{svg "octicon-versions"}}
5858
</a>
5959
{{end}}

web_src/css/base.css

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1421,7 +1421,6 @@ a.ui.active.label:hover {
14211421
padding-left: 10px;
14221422
padding-right: 10px;
14231423
text-align: right !important;
1424-
background-color: var(--color-code-sidebar-bg);
14251424
width: 2%;
14261425
}
14271426

@@ -1483,22 +1482,30 @@ a.ui.active.label:hover {
14831482
}
14841483

14851484
.lines-code {
1486-
background-color: var(--color-code-bg);
14871485
padding-left: 5px;
14881486
}
14891487

1490-
.file-view tr.active,
1488+
.file-view tr.active {
1489+
color: inherit !important;
1490+
background: inherit !important;
1491+
}
1492+
1493+
.file-view tr.active .lines-num,
14911494
.file-view tr.active .lines-code {
1492-
background: var(--color-active-line) !important;
1495+
background: var(--color-highlight-bg) !important;
14931496
}
14941497

1495-
.blame .lines-num {
1496-
padding: 0 !important;
1497-
background-color: var(--color-code-sidebar-bg);
1498+
.file-view tr.active .lines-num {
1499+
position: relative;
14981500
}
14991501

1500-
.blame .lines-code {
1501-
padding: 0 !important;
1502+
.file-view tr.active .lines-num:before {
1503+
content: '';
1504+
position: absolute;
1505+
left: 0;
1506+
width: 2px;
1507+
height: 100%;
1508+
background: var(--color-highlight-fg);
15021509
}
15031510

15041511
.code-inner {
@@ -1518,7 +1525,6 @@ a.ui.active.label:hover {
15181525
vertical-align: top;
15191526
color: var(--color-text-light-2);
15201527
padding: 0 !important;
1521-
background: var(--color-code-sidebar-bg);
15221528
width: 1%;
15231529
}
15241530

@@ -1568,6 +1574,11 @@ a.ui.active.label:hover {
15681574
border-bottom: 1px solid var(--color-secondary);
15691575
}
15701576

1577+
.code-view {
1578+
background: var(--color-code-bg);
1579+
border-radius: var(--border-radius);
1580+
}
1581+
15711582
.code-view table {
15721583
width: 100%;
15731584
}

web_src/css/chroma/base.css

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
.chroma {
2-
background-color: var(--color-code-bg);
3-
}
4-
51
/* LineTableTD */
62
.chroma .lntd {
73
vertical-align: top;

web_src/css/themes/theme-gitea-dark.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,7 @@
207207
--color-markup-table-row: #e8e8ff06;
208208
--color-markup-code-block: #e8e8ff16;
209209
--color-button: #151a1e;
210-
--color-code-bg: #101315;
211-
--color-code-sidebar-bg: #1b1f22;
210+
--color-code-bg: #121518;
212211
--color-shadow: #00001758;
213212
--color-secondary-bg: #2f3138;
214213
--color-expand-button: #2b353e;
@@ -233,7 +232,8 @@
233232
--color-label-active-bg: #73828eff;
234233
--color-accent: var(--color-primary-light-1);
235234
--color-small-accent: var(--color-primary-light-5);
236-
--color-active-line: #39301e;
235+
--color-highlight-fg: #877147;
236+
--color-highlight-bg: #39301e;
237237
--color-overlay-backdrop: #080808c0;
238238
accent-color: var(--color-accent);
239239
color-scheme: dark;

web_src/css/themes/theme-gitea-light.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@
208208
--color-markup-code-block: #00001710;
209209
--color-button: #f8f9fb;
210210
--color-code-bg: #fafdff;
211-
--color-code-sidebar-bg: #f2f5f8;
212211
--color-shadow: #00001726;
213212
--color-secondary-bg: #f2f5f8;
214213
--color-expand-button: #cfe8fa;
@@ -233,7 +232,8 @@
233232
--color-label-active-bg: #949da6ff;
234233
--color-accent: var(--color-primary-light-1);
235234
--color-small-accent: var(--color-primary-light-6);
236-
--color-active-line: #fffbdd;
235+
--color-highlight-fg: #eed200;
236+
--color-highlight-bg: #fffbdd;
237237
--color-overlay-backdrop: #080808c0;
238238
accent-color: var(--color-accent);
239239
color-scheme: light;

0 commit comments

Comments
 (0)