Update UI for topics labels on projects (#6639)

release/v1.15
하윤 2019-04-15 20:59:30 +02:00 committed by techknowlogick
parent 837116875e
commit 83d6e5e3f8
5 changed files with 10 additions and 7 deletions

File diff suppressed because one or more lines are too long

View File

@ -2775,7 +2775,7 @@ function initTopicbar() {
var last = viewDiv.children("a").last(); var last = viewDiv.children("a").last();
for (var i=0; i < topicArray.length; i++) { for (var i=0; i < topicArray.length; i++) {
$('<div class="ui green basic label topic" style="cursor:pointer;">'+topicArray[i]+'</div>').insertBefore(last) $('<div class="ui small label topic" style="cursor:pointer;">'+topicArray[i]+'</div>').insertBefore(last)
} }
} }
editDiv.css('display', 'none'); editDiv.css('display', 'none');
@ -2817,7 +2817,7 @@ function initTopicbar() {
basic: true, basic: true,
}, },
className: { className: {
label: 'ui green basic label' label: 'ui small label'
}, },
apiSettings: { apiSettings: {
url: suburl + '/api/v1/topics/search?q={query}', url: suburl + '/api/v1/topics/search?q={query}',

View File

@ -47,6 +47,9 @@
font-size: 12px; font-size: 12px;
color: #808080; color: #808080;
} }
.ui.tags {
margin-bottom: 1em;
}
} }
} }

View File

@ -24,9 +24,9 @@
</div> </div>
{{if .DescriptionHTML}}<p class="has-emoji">{{.DescriptionHTML}}</p>{{end}} {{if .DescriptionHTML}}<p class="has-emoji">{{.DescriptionHTML}}</p>{{end}}
{{if .Topics }} {{if .Topics }}
<div> <div class="ui tags">
{{range .Topics}} {{range .Topics}}
{{if ne . "" }}<a href="{{AppSubUrl}}/explore/repos?q={{.}}&topic=1"><div class="ui green basic label topic">{{.}}</div></a>{{end}} {{if ne . "" }}<a href="{{AppSubUrl}}/explore/repos?q={{.}}&topic=1"><div class="ui small label topic">{{.}}</div></a>{{end}}
{{end}} {{end}}
</div> </div>
{{end}} {{end}}

View File

@ -24,7 +24,7 @@
{{end}} {{end}}
</div> </div>
<div class="ui" id="repo-topics"> <div class="ui" id="repo-topics">
{{range .Topics}}<a class="ui repo-topic green basic label topic" href="{{AppSubUrl}}/explore/repos?q={{.Name}}&topic=1">{{.Name}}</a>{{end}} {{range .Topics}}<a class="ui repo-topic small label topic" href="{{AppSubUrl}}/explore/repos?q={{.Name}}&topic=1">{{.Name}}</a>{{end}}
{{if and .Permission.IsAdmin (not .Repository.IsArchived)}}<a id="manage_topic">{{.i18n.Tr "repo.topic.manage_topics"}}</a>{{end}} {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}<a id="manage_topic">{{.i18n.Tr "repo.topic.manage_topics"}}</a>{{end}}
</div> </div>
{{if and .Permission.IsAdmin (not .Repository.IsArchived)}} {{if and .Permission.IsAdmin (not .Repository.IsArchived)}}
@ -34,7 +34,7 @@
<div class="ui fluid multiple search selection dropdown"> <div class="ui fluid multiple search selection dropdown">
<input type="hidden" name="topics" value="{{range $i, $v := .Topics}}{{.Name}}{{if lt (Add $i 1) (len $.Topics)}},{{end}}{{end}}"> <input type="hidden" name="topics" value="{{range $i, $v := .Topics}}{{.Name}}{{if lt (Add $i 1) (len $.Topics)}},{{end}}{{end}}">
{{range .Topics}} {{range .Topics}}
<div class="ui green basic label topic transition visible" data-value="{{.Name}}" style="display: inline-block !important; cursor: default;">{{.Name}}<i class="delete icon"></i></div> <div class="ui small label topic transition visible" data-value="{{.Name}}" style="display: inline-block !important; cursor: default;">{{.Name}}<i class="delete icon"></i></div>
{{end}} {{end}}
<div class="text"></div> <div class="text"></div>
</div> </div>