test1234
/
gitea
forked from gitea/gitea
1
0
Fork 0
Code Pull Requests Activity

Style orgs list in user profile (#6911)

This commit is contained in:
Xaver Maierhofer 2019-05-13 22:52:59 +02:00 committed by Lauris BH
parent 06ae9a3a96
commit 597ac064c3
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/css/index.css
View File

@ -890,6 +890,8 @@ tbody.commit-list{vertical-align:baseline}
.user.notification .octicon.blue{color:#2185d0} .user.notification .octicon.blue{color:#2185d0}
.user.link-account:not(.icon){padding-top:15px;padding-bottom:5px} .user.link-account:not(.icon){padding-top:15px;padding-bottom:5px}
.user.settings .iconFloat{float:left} .user.settings .iconFloat{float:left}
.user-orgs{display:flex;flex-flow:row wrap;padding:0;margin:-3px!important}
.user-orgs li{display:flex;border-bottom:0!important;padding:3px!important;width:20%;max-width:60px}
.dashboard{padding-top:15px} .dashboard{padding-top:15px}
.dashboard.feeds .context.user.menu,.dashboard.issues .context.user.menu{z-index:101;min-width:200px} .dashboard.feeds .context.user.menu,.dashboard.issues .context.user.menu{z-index:101;min-width:200px}
.dashboard.feeds .context.user.menu .ui.header,.dashboard.issues .context.user.menu .ui.header{font-size:1rem;text-transform:none} .dashboard.feeds .context.user.menu .ui.header,.dashboard.issues .context.user.menu .ui.header{font-size:1rem;text-transform:none}

15
public/less/_user.less
View File

@ -133,3 +133,18 @@
} }
} }
} }
.user-orgs {
display: flex;
flex-flow: row wrap;
padding: 0;
margin: -3px !important;
li {
display: flex;
border-bottom: 0 !important;
padding: 3px !important;
width: 20%;
max-width: 60px;
}
}

6
templates/user/profile.tmpl
View File

@ -69,11 +69,15 @@
*/}} */}}
{{if and .Orgs .HasOrgsVisible}} {{if and .Orgs .HasOrgsVisible}}
<li> <li>
<ul class="user-orgs">
{{range .Orgs}} {{range .Orgs}}
{{if (or .Visibility.IsPublic (and ($.SignedUser) (or .Visibility.IsLimited (and (.IsUserPartOfOrg $.SignedUserID) .Visibility.IsPrivate) ($.IsAdmin))))}} {{if (or .Visibility.IsPublic (and ($.SignedUser) (or .Visibility.IsLimited (and (.IsUserPartOfOrg $.SignedUserID) .Visibility.IsPrivate) ($.IsAdmin))))}}
<a href="{{.HomeLink}}"><img class="ui mini image poping up" src="{{.RelAvatarLink}}" data-content="{{.Name}}" data-position="top center" data-variation="tiny inverted"></a> <li>
<a href="{{.HomeLink}}"><img class="ui image poping up" src="{{.RelAvatarLink}}" data-content="{{.Name}}" data-position="top center" data-variation="tiny inverted"></a>
</li>
{{end}} {{end}}
{{end}} {{end}}
</ul>
</li> </li>
{{end}} {{end}}
{{if and .IsSigned (ne .SignedUserName .Owner.Name)}} {{if and .IsSigned (ne .SignedUserName .Owner.Name)}}