Skip to content

Commit d63aca0

Browse files
kerwin612kerwin612
committed
fix
1 parent b1efeae commit d63aca0

File tree

6 files changed

+35
-35
lines changed

6 files changed

+35
-35
lines changed

‎templates/repo/commits_list_group_by_date.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{$index := 0}}
22
{{range .GroupCommits}}
33
{{$index = Eval $index "+" 1}}
4-
<div class="ui timeline commits_list_group_by_date" data-index="{{$index}}">
4+
<div class="ui timeline commits-list-group-by-date" data-index="{{$index}}">
55

66
<div class="timeline-badge-wrapper">
77
<div class="timeline-badge">

‎templates/repo/commits_table.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
{{end}}
3131

3232
{{if and .GroupCommits (gt .CommitCount 0)}}
33-
{{template "repo/commits_list_group_by_date" .}}
33+
{{template "repo/commits-list-group-by-date" .}}
3434
{{end}}
3535

3636
{{template "base/paginate" .}}

‎tests/integration/pull_status_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func TestPullCreate_CommitStatus(t *testing.T) {
4545
doc := NewHTMLParser(t, resp.Body)
4646

4747
// Get first commit URL
48-
commitURL, exists := doc.doc.Find(".timeline.commits_list_group_by_date .commit_sign_badge a").Last().Attr("href")
48+
commitURL, exists := doc.doc.Find(".timeline.commits-list-group-by-date .commit_sign_badge a").Last().Attr("href")
4949
assert.True(t, exists)
5050
assert.NotEmpty(t, commitURL)
5151

@@ -83,12 +83,12 @@ func TestPullCreate_CommitStatus(t *testing.T) {
8383
resp = session.MakeRequest(t, req, http.StatusOK)
8484
doc = NewHTMLParser(t, resp.Body)
8585

86-
commitURL, exists = doc.doc.Find(".timeline.commits_list_group_by_date .commit_sign_badge a").Last().Attr("href")
86+
commitURL, exists = doc.doc.Find(".timeline.commits-list-group-by-date .commit_sign_badge a").Last().Attr("href")
8787
assert.True(t, exists)
8888
assert.NotEmpty(t, commitURL)
8989
assert.Equal(t, commitID, path.Base(commitURL))
9090

91-
cls, ok := doc.doc.Find(".timeline.commits_list_group_by_date .description .commit-status").Last().Attr("class")
91+
cls, ok := doc.doc.Find(".timeline.commits-list-group-by-date .description .commit-status").Last().Attr("class")
9292
assert.True(t, ok)
9393
assert.Contains(t, cls, statesIcons[status])
9494
}

‎tests/integration/repo_commits_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func TestRepoCommits(t *testing.T) {
3333
resp := session.MakeRequest(t, req, http.StatusOK)
3434

3535
doc := NewHTMLParser(t, resp.Body)
36-
commitURL, exists := doc.doc.Find(".timeline.commits_list_group_by_date .commit_sign_badge .commit-id-short").Attr("href")
36+
commitURL, exists := doc.doc.Find(".timeline.commits-list-group-by-date .commit_sign_badge .commit-id-short").Attr("href")
3737
assert.True(t, exists)
3838
assert.NotEmpty(t, commitURL)
3939
}
@@ -50,7 +50,7 @@ func Test_ReposGitCommitListNotMaster(t *testing.T) {
5050

5151
doc := NewHTMLParser(t, resp.Body)
5252
commits := []string{}
53-
doc.doc.Find(".timeline.commits_list_group_by_date .commit_sign_badge .commit-id-short").Each(func(i int, s *goquery.Selection) {
53+
doc.doc.Find(".timeline.commits-list-group-by-date .commit_sign_badge .commit-id-short").Each(func(i int, s *goquery.Selection) {
5454
commitURL, exists := s.Attr("href")
5555
assert.True(t, exists)
5656
assert.NotEmpty(t, commitURL)
@@ -63,7 +63,7 @@ func Test_ReposGitCommitListNotMaster(t *testing.T) {
6363
assert.Equal(t, "5099b81332712fe655e34e8dd63574f503f61811", commits[2])
6464

6565
userNames := []string{}
66-
doc.doc.Find(".timeline.commits_list_group_by_date .description .author-wrapper").Each(func(i int, s *goquery.Selection) {
66+
doc.doc.Find(".timeline.commits-list-group-by-date .description .author-wrapper").Each(func(i int, s *goquery.Selection) {
6767
userPath, exists := s.Attr("href")
6868
assert.True(t, exists)
6969
assert.NotEmpty(t, userPath)
@@ -87,7 +87,7 @@ func doTestRepoCommitWithStatus(t *testing.T, state string, classes ...string) {
8787

8888
doc := NewHTMLParser(t, resp.Body)
8989
// Get first commit URL
90-
commitURL, exists := doc.doc.Find(".timeline.commits_list_group_by_date .commit_sign_badge .commit-id-short").Attr("href")
90+
commitURL, exists := doc.doc.Find(".timeline.commits-list-group-by-date .commit_sign_badge .commit-id-short").Attr("href")
9191
assert.True(t, exists)
9292
assert.NotEmpty(t, commitURL)
9393

@@ -105,7 +105,7 @@ func doTestRepoCommitWithStatus(t *testing.T, state string, classes ...string) {
105105

106106
doc = NewHTMLParser(t, resp.Body)
107107
// Check if commit status is displayed in message column (.tippy-target to ignore the tippy trigger)
108-
sel := doc.doc.Find(".timeline.commits_list_group_by_date .description .tippy-target .commit-status")
108+
sel := doc.doc.Find(".timeline.commits-list-group-by-date .description .tippy-target .commit-status")
109109
assert.Equal(t, 1, sel.Length())
110110
for _, class := range classes {
111111
assert.True(t, sel.HasClass(class))
@@ -181,7 +181,7 @@ func TestRepoCommitsStatusParallel(t *testing.T) {
181181

182182
doc := NewHTMLParser(t, resp.Body)
183183
// Get first commit URL
184-
commitURL, exists := doc.doc.Find(".timeline.commits_list_group_by_date .commit_sign_badge .commit-id-short").Attr("href")
184+
commitURL, exists := doc.doc.Find(".timeline.commits-list-group-by-date .commit_sign_badge .commit-id-short").Attr("href")
185185
assert.True(t, exists)
186186
assert.NotEmpty(t, commitURL)
187187

@@ -216,7 +216,7 @@ func TestRepoCommitsStatusMultiple(t *testing.T) {
216216

217217
doc := NewHTMLParser(t, resp.Body)
218218
// Get first commit URL
219-
commitURL, exists := doc.doc.Find(".timeline.commits_list_group_by_date .commit_sign_badge .commit-id-short").Attr("href")
219+
commitURL, exists := doc.doc.Find(".timeline.commits-list-group-by-date .commit_sign_badge .commit-id-short").Attr("href")
220220
assert.True(t, exists)
221221
assert.NotEmpty(t, commitURL)
222222

@@ -241,6 +241,6 @@ func TestRepoCommitsStatusMultiple(t *testing.T) {
241241

242242
doc = NewHTMLParser(t, resp.Body)
243243
// Check that the data-global-init="initCommitStatuses" (for trigger) and commit-status (svg) are present
244-
sel := doc.doc.Find(`.timeline.commits_list_group_by_date .description [data-global-init="initCommitStatuses"] .commit-status`)
244+
sel := doc.doc.Find(`.timeline.commits-list-group-by-date .description [data-global-init="initCommitStatuses"] .commit-status`)
245245
assert.Equal(t, 1, sel.Length())
246246
}

‎tests/integration/view_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ func TestCommitListActions(t *testing.T) {
4848
resp := session.MakeRequest(t, req, http.StatusOK)
4949
htmlDoc := NewHTMLParser(t, resp.Body)
5050

51-
AssertHTMLElement(t, htmlDoc, `.timeline.commits_list_group_by_date .copy-commit-id`, true)
52-
AssertHTMLElement(t, htmlDoc, `.timeline.commits_list_group_by_date .view-single-diff`, false)
53-
AssertHTMLElement(t, htmlDoc, `.timeline.commits_list_group_by_date .view-commit-path`, true)
51+
AssertHTMLElement(t, htmlDoc, `.timeline.commits-list-group-by-date .copy-commit-id`, true)
52+
AssertHTMLElement(t, htmlDoc, `.timeline.commits-list-group-by-date .view-single-diff`, false)
53+
AssertHTMLElement(t, htmlDoc, `.timeline.commits-list-group-by-date .view-commit-path`, true)
5454
})
5555

5656
t.Run("RepoFileHistory", func(t *testing.T) {
@@ -60,8 +60,8 @@ func TestCommitListActions(t *testing.T) {
6060
resp := session.MakeRequest(t, req, http.StatusOK)
6161
htmlDoc := NewHTMLParser(t, resp.Body)
6262

63-
AssertHTMLElement(t, htmlDoc, `.timeline.commits_list_group_by_date .copy-commit-id`, true)
64-
AssertHTMLElement(t, htmlDoc, `.timeline.commits_list_group_by_date .view-single-diff`, true)
65-
AssertHTMLElement(t, htmlDoc, `.timeline.commits_list_group_by_date .view-commit-path`, true)
63+
AssertHTMLElement(t, htmlDoc, `.timeline.commits-list-group-by-date .copy-commit-id`, true)
64+
AssertHTMLElement(t, htmlDoc, `.timeline.commits-list-group-by-date .view-single-diff`, true)
65+
AssertHTMLElement(t, htmlDoc, `.timeline.commits-list-group-by-date .view-commit-path`, true)
6666
})
6767
}

‎web_src/css/repo.css‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2280,18 +2280,18 @@ tbody.commit-list {
22802280
height: 4em;
22812281
}
22822282

2283-
.commits_list_group_by_date.timeline {
2283+
.commits-list-group-by-date.timeline {
22842284
display: flex;
22852285
margin-left: 16px;
22862286
position: relative;
22872287
padding-bottom: 6px;
22882288
}
22892289

2290-
.commits_list_group_by_date.timeline[data-index="1"] {
2290+
.commits-list-group-by-date.timeline[data-index="1"] {
22912291
margin-top: 6px;
22922292
}
22932293

2294-
.commits_list_group_by_date.timeline::before {
2294+
.commits-list-group-by-date.timeline::before {
22952295
background-color: var(--color-timeline);
22962296
bottom: 0;
22972297
content: "";
@@ -2302,12 +2302,12 @@ tbody.commit-list {
23022302
width: 2px;
23032303
}
23042304

2305-
.commits_list_group_by_date.timeline .timeline-badge-wrapper {
2305+
.commits-list-group-by-date.timeline .timeline-badge-wrapper {
23062306
position: relative;
23072307
z-index: 1;
23082308
}
23092309

2310-
.commits_list_group_by_date.timeline .timeline-badge {
2310+
.commits-list-group-by-date.timeline .timeline-badge {
23112311
border-style: solid;
23122312
border-radius: var(--border-radius-full);
23132313
color: var(--color-text);
@@ -2323,33 +2323,33 @@ tbody.commit-list {
23232323
overflow: hidden;
23242324
}
23252325

2326-
.commits_list_group_by_date.timeline .timeline-heading {
2326+
.commits-list-group-by-date.timeline .timeline-heading {
23272327
font-size: 15px;
23282328
font-weight: var(--font-weight-normal);
23292329
color: var(--color-text-light-2);
23302330
margin: 0;
23312331
}
23322332

2333-
.commits_list_group_by_date.timeline .timeline-body {
2333+
.commits-list-group-by-date.timeline .timeline-body {
23342334
max-width: 100%;
23352335
flex: auto;
23362336
padding-left: 5px;
23372337
}
23382338

2339-
.commits_list_group_by_date.timeline .timeline-list-container {
2339+
.commits-list-group-by-date.timeline .timeline-list-container {
23402340
border: 1px solid var(--color-secondary);
23412341
background: var(--color-box-body);
23422342
border-radius: var(--border-radius);
23432343
}
23442344

2345-
.commits_list_group_by_date.timeline .commits-list {
2345+
.commits-list-group-by-date.timeline .commits-list {
23462346
list-style: none;
23472347
margin: 0;
23482348
padding: 0;
23492349
flex: auto;
23502350
}
23512351

2352-
.commits_list_group_by_date.timeline .commits-list-item {
2352+
.commits-list-group-by-date.timeline .commits-list-item {
23532353
list-style: none;
23542354
display: grid;
23552355
gap: .5rem;
@@ -2362,27 +2362,27 @@ tbody.commit-list {
23622362
grid-template-rows: repeat(2, auto);
23632363
}
23642364

2365-
.commits_list_group_by_date.timeline .commits-list-item:not(:last-child) {
2365+
.commits-list-group-by-date.timeline .commits-list-item:not(:last-child) {
23662366
border-bottom: 1px solid var(--color-secondary);
23672367
}
23682368

2369-
.commits_list_group_by_date.timeline .commits-list-item:hover {
2369+
.commits-list-group-by-date.timeline .commits-list-item:hover {
23702370
background-color: var(--color-hover)
23712371
}
23722372

2373-
.commits_list_group_by_date.timeline .commits-list-item .title {
2373+
.commits-list-group-by-date.timeline .commits-list-item .title {
23742374
grid-area: primary;
23752375
}
23762376

2377-
.commits_list_group_by_date.timeline .commits-list-item .description {
2377+
.commits-list-group-by-date.timeline .commits-list-item .description {
23782378
grid-area: main-content;
23792379
}
23802380

2381-
.commits_list_group_by_date.timeline .commits-list-item .metadata {
2381+
.commits-list-group-by-date.timeline .commits-list-item .metadata {
23822382
grid-area: metadata;
23832383
}
23842384

2385-
.commits_list_group_by_date.timeline .author img {
2385+
.commits-list-group-by-date.timeline .author img {
23862386
width: 16px;
23872387
height: 16px;
23882388
}

0 commit comments

Comments
 (0)