Skip to content

Commit 8f29f61

Browse files
kzmilafriks
authored andcommitted
Backport: Fix layout of the topics editing form (#4971) (#4993)
1 parent 93dcc6c commit 8f29f61

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

public/css/index.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/js/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2309,7 +2309,7 @@ function initTopicbar() {
23092309

23102310
mgrBtn.click(function() {
23112311
viewDiv.hide();
2312-
editDiv.show();
2312+
editDiv.css('display', ''); // show Semantic UI Grid
23132313
})
23142314

23152315
saveBtn.click(function() {
@@ -2334,7 +2334,7 @@ function initTopicbar() {
23342334
}
23352335
}
23362336
}).done(function() {
2337-
editDiv.hide();
2337+
editDiv.css('display', 'none'); // hide Semantic UI Grid
23382338
viewDiv.show();
23392339
}).fail(function(xhr) {
23402340
alert(xhr.responseJSON.message)

public/less/_repository.less

-1
Original file line numberDiff line numberDiff line change
@@ -1743,7 +1743,6 @@ tbody.commit-list {
17431743

17441744
#topic_edit {
17451745
margin-top:5px;
1746-
display: none;
17471746
}
17481747

17491748
#repo-topic {

templates/repo/home.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
{{if .IsRepositoryAdmin}}<a id="manage_topic" style="cursor:pointer;margin-left:10px;">{{.i18n.Tr "repo.topic.manage_topics"}}</a>{{end}}
2929
</div>
3030
{{if .IsRepositoryAdmin}}
31-
<div class="ui repo-topic-edit grid" id="topic_edit" >
31+
<div class="ui repo-topic-edit grid" id="topic_edit" style="display:none">
3232
<div class="fourteen wide column">
3333
<div class="ui fluid multiple search selection dropdown">
3434
<input type="hidden" name="topics" value="{{range $i, $v := .Topics}}{{.Name}}{{if lt (Add $i 1) (len $.Topics)}},{{end}}{{end}}">
@@ -38,7 +38,7 @@
3838
<div class="text"></div>
3939
</div>
4040
</div>
41-
<div class="one wide column">
41+
<div class="two wide column">
4242
<a class="ui compact button primary" href="javascript:;" id="save_topic"
4343
data-link="{{.RepoLink}}/topics">{{.i18n.Tr "repo.topic.done"}}</a>
4444
</div>

0 commit comments

Comments
 (0)