Browse Source

Improve repository lable style

- add border-radius to filter list items
- use color as background of label for issue/pull view page
pull/2799/merge
Unknwon 9 years ago
parent
commit
9a5a27ea8d
  1. 2
      README.md
  2. 2
      gogs.go
  3. 1
      public/css/gogs.css
  4. 1
      public/less/_repository.less
  5. 2
      templates/.VERSION
  6. 5
      templates/repo/issue/view_content.tmpl
  7. 2
      templates/repo/settings/githook_edit.tmpl

2
README.md

@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true) ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
##### Current version: 0.9.10 ##### Current version: 0.9.11
| Web | UI | Preview | | Web | UI | Preview |
|:-------------:|:-------:|:-------:| |:-------------:|:-------:|:-------:|

2
gogs.go

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting" "github.com/gogits/gogs/modules/setting"
) )
const APP_VER = "0.9.10.0315" const APP_VER = "0.9.11.0316"
func init() { func init() {
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())

1
public/css/gogs.css

@ -1140,6 +1140,7 @@ footer .container .links > *:first-child {
border-bottom: none; border-bottom: none;
} }
.repository .filter.menu .label.color { .repository .filter.menu .label.color {
border-radius: 3px;
margin-left: 15px; margin-left: 15px;
padding: 0 8px; padding: 0 8px;
} }

1
public/less/_repository.less

@ -80,6 +80,7 @@
} }
.filter.menu { .filter.menu {
.label.color { .label.color {
border-radius: 3px;
margin-left: 15px; margin-left: 15px;
padding: 0 8px; padding: 0 8px;
} }

2
templates/.VERSION

@ -1 +1 @@
0.9.10.0315 0.9.11.0316

5
templates/repo/issue/view_content.tmpl

@ -246,7 +246,10 @@
<div class="ui labels list"> <div class="ui labels list">
<span class="no-select item {{if .HasSelectedLabel}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_label"}}</span> <span class="no-select item {{if .HasSelectedLabel}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_label"}}</span>
{{range .Labels}} {{range .Labels}}
<a class="{{if not .IsChecked}}hide{{end}} item" id="label_{{.ID}}" href="{{$.RepoLink}}/issues?labels={{.ID}}"><span class="label color" style="background-color: {{.Color}}"></span> <span class="text">{{.Name}}</span></a> <div class="item">
<a class="ui label {{if not .IsChecked}}hide{{end}}" id="label_{{.ID}}" href="{{$.RepoLink}}/issues?labels={{.ID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}">{{.Name}}</a>
</div>
{{end}} {{end}}
</div> </div>

2
templates/repo/settings/githook_edit.tmpl

@ -20,7 +20,7 @@
</div> </div>
<div class="field"> <div class="field">
<label for="content">{{$.i18n.Tr "repo.settings.githook_content"}}</label> <label for="content">{{$.i18n.Tr "repo.settings.githook_content"}}</label>
<textarea id="content" name="content" rows="20" wrap="off">{{if .IsActive}}{{.Content}}{{else}}{{.Sample}}{{end}}</textarea> <textarea id="content" name="content" rows="20" wrap="off" autofocus>{{if .IsActive}}{{.Content}}{{else}}{{.Sample}}{{end}}</textarea>
</div> </div>
<div class="inline field"> <div class="inline field">

Loading…
Cancel
Save