mirror of
https://github.com/go-gitea/gitea
synced 2024-12-22 18:37:53 +01:00
Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2
# Conflicts: # public/css/gogs.min.css
This commit is contained in:
commit
a01867cc1a
2
public/css/gogs.min.css
vendored
2
public/css/gogs.min.css
vendored
File diff suppressed because one or more lines are too long
@ -38,6 +38,9 @@ img {
|
|||||||
.top.menu a.item:hover {
|
.top.menu a.item:hover {
|
||||||
color: rgba(0,0,0,.45);
|
color: rgba(0,0,0,.45);
|
||||||
}
|
}
|
||||||
|
.top.menu .menu {
|
||||||
|
z-index: 900;
|
||||||
|
}
|
||||||
.head.link.item {
|
.head.link.item {
|
||||||
padding-right: 0!important;
|
padding-right: 0!important;
|
||||||
.dropdown.icon,
|
.dropdown.icon,
|
||||||
@ -74,12 +77,21 @@ img {
|
|||||||
&.right {
|
&.right {
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
&.small {
|
||||||
|
font-size: 0.75em;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.message {
|
.message {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.header > i + .content {
|
||||||
|
padding-left: 0.75rem;
|
||||||
|
vertical-align: middle;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
footer {
|
footer {
|
||||||
margin-top: @footer-margin!important;
|
margin-top: @footer-margin!important;
|
||||||
height: @footer-margin;
|
height: @footer-margin;
|
||||||
@ -125,7 +137,8 @@ footer {
|
|||||||
.generate-img(@n, (@i + 1));
|
.generate-img(@n, (@i + 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
.octicon.icon {
|
.octicon.icon,
|
||||||
|
.mega-octicon.icon {
|
||||||
font-family: octicons;
|
font-family: octicons;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3,20 +3,25 @@
|
|||||||
|
|
||||||
padding-top: 15px;
|
padding-top: 15px;
|
||||||
padding-bottom: @footer-margin * 3;
|
padding-bottom: @footer-margin * 3;
|
||||||
|
|
||||||
.head {
|
.head {
|
||||||
height: 40px;
|
.column {
|
||||||
background-color: #FCFCFC;
|
padding-top: 5px!important;
|
||||||
|
padding-bottom: 5px!important;
|
||||||
|
}
|
||||||
|
.ui.compact.menu {
|
||||||
|
margin-left: 1rem;
|
||||||
|
}
|
||||||
|
.ui.header {
|
||||||
|
margin-top: 0;
|
||||||
|
}
|
||||||
.mega-octicon {
|
.mega-octicon {
|
||||||
width: @mega-octicon-width;
|
width: @mega-octicon-width;
|
||||||
font-size: 30px;
|
font-size: 30px;
|
||||||
}
|
}
|
||||||
a,
|
.ui.huge.breadcrumb {
|
||||||
.fork-flag {
|
|
||||||
font-weight: 300;
|
font-weight: 300;
|
||||||
}
|
font-size: 1.7rem;
|
||||||
.ui.label {
|
|
||||||
margin-top: 5px;
|
|
||||||
vertical-align: top;
|
|
||||||
}
|
}
|
||||||
.fork-flag {
|
.fork-flag {
|
||||||
margin-left: @mega-octicon-width + 8px;
|
margin-left: @mega-octicon-width + 8px;
|
||||||
@ -25,10 +30,8 @@
|
|||||||
line-height: 10px;
|
line-height: 10px;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
.num {
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.metas {
|
.metas {
|
||||||
.menu {
|
.menu {
|
||||||
max-height: 300px;
|
max-height: 300px;
|
||||||
|
@ -1,27 +1,50 @@
|
|||||||
{{with .Repository}}
|
{{with .Repository}}
|
||||||
<div class="ui head container">
|
<div class="ui container"><!-- start 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>
|
<div id="repoheader" class="ui vertically padded grid head"><!-- start grid -->
|
||||||
<a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a>
|
|
||||||
<div class="divider"> / </div>
|
<div class="column"><!-- start column -->
|
||||||
<a href="{{$.RepoLink}}">{{.Name}}</a>
|
|
||||||
{{if .IsMirror}}<div class="ui label">{{$.i18n.Tr "mirror"}}</div>{{end}}
|
<div class="ui black small compact menu floated right count labelled">
|
||||||
{{if .IsFork}}<div class="fork-flag">{{$.i18n.Tr "repo.forked_from"}} <a href="{{.BaseRepo.RepoLink}}">{{SubStr .BaseRepo.RepoLink 1 -1}}</a></div>{{end}}
|
<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}}>
|
||||||
</div>
|
<i class="icon octicon octicon-repo-forked"></i>
|
||||||
<div class="ui right">
|
{{$.i18n.Tr "repo.fork"}}
|
||||||
<a class="ui black basic button" href="{{$.RepoLink}}/action/{{if $.IsWatchingRepo}}un{{end}}watch?redirect_to={{$.Link}}">
|
</a>
|
||||||
<i class="fa fa-eye{{if not $.IsWatchingRepo}}-slash{{end}}"></i>
|
<span class="active item num">{{.NumForks}}</span>
|
||||||
{{if $.IsWatchingRepo}}{{$.i18n.Tr "repo.unwatch"}}{{else}}{{$.i18n.Tr "repo.watch"}}{{end}} <span class="num">{{.NumWatches}}</span>
|
</div>
|
||||||
</a>
|
|
||||||
<a class="ui black basic button" href="{{$.RepoLink}}/action/{{if $.IsStaringRepo}}un{{end}}star?redirect_to={{$.Link}}">
|
<div class="ui black small compact menu floated right count labelled">
|
||||||
<i class="fa fa-star{{if not $.IsStaringRepo}}-o{{end}}"></i>
|
<a class="item" href="{{$.RepoLink}}/action/{{if $.IsStaringRepo}}un{{end}}star?redirect_to={{$.Link}}">
|
||||||
{{if $.IsStaringRepo}}{{$.i18n.Tr "repo.unstar"}}{{else}}{{$.i18n.Tr "repo.star"}}{{end}} <span class="num">{{.NumStars}}</span>
|
<i class="icon fa-star{{if not $.IsStaringRepo}}-o{{end}}"></i>
|
||||||
</a>
|
{{if $.IsStaringRepo}}{{$.i18n.Tr "repo.unstar"}}{{else}}{{$.i18n.Tr "repo.star"}}{{end}}
|
||||||
<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}}>
|
</a>
|
||||||
<i class="octicon octicon-repo-forked"></i>
|
<span class="active item num">{{.NumStars}}</span>
|
||||||
{{$.i18n.Tr "repo.fork"}} <span class="num">{{.NumForks}}</span>
|
</div>
|
||||||
</a>
|
|
||||||
</div>
|
<div class="ui black small compact menu floated right count labelled">
|
||||||
</div>
|
<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>
|
<div class="ui divider"></div>
|
||||||
{{end}}
|
{{end}}
|
Loading…
Reference in New Issue
Block a user