Merge branch 'master' into orgs

Conflicts:
	endpoints/api.py
	static/partials/new-repo.html
This commit is contained in:
Joseph Schorr 2013-11-04 14:59:00 -05:00
commit 633f603f9d
4 changed files with 25 additions and 6 deletions

View file

@ -211,10 +211,14 @@
color: #444 !important;
}
.new-repo .new-header {
.new-repo .new-header span {
font-size: 22px;
}
.new-repo .new-header .popover {
font-size: 14px;
}
.new-repo .new-header .repo-circle {
margin-right: 14px;
}
@ -398,6 +402,10 @@
padding: 20px;
}
.landing .popover {
font-size: 14px;
}
.landing {
color: white;