diff options
| author | Unknwon <joe2010xtmf@163.com> | 2014-09-28 01:44:09 -0400 |
|---|---|---|
| committer | Unknwon <joe2010xtmf@163.com> | 2014-09-28 01:44:09 -0400 |
| commit | e3b78c47e24c9ef175f355a5868bb6191946cf4e (patch) | |
| tree | fe793035e3052b8967984de3ea092c943466ddb7 /templates | |
| parent | 49193bebd283322bb997b7aed09fc7818a881af9 (diff) | |
| parent | 7d48f811f16d3565f161a44e4e98c451cf6c857e (diff) | |
| download | gitea-e3b78c47e24c9ef175f355a5868bb6191946cf4e.tar.gz gitea-e3b78c47e24c9ef175f355a5868bb6191946cf4e.zip | |
Merge branch 'master' of github.com:gogits/gogs
Conflicts:
public/ng/less/gogs/repository.less
templates/repo/home.tmpl
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/home.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/issue2/list.tmpl | 6 | ||||
| -rw-r--r-- | templates/repo/pulls.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/sidebar.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/view_file.tmpl | 4 |
5 files changed, 11 insertions, 5 deletions
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index aa303aaac4..5914d630cd 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -3,7 +3,7 @@ <div id="repo-wrapper"> {{template "repo/header" .}} <div id="repo-content" class="clear container"> - <div id="repo-main" class="left grid-4-5"> + <div id="repo-main" class="left grid-5-6"> <p id="repo-desc"> {{if .Repository.DescriptionHtml}}<span class="description">{{.Repository.DescriptionHtml}}</span>{{else}}<span class="no-desc">{{.i18n.Tr "repo.no_desc"}}</span>{{end}} <a class="link" href="{{.Repository.Website}}">{{.Repository.Website}}</a> diff --git a/templates/repo/issue2/list.tmpl b/templates/repo/issue2/list.tmpl new file mode 100644 index 0000000000..9616199e19 --- /dev/null +++ b/templates/repo/issue2/list.tmpl @@ -0,0 +1,6 @@ +{{template "ng/base/head" .}} +{{template "ng/base/header" .}} +<div id="repo-wrapper"> + {{template "repo/header" .}} +</div> +{{template "ng/base/footer" .}}
\ No newline at end of file diff --git a/templates/repo/pulls.tmpl b/templates/repo/pulls.tmpl index a36c50ab0b..bfb0905557 100644 --- a/templates/repo/pulls.tmpl +++ b/templates/repo/pulls.tmpl @@ -2,7 +2,7 @@ {{template "ng/base/header" .}} <div id="repo-wrapper"> {{template "repo/header" .}} - <div class="clear container repo-issue-wrapper repo-pr"> + <div class="clear container repo-wide-wrapper repo-pr"> <div class="pr-main"> <div class="pr-title clear"> <h2 class="pr-title grid-5-6 left">Fix: Repo Name can not be converted to lower in some cases <span class="pr-num">#256</span></h2> diff --git a/templates/repo/sidebar.tmpl b/templates/repo/sidebar.tmpl index a4fa17b757..d43e36063d 100644 --- a/templates/repo/sidebar.tmpl +++ b/templates/repo/sidebar.tmpl @@ -1,4 +1,4 @@ -<div id="repo-sidebar" class="right grid-1-5"> +<div id="repo-sidebar" class="right grid-1-6"> <ul class="menu menu-vertical" id="repo-sidebar-nav"> <li> <a class="radius" href="{{.RepoLink}}/issues"><i class="octicon octicon-issue-opened"></i>{{.i18n.Tr "repo.issues"}}<span class="num right label label-blue label-radius">{{.Repository.NumOpenIssues}}</span></a> diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 96efcdac54..228d10cd99 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -1,4 +1,4 @@ -<div class="panel panel-radius" id="repo-readme"> +<div class="panel panel-radius" id="{{if .ReadmeExist}}repo-readme{{else}}repo-read-file{{end}}"> <p class="panel-header"> {{if .ReadmeExist}} <i class="icon fa fa-book fa-lg"></i> @@ -12,7 +12,7 @@ <strong class="file-name">{{.FileName}}</strong><span class="file-size">{{FileSize .FileSize}}</span> {{end}} </p> - <div class="{{if .ReadmeExist}}panel-content markdown{{end}} code-view"> + <div class="{{if .ReadmeExist}}panel-content markdown{{end}} code-view" id="repo-code-view"> {{if .ReadmeExist}} {{if .FileContent}}{{.FileContent | Str2html}}{{end}} {{else if not .IsFileText}} |