Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix layout of the topics editing form #4971

Merged
merged 3 commits into from
Sep 29, 2018
Merged

Fix layout of the topics editing form #4971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3569777
Fix layout of the topic edit.
kzmi Sep 21, 2018
ef2c1ed
Improve switching visibility of the topic edit
kzmi Sep 23, 2018
f6e024e
Merge remote-tracking branch 'upstream/master' into fix_manage_topics…
kzmi Sep 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion public/css/index.css
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2425,7 +2425,7 @@ function initTopicbar() {

mgrBtn.click(function() {
viewDiv.hide();
editDiv.show();
editDiv.css('display', ''); // show Semantic UI Grid
});

function getPrompts() {
Expand Down Expand Up @@ -2456,7 +2456,7 @@ function initTopicbar() {
for (var i=0; i < topicArray.length; i++) {
$('<div class="ui green basic label topic" style="cursor:pointer;">'+topicArray[i]+'</div>').insertBefore(last)
}
editDiv.hide();
editDiv.css('display', 'none'); // hide Semantic UI Grid
viewDiv.show();
}
}).fail(function(xhr){
Expand Down
1 change: 0 additions & 1 deletion public/less/_repository.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1805,7 +1805,6 @@ tbody.commit-list {

#topic_edit {
margin-top:5px;
display: none;
}

#repo-topic {
Expand Down
4 changes: 2 additions & 2 deletions templates/repo/home.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
{{if .IsRepositoryAdmin}}<a id="manage_topic" style="cursor:pointer;margin-left:10px;">{{.i18n.Tr "repo.topic.manage_topics"}}</a>{{end}}
</div>
{{if .IsRepositoryAdmin}}
<div class="ui repo-topic-edit grid form segment error" id="topic_edit" >
<div class="ui repo-topic-edit grid form segment error" id="topic_edit" style="display:none">
<div class="fourteen wide column">
<div class="field">
<div class="ui fluid multiple search selection dropdown">
Expand All @@ -40,7 +40,7 @@
</div>
</div>
</div>
<div class="one wide column">
<div class="two wide column">
<a class="ui compact button primary" href="javascript:;" id="save_topic"
data-link="{{.RepoLink}}/topics">{{.i18n.Tr "repo.topic.done"}}</a>
</div>
Expand Down