Skip to content

Commit 82575ed

Browse files
committed
Fix release list markup background
1 parent 95b46c8 commit 82575ed

File tree

4 files changed

+32
-26
lines changed

4 files changed

+32
-26
lines changed

templates/repo/wiki/pages.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<a href="{{$.RepoLink}}/wiki/{{.SubURL}}">{{.Name}}</a>
2222
</td>
2323
{{$timeSince := TimeSinceUnix .UpdatedUnix $.locale}}
24-
<td class="text right grey">{{$.locale.Tr "repo.wiki.last_updated" $timeSince | Safe}}</td>
24+
<td class="text right">{{$.locale.Tr "repo.wiki.last_updated" $timeSince | Safe}}</td>
2525
</tr>
2626
{{end}}
2727
</tbody>

templates/repo/wiki/view.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<p>{{.FormatWarning}}</p>
6666
</div>
6767
{{end}}
68-
<div class="ui {{if or .sidebarPresent .toc}}grid equal width{{end}}" style="margin-top: 1rem;">
68+
<div class="ui gt-mt-0 {{if or .sidebarPresent .toc}}grid equal width{{end}}">
6969
<div class="ui {{if or .sidebarPresent .toc}}eleven wide column{{end}} segment markup wiki-content-main">
7070
{{template "repo/unicode_escape_prompt" dict "EscapeStatus" .EscapeStatus "root" $}}
7171
{{.content | Safe}}

web_src/css/markup/content.css

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,6 @@
33
font-size: 16px;
44
line-height: 1.5 !important;
55
word-wrap: break-word;
6-
background: var(--color-box-body);
7-
}
8-
9-
.markup.ui.segment {
10-
padding: 3em;
11-
}
12-
13-
.markup.file-view {
14-
padding: 2em !important;
156
}
167

178
.markup > *:first-child {
@@ -309,6 +300,14 @@
309300
.markup img {
310301
max-width: 100%;
311302
box-sizing: initial;
303+
}
304+
305+
/* this background ensures images can break <hr>. We can only do this on
306+
cases where the background is known and not transparent. */
307+
.markup.file-view img,
308+
.comment-body .markup img, /* regular comment */
309+
.comment-content .markup img, /* code comment */
310+
.wiki .markup img {
312311
background: var(--color-box-body);
313312
}
314313

web_src/css/repository.css

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -544,6 +544,10 @@
544544
margin: 0;
545545
}
546546

547+
.repository .comment textarea {
548+
max-height: none !important;
549+
}
550+
547551
.repository.new.issue .comment.form .comment .avatar {
548552
width: 3em;
549553
}
@@ -965,10 +969,6 @@
965969
max-width: 100%;
966970
}
967971

968-
.repository.view.issue .comment-list .ui.comments .avatar {
969-
margin-right: 0.5rem;
970-
}
971-
972972
.repository.view.issue .comment-list .comment > .content > div:first-child {
973973
border-top-left-radius: 4px;
974974
border-top-right-radius: 4px;
@@ -1093,6 +1093,14 @@
10931093
margin-left: 36px;
10941094
}
10951095

1096+
.repository.view.issue .comment-list .comment > .avatar {
1097+
margin-top: 6px;
1098+
}
1099+
1100+
.repository.view.issue .comment-list .comment > .avatar ~ .content {
1101+
margin-left: 3em;
1102+
}
1103+
10961104
.repository.view.issue .comment-list .code-comment img.avatar,
10971105
.repository.view.issue .comment-list .comment img.avatar {
10981106
width: 28px;
@@ -2092,17 +2100,17 @@
20922100
height: 48px;
20932101
}
20942102

2095-
.repository.wiki.view > .markup {
2096-
padding: 15px 30px;
2103+
.repository.wiki.new .ui.attached.tabular.menu.previewtabs {
2104+
margin-bottom: 15px;
20972105
}
20982106

2099-
.repository.wiki.view > .markup h1:first-of-type,
2100-
.repository.wiki.view > .markup h2:first-of-type,
2101-
.repository.wiki.view > .markup h3:first-of-type,
2102-
.repository.wiki.view > .markup h4:first-of-type,
2103-
.repository.wiki.view > .markup h5:first-of-type,
2104-
.repository.wiki.view > .markup h6:first-of-type {
2105-
margin-top: 0;
2107+
.file-view.markup {
2108+
padding: 1em 2em;
2109+
}
2110+
2111+
.wiki-content-main {
2112+
padding: 1em 2em !important;
2113+
margin-left: 1em !important;
21062114
}
21072115

21082116

@@ -2730,11 +2738,10 @@
27302738
width: 100% !important;
27312739
max-width: 100% !important;
27322740
margin: 0 !important;
2733-
padding: 0 !important;
2741+
padding: 1em;
27342742
}
27352743

27362744
.comment-body .markup {
2737-
padding: 1em;
27382745
border-radius: 0 0 var(--border-radius) var(--border-radius); /* don't render outside box */
27392746
}
27402747

0 commit comments

Comments
 (0)