From fdc8c34258fb279970bab601018ed50883b761d6 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Wed, 10 Sep 2014 11:32:14 -0400 Subject: Fix clone panel z-index --- public/ng/less/gogs/repository.less | 1 + 1 file changed, 1 insertion(+) (limited to 'public/ng/less/gogs/repository.less') diff --git a/public/ng/less/gogs/repository.less b/public/ng/less/gogs/repository.less index 4a49ac43..955a617c 100644 --- a/public/ng/less/gogs/repository.less +++ b/public/ng/less/gogs/repository.less @@ -84,6 +84,7 @@ border-top-right-radius: .25em; left: -354px; padding: 20px; box-sizing: border-box; + z-index: 1; .btn > i { margin-right: 6px; } -- cgit v1.2.3 From bba401a5dcf8af2fdc4c7c05b11db100019ee4fa Mon Sep 17 00:00:00 2001 From: Unknwon Date: Fri, 12 Sep 2014 19:42:11 -0400 Subject: Prepare 0.5 release --- .gopmfile | 47 ++++++++++++++++++------------------- README.md | 2 +- README_ZH.md | 2 +- models/git_diff.go | 3 +-- public/ng/css/gogs.css | 1 + public/ng/less/gogs/repository.less | 1 + 6 files changed, 28 insertions(+), 28 deletions(-) (limited to 'public/ng/less/gogs/repository.less') diff --git a/.gopmfile b/.gopmfile index 6aac4953..6edec776 100644 --- a/.gopmfile +++ b/.gopmfile @@ -2,30 +2,29 @@ path = github.com/gogits/gogs [deps] -github.com/beego/memcache = -github.com/beego/redigo = -github.com/Unknwon/cae = -github.com/Unknwon/com = -github.com/Unknwon/goconfig = -github.com/Unknwon/i18n = -github.com/Unknwon/macaron = -github.com/codegangsta/cli = -github.com/go-sql-driver/mysql = -github.com/go-xorm/core = -github.com/go-xorm/xorm = -github.com/gogits/gfm = -github.com/gogits/git = -github.com/gogits/oauth2 = -github.com/lib/pq = -github.com/macaron-contrib/cache = -github.com/macaron-contrib/captcha = -github.com/macaron-contrib/csrf = -github.com/macaron-contrib/i18n = -github.com/macaron-contrib/session = -github.com/macaron-contrib/toolbox = -github.com/mattn/go-sqlite3 = -github.com/nfnt/resize = -github.com/saintfish/chardet = +github.com/beego/memcache = commit:2aea774416 +github.com/beego/redigo = commit:856744a0d5 +github.com/Unknwon/cae = commit:2e70a1351b +github.com/Unknwon/com = commit:2cbcbc6916 +github.com/Unknwon/goconfig = commit:0f8d8dc1c0 +github.com/Unknwon/i18n = commit:47baeff8d0 +github.com/Unknwon/macaron = commit:f22f45d79a +github.com/codegangsta/cli = commit:7381bc4e62 +github.com/go-sql-driver/mysql = commit:8111ee3ec3 +github.com/go-xorm/core = commit:750aae0fa5 +github.com/go-xorm/xorm = commit:2d8b3135b1 +github.com/gogits/gfm = commit:40f747a9c0 +github.com/gogits/oauth2 = commit:99cbec870a +github.com/lib/pq = commit:b021d0ef20 +github.com/macaron-contrib/cache = commit:204d8e5137 +github.com/macaron-contrib/captcha = commit:8f3f1ac0e3 +github.com/macaron-contrib/csrf = commit:cd84c01723 +github.com/macaron-contrib/i18n = commit:489cc194b5 +github.com/macaron-contrib/session = commit:80a88a1bba +github.com/macaron-contrib/toolbox = commit:57127bcc89 +github.com/mattn/go-sqlite3 = commit:a80c27ba33 +github.com/nfnt/resize = commit:581d15cb53 +github.com/saintfish/chardet = commit:3af4cd4741 [res] include = conf|etc|public|scripts|templates diff --git a/README.md b/README.md index 3115d3fc..05771144 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Gogs - Go Git Service [![wercker status](https://app.wercker.com/status/ad0bdb0b Gogs(Go Git Service) is a painless self-hosted Git Service written in Go. -![Demo](http://gowalker.org/public/gogs_demo.gif) +![Demo](https://gowalker.org/public/gogs_demo.gif) ##### Current version: 0.5.0 Beta diff --git a/README_ZH.md b/README_ZH.md index ef154d0e..2fa82e7d 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -3,7 +3,7 @@ Gogs - Go Git Service [![wercker status](https://app.wercker.com/status/ad0bdb0b Gogs(Go Git Service) 是一个基于 Go 语言的自助 Git 服务。 -![Demo](http://gowalker.org/public/gogs_demo.gif) +![Demo](https://gowalker.org/public/gogs_demo.gif) ##### 当前版本：0.5.0 Beta diff --git a/models/git_diff.go b/models/git_diff.go index 21a624de..bf7a9cd5 100644 --- a/models/git_diff.go +++ b/models/git_diff.go @@ -15,8 +15,7 @@ import ( "github.com/Unknwon/com" - "github.com/gogits/git" - + "github.com/gogits/gogs/modules/git" "github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/process" ) diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css index ee364905..5dd35acc 100644 --- a/public/ng/css/gogs.css +++ b/public/ng/css/gogs.css @@ -1316,6 +1316,7 @@ The register and sign-in page style padding: 0; } .code-view .lines-num { + vertical-align: top; text-align: right; color: #999; background: #f5f5f5; diff --git a/public/ng/less/gogs/repository.less b/public/ng/less/gogs/repository.less index 955a617c..48959a62 100644 --- a/public/ng/less/gogs/repository.less +++ b/public/ng/less/gogs/repository.less @@ -399,6 +399,7 @@ border-top-right-radius: .25em; } } .lines-num { + vertical-align: top; text-align: right; color: #999; background: #f5f5f5; -- cgit v1.2.3 From 7027ac930841960dfe850572a0e8306c6c010ef3 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sun, 14 Sep 2014 16:43:22 -0400 Subject: Fix #461 --- public/ng/css/gogs.css | 10 ++++++--- public/ng/less/gogs/repository.less | 43 +++++++++++++++++++------------------ templates/repo/header.tmpl | 2 +- 3 files changed, 30 insertions(+), 25 deletions(-) (limited to 'public/ng/less/gogs/repository.less') diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css index 68ff8785..b92786de 100644 --- a/public/ng/css/gogs.css +++ b/public/ng/css/gogs.css @@ -983,9 +983,9 @@ The register and sign-in page style background-color: transparent; } #repo-header-meta a > .btn { + line-height: 16px; font-size: 1.05em; margin-left: 16px; - line-height: 16px; } #repo-header-meta a > .btn i { margin-right: 6px; @@ -1015,7 +1015,7 @@ The register and sign-in page style line-height: 24px; width: 440px; top: 50px; - left: -354px; + left: -370px; padding: 20px; box-sizing: border-box; z-index: 1; @@ -1023,12 +1023,16 @@ The register and sign-in page style #repo-header-download-drop .btn > i { margin-right: 6px; } +#repo-header-download-drop button, +#repo-header-download-drop input { + font-size: 11px; +} #repo-content { padding: 18px 0; } #repo-clone-url { border-right: none; - width: 196px; + width: 200px; border-left: none; } #repo-clone-help { diff --git a/public/ng/less/gogs/repository.less b/public/ng/less/gogs/repository.less index 48959a62..23d15650 100644 --- a/public/ng/less/gogs/repository.less +++ b/public/ng/less/gogs/repository.less @@ -18,8 +18,7 @@ background-color: @repoHeaderBgColor; #repo-header-name { line-height: 66px; color: @repoHeaderNameColor; - -font-size: 1.6em; + font-size: 1.6em; font-weight: normal; margin-bottom: 0; i { @@ -40,15 +39,17 @@ font-size: 1.6em; } } } - a > .btn { - font-size: 1.05em; - margin-left: 16px; - i { - margin-right: 6px; - } - line-height:16px; - .num { - margin-left: 6px; + a { + &>.btn { + line-height: 16px; + font-size: 1.05em; + margin-left: 16px; + i { + margin-right: 6px; + } + .num { + margin-left: 6px; + } } } } @@ -59,21 +60,17 @@ font-size: 1.6em; &:hover { &:after, .btn { background-color: @btnHoverBlackColor; - -color: #FFF; + color: #FFF; } } &:after { background-color: @btnBlackColor; - -padding: 9px 16px 8px 0; + padding: 9px 16px 8px 0; margin-left: -8px !important; color: #FFF; border-top: 1px solid@btnBlackColor; - -border-bottom: 1px solid@btnBlackColor; - -border-top-right-radius: .25em; + border-bottom: 1px solid@btnBlackColor; + border-top-right-radius: .25em; border-bottom-right-radius: .25em; } } @@ -81,20 +78,24 @@ border-top-right-radius: .25em; line-height: 24px; width: 440px; top: 50px; - left: -354px; + left: -370px; padding: 20px; box-sizing: border-box; z-index: 1; .btn > i { margin-right: 6px; } + button, + input { + font-size: 11px; + } } #repo-content { padding: 18px 0; } #repo-clone-url { border-right: none; - width: 196px; + width: 200px; border-left: none; } #repo-clone-help { diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 38125082..42ae775a 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -8,7 +8,7 @@ {{if .Repository.IsMirror}}{{.i18n.Tr "mirror"}}{{end}}