Merge branch 'master' of ssh://bitbucket.org/yackob03/quay

Conflicts:
	static/js/controllers.js
This commit is contained in:
yackob03 2013-10-01 19:39:28 -04:00
commit 211fd6bcd7
8 changed files with 105 additions and 7 deletions

View file

@ -175,6 +175,15 @@ background: linear-gradient(to bottom, #141414 0%,transparent 15%,transparent 8
width: 150px;
}
.landing-footer .copyright {
position: absolute;
left: 10px;
bottom: 4px;
font-size: 11px;
color: black;
}
#repoSearch {
width: 400px;
}

View file

@ -43,7 +43,7 @@ function HeaderCtrl($scope, UserService) {
$('#repoSearch').typeahead({
name: 'repositories',
remote: {
url: '/api/repository/find/%QUERY',
url: '/api/find/repository?query=%QUERY',
filter: function(data) {
var datums = [];
for (var i = 0; i < data.repositories.length; ++i) {

View file

@ -59,8 +59,8 @@
<div class="footer-column">
<h4>Legal</h4>
<ul>
<li><a href="">Terms of Service</a></li>
<li><a href="">Privacy Policy</a></li>
<li><a href="/tos">Terms of Service</a></li>
<li><a href="/privacy">Privacy Policy</a></li>
</ul>
</div>
@ -72,5 +72,6 @@
</div>
<a href="https://devtable.com"><img class="dt-logo" src="/static/dt-logo.png"></a>
<span class="copyright">&copy;2013 DevTable, LLC</span>
</div>