diff options
| -rw-r--r-- | public/config.codekit | 4 | ||||
| -rw-r--r-- | public/css/gogs.css | 1 | ||||
| -rw-r--r-- | public/js/gogs.js | 11 | ||||
| -rw-r--r-- | public/less/_repository.less | 1 | ||||
| -rw-r--r-- | templates/repo/issue/list.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/issue/new_form.tmpl | 2 |
6 files changed, 14 insertions, 7 deletions
diff --git a/public/config.codekit b/public/config.codekit index c5f54ff8..ebd91d95 100644 --- a/public/config.codekit +++ b/public/config.codekit @@ -1,6 +1,6 @@ { "CodeKitInfo": "This is a CodeKit 2.x project configuration file. It is designed to sync project settings across multiple machines. MODIFYING THE CONTENTS OF THIS FILE IS A POOR LIFE DECISION. If you do so, you will likely cause CodeKit to crash. This file is not useful unless accompanied by the project that created it in CodeKit 2. This file is not backwards-compatible with CodeKit 1.x. For more information, see: http:\/\/incident57.com\/codekit", -"creatorBuild": "19127", +"creatorBuild": "19115", "files": { "\/css\/github.min.css": { "fileType": 16, @@ -66,7 +66,7 @@ "fileType": 32768, "ignore": 0, "ignoreWasSetByUser": 0, - "initialSize": 514087, + "initialSize": 4048, "inputAbbreviatedPath": "\/img\/avatar_default.png", "outputAbbreviatedPath": "\/img\/avatar_default.png", "outputPathIsOutsideProject": 0, diff --git a/public/css/gogs.css b/public/css/gogs.css index 9a273c80..7ef33c6c 100644 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -1181,6 +1181,7 @@ footer .ui.language .menu { float: left; margin-left: -5px; margin-right: -7px; + width: 16px; } .repository .filter.menu .menu { max-height: 300px; diff --git a/public/js/gogs.js b/public/js/gogs.js index fd6a7d85..378b0bbd 100644 --- a/public/js/gogs.js +++ b/public/js/gogs.js @@ -108,16 +108,21 @@ function initCommentForm() { }); } + // Add to each unselected label to keep UI looks good. + // This should be added directly to HTML but somehow just get empty <span> on this page. + $labelMenu.find('.item:not(.no-select) .octicon:not(.octicon-check)').each(function () { + $(this).html(' '); + }) $labelMenu.find('.item:not(.no-select)').click(function () { if ($(this).hasClass('checked')) { $(this).removeClass('checked'); - $(this).find('.octicon').removeClass('octicon-check'); + $(this).find('.octicon').removeClass('octicon-check').html(' '); if (hasLabelUpdateAction) { updateIssueMeta($labelMenu.data('update-url'), "detach", $(this).data('id')); } } else { $(this).addClass('checked'); - $(this).find('.octicon').addClass('octicon-check'); + $(this).find('.octicon').addClass('octicon-check').html(''); if (hasLabelUpdateAction) { updateIssueMeta($labelMenu.data('update-url'), "attach", $(this).data('id')); } @@ -147,7 +152,7 @@ function initCommentForm() { $(this).parent().find('.item').each(function () { $(this).removeClass('checked'); - $(this).find('.octicon').removeClass('octicon-check'); + $(this).find('.octicon').removeClass('octicon-check').html(' '); }); $list.find('.item').each(function () { diff --git a/public/less/_repository.less b/public/less/_repository.less index 2a9d490e..efda68f3 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -97,6 +97,7 @@ float: left; margin-left: -5px; margin-right: -7px; + width: 16px; } .menu { max-height: 300px; diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index e69a8413..9aea699e 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -33,7 +33,7 @@ <div class="menu"> <a class="item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}">{{.i18n.Tr "repo.issues.filter_label_no_select"}}</a> {{range .Labels}} - <a class="item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.ID}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}"><span class="octicon {{if eq $.SelectLabels .ID}}octicon-check{{end}}"> </span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | Sanitize}}</a> + <a class="item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.ID}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}"><span class="octicon {{if eq $.SelectLabels .ID}}octicon-check{{end}}">{{if not .IsChecked}} {{end}}</span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | Sanitize}}</a> {{end}} </div> </div> diff --git a/templates/repo/issue/new_form.tmpl b/templates/repo/issue/new_form.tmpl index ed1c718e..bfb97da2 100644 --- a/templates/repo/issue/new_form.tmpl +++ b/templates/repo/issue/new_form.tmpl @@ -41,7 +41,7 @@ <div class="filter menu" data-id="#label_ids"> <div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_labels"}}</div> {{range .Labels}} - <a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon {{if .IsChecked}}octicon-check{{end}}"> </span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name}}</a> + <a class="{{if .IsChecked}}checked{{end}} item" href="#" data-id="{{.ID}}" data-id-selector="#label_{{.ID}}"><span class="octicon {{if .IsChecked}}octicon-check{{end}}"></span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name}}</a> {{end}} </div> </div> |