coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2 

# Conflicts:
#	public/css/gogs.min.css
This commit is contained in:
Unknwon 2015-08-12 19:10:16 +08:00
parent ab2d0b3b44 33f33e055a
commit a01867cc1a
4 changed files with 77 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/css/gogs.min.css vendored
View File

File diff suppressed because one or more lines are too long

15
public/less/_base.less
View File

@ -38,6 +38,9 @@ img {
.top.menu a.item:hover {
color: rgba(0,0,0,.45);
}
.top.menu .menu {
z-index: 900;
}
.head.link.item {
padding-right: 0!important;
.dropdown.icon,
@ -74,12 +77,21 @@ img {
&.right {
text-align: right;
}
&.small {
font-size: 0.75em;
}
}
.message {
text-align: center;
}
.header > i + .content {
padding-left: 0.75rem;
vertical-align: middle;
}
}
footer {
margin-top: @footer-margin!important;
height: @footer-margin;
@ -125,7 +137,8 @@ footer {
.generate-img(@n, (@i + 1));
}
.octicon.icon {
.octicon.icon,
.mega-octicon.icon {
font-family: octicons;
}

25
public/less/_repository.less
View File

@ -3,20 +3,25 @@
padding-top: 15px;
padding-bottom: @footer-margin * 3;
.head {
height: 40px;
background-color: #FCFCFC;
.column {
padding-top: 5px!important;
padding-bottom: 5px!important;
}
.ui.compact.menu {
margin-left: 1rem;
}
.ui.header {
margin-top: 0;
}
.mega-octicon {
width: @mega-octicon-width;
font-size: 30px;
}
a,
.fork-flag {
.ui.huge.breadcrumb {
font-weight: 300;
}
.ui.label {
margin-top: 5px;
vertical-align: top;
font-size: 1.7rem;
}
.fork-flag {
margin-left: @mega-octicon-width + 8px;
@ -25,10 +30,8 @@
line-height: 10px;
white-space: nowrap;
}
.num {
font-weight: bold;
}
}
.metas {
.menu {
max-height: 300px;

73
templates/repo/header.tmpl
View File

@ -1,27 +1,50 @@
{{with .Repository}}
<div class="ui head container">
<div class="ui huge breadcrumb">
<i class="mega-octicon octicon-{{if .IsPrivate}}lock{{else if .IsMirror}}repo-clone{{else if .IsFork}}repo-forked{{else}}repo{{end}}"></i>
<a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a>
<div class="divider"> / </div>
<a href="{{$.RepoLink}}">{{.Name}}</a>
{{if .IsMirror}}<div class="ui label">{{$.i18n.Tr "mirror"}}</div>{{end}}
{{if .IsFork}}<div class="fork-flag">{{$.i18n.Tr "repo.forked_from"}} <a href="{{.BaseRepo.RepoLink}}">{{SubStr .BaseRepo.RepoLink 1 -1}}</a></div>{{end}}
</div>
<div class="ui right">
<a class="ui black basic button" href="{{$.RepoLink}}/action/{{if $.IsWatchingRepo}}un{{end}}watch?redirect_to={{$.Link}}">
<i class="fa fa-eye{{if not $.IsWatchingRepo}}-slash{{end}}"></i>
{{if $.IsWatchingRepo}}{{$.i18n.Tr "repo.unwatch"}}{{else}}{{$.i18n.Tr "repo.watch"}}{{end}} <span class="num">{{.NumWatches}}</span>
</a>
<a class="ui black basic button" href="{{$.RepoLink}}/action/{{if $.IsStaringRepo}}un{{end}}star?redirect_to={{$.Link}}">
<i class="fa fa-star{{if not $.IsStaringRepo}}-o{{end}}"></i>
{{if $.IsStaringRepo}}{{$.i18n.Tr "repo.unstar"}}{{else}}{{$.i18n.Tr "repo.star"}}{{end}} <span class="num">{{.NumStars}}</span>
</a>
<a class="ui black basic button {{if $.IsRepositoryOwner}}poping up{{end}}" {{if not $.IsRepositoryOwner}}href="{{AppSubUrl}}/repo/fork/{{.ID}}"{{end}} {{if $.IsRepositoryOwner}}data-content="{{$.i18n.Tr "repo.fork_from_self"}}" data-position="top right"{{end}}>
<i class="octicon octicon-repo-forked"></i>
{{$.i18n.Tr "repo.fork"}} <span class="num">{{.NumForks}}</span>
</a>
</div>
</div>
<div class="ui container"><!-- start container -->
<div id="repoheader" class="ui vertically padded grid head"><!-- start grid -->
<div class="column"><!-- start column -->
<div class="ui black small compact menu floated right count labelled">
<a class="item{{if $.IsRepositoryOwner}} poping up{{end}}"{{if not $.IsRepositoryOwner}} href="{{AppSubUrl}}/repo/fork/{{.ID}}"{{else}} data-content="{{$.i18n.Tr "repo.fork_from_self"}}" data-position="top center" data-variation="tiny"{{end}}>
<i class="icon octicon octicon-repo-forked"></i>
{{$.i18n.Tr "repo.fork"}}
</a>
<span class="active item num">{{.NumForks}}</span>
</div>
<div class="ui black small compact menu floated right count labelled">
<a class="item" href="{{$.RepoLink}}/action/{{if $.IsStaringRepo}}un{{end}}star?redirect_to={{$.Link}}">
<i class="icon fa-star{{if not $.IsStaringRepo}}-o{{end}}"></i>
{{if $.IsStaringRepo}}{{$.i18n.Tr "repo.unstar"}}{{else}}{{$.i18n.Tr "repo.star"}}{{end}}
</a>
<span class="active item num">{{.NumStars}}</span>
</div>
<div class="ui black small compact menu floated right count labelled">
<a class="item" href="{{$.RepoLink}}/action/{{if $.IsWatchingRepo}}un{{end}}watch?redirect_to={{$.Link}}">
<i class="icon fa fa-eye{{if not $.IsWatchingRepo}}-slash{{end}}"></i>
{{if $.IsWatchingRepo}}{{$.i18n.Tr "repo.unwatch"}}{{else}}{{$.i18n.Tr "repo.watch"}}{{end}}
</a>
<span class="active item num">{{.NumWatches}}</span>
</div>
<div class="ui header">
<div class="ui huge breadcrumb">
<i class="mega-octicon octicon-{{if .IsPrivate}}lock{{else if .IsMirror}}repo-clone{{else if .IsFork}}repo-forked{{else}}repo{{end}}"></i>
<a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a>
<div class="divider"> / </div>
<a href="{{$.RepoLink}}">{{.Name}}</a>
{{if .IsMirror}}<div class="ui label">{{$.i18n.Tr "mirror"}}</div>{{end}}
{{if .IsFork}}<div class="fork-flag">{{$.i18n.Tr "repo.forked_from"}} <a href="{{.BaseRepo.RepoLink}}">{{SubStr .BaseRepo.RepoLink 1 -1}}</a></div>{{end}}
</div>
</div>
</div><!-- end column -->
</div><!-- end grid -->
</div><!-- end container -->
<div class="ui divider"></div>
{{end}}
{{end}}