Skip to content

Commit f229044

Browse files
committed
one diff less
1 parent 08df559 commit f229044

File tree

2 files changed

+19
-27
lines changed

2 files changed

+19
-27
lines changed

templates/repo/settings/branches.tmpl

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,21 @@
3939
<div class="ui attached segment">
4040
<div class="flex-list" id="protected-branches-list" data-update-priority-url="{{$.Repository.Link}}/settings/branches/priority">
4141
{{range .ProtectedBranches}}
42-
<div data-id="{{.ID}}">
43-
<div class="flex-item tw-items-center">
44-
<div class="drag-handle tw-cursor-grab">
45-
{{svg "octicon-grabber" 16}}
46-
</div>
47-
<div class="flex-item-main">
48-
<div class="flex-item-title">
49-
<div class="ui basic primary label">{{.RuleName}}</div>
50-
</div>
51-
</div>
52-
<div class="flex-item-trailing">
53-
<a class="rm ui tiny button" href="{{$.Repository.Link}}/settings/branches/edit?rule_name={{.RuleName}}">{{ctx.Locale.Tr "repo.settings.edit_protected_branch"}}</a>
54-
<button class="ui red tiny button delete-button" data-url="{{$.Repository.Link}}/settings/branches/{{.ID}}/delete" data-id="{{.ID}}">
55-
{{ctx.Locale.Tr "repo.settings.protected_branch.delete_rule"}}
56-
</button>
42+
<div class="flex-item tw-items-center item" data-id="{{.ID}}" >
43+
<div class="drag-handle tw-cursor-grab">
44+
{{svg "octicon-grabber" 16}}
45+
</div>
46+
<div class="flex-item-main">
47+
<div class="flex-item-title">
48+
<div class="ui basic primary label">{{.RuleName}}</div>
5749
</div>
5850
</div>
51+
<div class="flex-item-trailing">
52+
<a class="rm ui tiny button" href="{{$.Repository.Link}}/settings/branches/edit?rule_name={{.RuleName}}">{{ctx.Locale.Tr "repo.settings.edit_protected_branch"}}</a>
53+
<button class="ui red tiny button delete-button" data-url="{{$.Repository.Link}}/settings/branches/{{.ID}}/delete" data-id="{{.ID}}">
54+
{{ctx.Locale.Tr "repo.settings.protected_branch.delete_rule"}}
55+
</button>
56+
</div>
5957
</div>
6058
{{else}}
6159
<div class="flex-item center aligned">

web_src/js/features/repo-settings-branches.test.ts

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,14 @@ describe('Repository Branch Settings', () => {
1515
beforeEach(() => {
1616
document.body.innerHTML = `
1717
<div id="protected-branches-list" data-update-priority-url="some/repo/branches/priority">
18-
<div data-id="1">
19-
<div class="flex-item">
20-
<div class="drag-handle"></div>
21-
</div>
18+
<div class="flex-item tw-items-center item" data-id="1" >
19+
<div class="drag-handle"></div>
2220
</div>
23-
<div data-id="2">
24-
<div class="flex-item">
25-
<div class="drag-handle"></div>
26-
</div>
21+
<div class="flex-item tw-items-center item" data-id="2" >
22+
<div class="drag-handle"></div>
2723
</div>
28-
<div data-id="3">
29-
<div class="flex-item">
30-
<div class="drag-handle"></div>
31-
</div>
24+
<div class="flex-item tw-items-center item" data-id="3" >
25+
<div class="drag-handle"></div>
3226
</div>
3327
</div>
3428
`;

0 commit comments

Comments
 (0)