Skip to content

Add org avatar on top of internal repo icon #11895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jun 26, 2020
Merged

Add org avatar on top of internal repo icon #11895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
680e061
Add org avatar on top of internal repo icon
CirnoT Jun 15, 2020
c961070
add color for arc-green
CirnoT Jun 15, 2020
7c72877
use wrapper div to avoid negative margins
CirnoT Jun 15, 2020
23a8524
rename class and move div
CirnoT Jun 15, 2020
814151c
move div to icon tmpl
CirnoT Jun 15, 2020
c08ee7d
remove unnecessary margin for lock octicon
CirnoT Jun 15, 2020
a804302
Merge branch 'master' into internal-icon-av
CirnoT Jun 20, 2020
920e5b6
Merge branch 'master' into internal-icon-av
CirnoT Jun 20, 2020
8b472e6
Merge branch 'master' into internal-icon-av
CirnoT Jun 22, 2020
cc9dae3
fix label align together with #11891
CirnoT Jun 22, 2020
7b56829
Merge branch 'master' into internal-icon-av
techknowlogick Jun 25, 2020
46763a6
Merge branch 'master' into internal-icon-av
techknowlogick Jun 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 21 additions & 18 deletions templates/repo/header_icon.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
{{if $.IsTemplate}}
{{if $.IsPrivate}}
{{svg "octicon-repo-template-private" 32}}
<div class="repo-header-icon">
{{if $.IsTemplate}}
{{if $.IsPrivate}}
{{svg "octicon-repo-template-private" 32}}
{{else}}
{{svg "octicon-repo-template" 32}}
{{end}}
{{else}}
{{svg "octicon-repo-template" 32}}
{{end}}
{{else}}
{{if $.IsPrivate}}
{{svg "octicon-lock" 32}}
{{else if and (not $.IsMirror) (not $.IsFork) ($.Owner)}}
{{if $.Owner.Visibility.IsPrivate}}
{{svg "octicon-internal-repo" 32}}
{{if $.IsPrivate}}
{{svg "octicon-lock" 32}}
{{else if and (not $.IsMirror) (not $.IsFork) ($.Owner)}}
{{if $.Owner.Visibility.IsPrivate}}
{{svg "octicon-internal-repo" 32}}
<img class="ui avatar image" src="{{$.Owner.RelAvatarLink}}">
{{else}}
{{svg "octicon-repo" 32}}
{{end}}
{{else if $.IsMirror}}
{{svg "octicon-repo-clone" 32}}
{{else if $.IsFork}}
{{svg "octicon-repo-forked" 32}}
{{else}}
{{svg "octicon-repo" 32}}
{{end}}
{{else if $.IsMirror}}
{{svg "octicon-repo-clone" 32}}
{{else if $.IsFork}}
{{svg "octicon-repo-forked" 32}}
{{else}}
{{svg "octicon-repo" 32}}
{{end}}
{{end}}
</div>
4 changes: 4 additions & 0 deletions web_src/less/_base.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1317,3 +1317,7 @@ table th[data-sortt-desc] {
.ui.secondary.pointing.menu .item {
padding: 12px;
}

.ui.header > .ui.label.compact {
margin-top: inherit;
}
21 changes: 16 additions & 5 deletions web_src/less/_repository.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,24 @@
font-weight: 400;
font-size: 1.5rem;

svg {
position: relative;
top: 5px;
.label {
vertical-align: middle;
}

svg.octicon-lock {
margin-left: 5px;
&.repo-title .repo-header-icon {
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;
}
}
}

Expand Down
4 changes: 4 additions & 0 deletions web_src/less/themes/theme-arc-green.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1596,3 +1596,7 @@ footer .container .links > * {
.tribute-container li:hover {
background: #728e5e !important;
}

.repository .repo-header .ui.huge.breadcrumb.repo-title .repo-header-icon .avatar {
color: #2a2e3a;
}