core
/
gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add org avatar on top of internal repo icon (#11895) 

* Add org avatar on top of internal repo icon

* add color for arc-green

* use wrapper div to avoid negative margins

* rename class and move div

* move div to icon tmpl

* remove unnecessary margin for lock octicon

* fix label align together with #11891

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
This commit is contained in:
Cirno the Strongest 2020-06-26 02:07:15 +02:00 committed by GitHub
parent 6764daf7e5
commit 0ea479561d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 45 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
templates/repo/header_icon.tmpl
View File

@ -1,23 +1,26 @@
{{if $.IsTemplate}} <div class="repo-header-icon">
{{if $.IsPrivate}} {{if $.IsTemplate}}
{{svg "octicon-repo-template-private" 32}} {{if $.IsPrivate}}
{{svg "octicon-repo-template-private" 32}}
{{else}}
{{svg "octicon-repo-template" 32}}
{{end}}
{{else}} {{else}}
{{svg "octicon-repo-template" 32}} {{if $.IsPrivate}}
{{end}} {{svg "octicon-lock" 32}}
{{else}} {{else if and (not $.IsMirror) (not $.IsFork) ($.Owner)}}
{{if $.IsPrivate}} {{if $.Owner.Visibility.IsPrivate}}
{{svg "octicon-lock" 32}} {{svg "octicon-internal-repo" 32}}
{{else if and (not $.IsMirror) (not $.IsFork) ($.Owner)}} <img class="ui avatar image" src="{{$.Owner.RelAvatarLink}}">
{{if $.Owner.Visibility.IsPrivate}} {{else}}
{{svg "octicon-internal-repo" 32}} {{svg "octicon-repo" 32}}
{{end}}
{{else if $.IsMirror}}
{{svg "octicon-repo-clone" 32}}
{{else if $.IsFork}}
{{svg "octicon-repo-forked" 32}}
{{else}} {{else}}
{{svg "octicon-repo" 32}} {{svg "octicon-repo" 32}}
{{end}} {{end}}
{{else if $.IsMirror}}
{{svg "octicon-repo-clone" 32}}
{{else if $.IsFork}}
{{svg "octicon-repo-forked" 32}}
{{else}}
{{svg "octicon-repo" 32}}
{{end}} {{end}}
{{end}} </div>

4
web_src/less/_base.less
View File

@ -1317,3 +1317,7 @@ table th[data-sortt-desc] {
.ui.secondary.pointing.menu .item { .ui.secondary.pointing.menu .item {
padding: 12px; padding: 12px;
} }
.ui.header > .ui.label.compact {
margin-top: inherit;
}

21
web_src/less/_repository.less
View File

@ -14,13 +14,24 @@
font-weight: 400; font-weight: 400;
font-size: 1.5rem; font-size: 1.5rem;
svg { .label {
position: relative; vertical-align: middle;
top: 5px;
} }
svg.octicon-lock { &.repo-title .repo-header-icon {
margin-left: 5px; display: inline-block;
position: relative;
.avatar {
position: absolute;
right: 0;
bottom: 0;
width: 16px;
height: 16px;
color: #fafafa;
box-shadow: 0 0 0 2px;
margin: 0;
}
} }
} }

4
web_src/less/themes/theme-arc-green.less
View File

@ -1596,3 +1596,7 @@ footer .container .links > * {
.tribute-container li:hover { .tribute-container li:hover {
background: #728e5e !important; background: #728e5e !important;
} }
.repository .repo-header .ui.huge.breadcrumb.repo-title .repo-header-icon .avatar {
color: #2a2e3a;
}