Commit a9c3ed78 authored by Tyler Hallada's avatar Tyler Hallada
Browse files

Merge branch 'master' of github.com:thallada/whats-open

Conflicts:
	website/static/js/typeAhead.js
parents 2a226d3d d563159c
......@@ -18,6 +18,7 @@ div.container{
font-size: 50px;
font-weight: 900;
margin-top:30px;
line-height: 50px;
}
#grid div[class*='span']{
......@@ -46,6 +47,7 @@ div.container{
.search-row{
text-align: center;
padding-top:20px;
}
ul.ui-autocomplete {
list-style: none;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment