Skip to content

Commit 4c2564e

Browse files
shuashuaishuashuai
committed
update: update html templates
1 parent 5ad9780 commit 4c2564e

File tree

3 files changed

+34
-55
lines changed

3 files changed

+34
-55
lines changed

‎ui/template/header.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@
144144
<div id="protect-browser"></div>
145145
</div>
146146

147-
<nav id="header" class="sticky-top theme-colored navbar navbar-expand-lg navbar-dark">
147+
<nav id="header" class="sticky-top theme-dark navbar navbar-expand-xl navbar-light">
148148
<div class="w-100 d-flex align-items-center px-3">
149149
<button
150150
aria-controls="navBarContent"
@@ -192,7 +192,7 @@
192192
<div class="position-sticky px-3 border-end pt-4 d-none d-xl-block" id="pcSideNav">
193193
{{template "sidenav" . }}
194194
</div>
195-
<div class="flex-fill w-100">
195+
<div class="flex-fill w-100 overflow-x-hidden">
196196
{{end}}
197197
</div>
198198
</div>

‎ui/template/question-detail.html‎

Lines changed: 31 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,36 @@ <h1 class="h3 mb-3 text-wrap text-break">
3232
{{end}}
3333
</h1>
3434
<div
35-
class="d-flex flex-wrap align-items-center small mb-3 text-secondary">
36-
<time class="me-3"
35+
class="d-flex flex-wrap align-items-center small mb-4 text-secondary border-bottom pb-3">
36+
<div class="d-flex align-items-center text-secondary me-3">
37+
<a class="d-flex align-items-center" href="{{$.baseURL}}/users/{{.detail.UserInfo.Username}}">
38+
<img
39+
src="{{.detail.UserInfo.Avatar}}"
40+
width="24px" height="24px"
41+
class="rounded me-1"
42+
alt=""/>
43+
<span class="me-1 name-ellipsis" style="max-width: 300px;">{{.detail.UserInfo.DisplayName}}</span>
44+
</a>
45+
<span class="fw-bold" title="Reputation">{{.detail.UserInfo.Rank}}</span>
46+
</div>
47+
<time class="me-3 link-secondary"
3748
datetime="{{timeFormatISO $.timezone .detail.CreateTime}}"
38-
title="{{translatorTimeFormatLongDate $.language $.timezone .detail.CreateTime}}">{{translator $.language "ui.question_detail.Asked"}} {{translatorTimeFormat $.language $.timezone .detail.CreateTime}}
49+
title="{{translatorTimeFormatLongDate $.language $.timezone .detail.CreateTime}}">{{translator $.language "ui.question_detail.created"}} {{translatorTimeFormat $.language $.timezone .detail.CreateTime}}
3950
</time>
40-
<time class="me-3"
41-
datetime="{{timeFormatISO $.timezone .detail.UpdateTime}}"
42-
title="{{translatorTimeFormatLongDate $.language $.timezone .detail.UpdateTime}}">{{translator $.language "ui.question_detail.update"}} {{translatorTimeFormat $.language $.timezone .detail.UpdateTime}}
51+
<time class="me-3 link-secondary"
52+
datetime="{{timeFormatISO $.timezone .detail.EditTime}}"
53+
title="{{translatorTimeFormatLongDate $.language $.timezone .detail.EditTime}}">{{translator $.language "ui.question_detail.Edited"}} {{translatorTimeFormat $.language $.timezone .detail.EditTime}}
4354
</time>
4455
<div class="me-3">{{translator $.language "ui.question_detail.Views"}} {{.detail.ViewCount}}</div>
56+
<button type="button" class="p-0 btn-no-border btn btn-link btn-sm">{{translator $.language "ui.question_detail.Follow"}}</button>
57+
</div>
4558

59+
<div class="img-viewer">
60+
<article class="fmt text-break text-wrap last-p mt-4">
61+
{{formatLinkNofollow .detail.HTML}}
62+
</article>
4663
</div>
64+
4765
<div class="m-n1">
4866
{{range .detail.Tags}}
4967
<a href="{{$.baseURL}}/tags/{{.SlugName}}"
@@ -52,11 +70,7 @@ <h1 class="h3 mb-3 text-wrap text-break">
5270
</a>
5371
{{end}}
5472
</div>
55-
<div class="img-viewer">
56-
<article class="fmt text-break text-wrap mt-4">
57-
{{formatLinkNofollow .detail.HTML}}
58-
</article>
59-
</div>
73+
6074
<div class="mt-4">
6175
<div role="group" class="btn-group">
6276
<button type="button" class="btn btn-outline-secondary">
@@ -73,50 +87,15 @@ <h1 class="h3 mb-3 text-wrap text-break">
7387
<i class="br bi-bookmark-fill"></i><span style="padding-left: 10px">{{.detail.CollectionCount}}</span>
7488
</button>
7589
</div>
76-
<div class="d-block d-md-flex flex-wrap mt-4 mb-3">
77-
<div class="mb-3 mb-md-0 me-4 flex-grow-1">
7890

91+
<div class="mt-4">
92+
<div class="d-flex flex-wrap justify-content-between align-items-center"><div class="d-flex flex-wrap"><button type="button" class="rounded-pill me-2 link-secondary btn-reaction btn btn-light btn-sm"><i class="br bi-chat-text-fill"></i><span class="ms-1">Add comment</span></button><button type="button" aria-label="add or remove reactions" aria-haspopup="true" class="smile-btn rounded-pill link-secondary btn-reaction btn btn-light btn-sm"><i class="br bi-emoji-smile-fill"></i><span class="ms-1">+</span></button></div><div class="md-show align-items-center"><div class="dropdown"><a class="no-toggle pointer d-flex link-secondary small dropdown-toggle" id="dropdown-share" aria-expanded="false" style="line-height: 23px;">{{translator $.language "ui.share.name"}}</a></div></div><div class="md-hide"></div></div>
93+
94+
<div class="comments-wrap">
95+
{{template "comment" (wrapComments (index $.comments $.detail.ID) $.language $.timezone)}}
7996
</div>
80-
<div class="mb-3 me-4 mb-md-0" style="min-width: 196px;">
81-
<a href="{{$.baseURL}}/posts/{{.detail.ID}}/timeline">
82-
<time class="link-secondary small"
83-
datetime="{{timeFormatISO $.timezone .detail.UpdateTime}}"
84-
title="{{translatorTimeFormatLongDate $.language $.timezone .detail.UpdateTime}}">
85-
{{translator $.language "ui.question_detail.edit"}} {{translatorTimeFormat $.language $.timezone .detail.UpdateTime}}
86-
</time>
87-
</a>
88-
</div>
89-
<div style="min-width: 196px;">
90-
<div class="d-flex">
91-
<a href="{{$.baseURL}}/users/{{.detail.UserInfo.Username}}"><img
92-
src="{{.detail.UserInfo.Avatar}}"
93-
width="40px" height="40px"
94-
class="rounded me-2 d-none d-md-block"
95-
alt=""/><img
96-
src="{{.detail.UserInfo.Avatar}}"
97-
width="24px" height="24px"
98-
class="rounded me-2 d-block d-md-none"
99-
alt=""/></a>
100-
<div
101-
class="small text-secondary d-flex flex-row flex-md-column align-items-center align-items-md-start">
102-
<div class="me-1 me-md-0">
103-
<a class="me-1 text-break"
104-
href="{{$.baseURL}}/users/{{.detail.UserInfo.Username}}">{{.detail.UserInfo.DisplayName}}</a><span
105-
class="fw-bold" title="Reputation">{{.detail.UserInfo.Rank}}</span>
106-
</div>
107-
<a href="{{$.baseURL}}/posts/{{.detail.ID}}/timeline">
108-
<time class="link-secondary"
109-
datetime="{{timeFormatISO $.timezone .detail.CreateTime}}"
110-
title="{{translatorTimeFormatLongDate $.language $.timezone .detail.CreateTime}}">{{translator $.language "ui.question_detail.asked"}} {{translatorTimeFormat $.language $.timezone .detail.CreateTime}}
111-
</time>
112-
</a>
113-
</div>
114-
</div>
115-
</div>
116-
</div>
117-
<div class="comments-wrap">
118-
{{template "comment" (wrapComments (index $.comments $.detail.ID) $.language $.timezone)}}
11997
</div>
98+
12099
</div>
121100
<div class="d-flex align-items-center justify-content-between mt-5 mb-3"
122101
id="answerHeader">

‎ui/template/question.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<div class="d-flex justify-content-center px-0 px-md-4">
2323
<div class="answer-container">
2424
<div class="pt-4 mb-5 row">
25-
<div class="page-main flex-auto col">
25+
<div class="page-main flex-auto overflow-x-hidden col">
2626
<div>
2727
<div class="mb-3 d-flex flex-wrap justify-content-between">
2828
<h5 class="fs-5 text-nowrap mb-3 mb-md-0">

0 commit comments

Comments
 (0)