Merge branch 'master' into tutorial

Conflicts:
	endpoints/index.py
	static/css/quay.css
	static/js/app.js
	static/js/controllers.js
	test/data/test.db
This commit is contained in:
Joseph Schorr 2014-02-06 21:23:27 -05:00
commit 98e57b9d2b
19 changed files with 1615 additions and 66 deletions

View file

@ -2898,4 +2898,36 @@ pre.command:before {
.form-inline {
display: inline-block;
margin-left: 10px;
}
/*********************************************/
.contact-options .option-twitter .fa-circle {
color: #00b0ed;
}
.contact-options .option-phone .fa-circle {
color: #1dd924;
}
.contact-options .option-irc .fa-circle {
color: #e52f00;
}
.contact-options .option-email .fa-circle {
color: #1b72f1;
}
.about-us .row {
margin-bottom: 30px;
}
.about-basic-icon {
display: inline-block;
margin-right: 10px;
color: #555;
}
.about-basic-text {
display: inline-block;
}