vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'koh'

Browse source 
Conflicts:
	auth/scopes.py
	requirements-nover.txt
	requirements.txt
	static/css/quay.css
	static/directives/namespace-selector.html
	static/js/app.js
	static/partials/manage-application.html
	templates/oauthorize.html
This commit is contained in:
Jimmy Zelinskie 2014-12-01 12:30:09 -08:00
commit f3259c862b
57 changed files with 537 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

17
static/css/quay.css
View file

@ -4264,9 +4264,10 @@ pre.command:before {
display: block !important;
}
.auth-header > img {
.auth-header > .avatar {
float: left;
margin-top: 8px;
display: inline-block;
margin-top: 12px;
margin-right: 20px;
}
@ -4827,7 +4828,7 @@ i.slack-icon {
margin-bottom: 10px;
}
.member-listing .gravatar {
.member-listing .avatar {
vertical-align: middle;
margin-right: 10px;
}
@ -4887,4 +4888,12 @@ i.slack-icon {
half (although it is still not great)
*/
transform: translateZ(0);
}
}
#gen-token table {
margin: 10px;
}
#gen-token input[type="checkbox"] {
margin-right: 10px;
}