Permalink
Browse files

Merge branch 'master' of github.com:plaza/Plaza

  • Loading branch information...
2 parents 4bebe57 + 0083f7e commit 3329e934fce509e12191777feca31f057b5adb9b @valderrama valderrama committed Nov 5, 2011
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -43,7 +43,7 @@ function Searcher () {
$results = $search.children("#results");
$blind = $("<div id='blind' />").appendTo(document.body)
.css({
- 'position': 'absolute',
+ 'position': 'fixed',
'left' : 0,
'top' : 0,
'right' : 0,
@@ -175,14 +175,13 @@ function Searcher () {
cache: true,
data: {query: value},
error: function(jqXHR, textStatus, errorThrown) {
- console.log(["Error:", jqXHR, textStatus, errorThrown, settings]);
+ console.log(["Error:", jqXHR, textStatus, errorThrown]);
// $('#spot-spinner').hide();
if (textStatus != "abort") {
$results.children('.none-found').remove();
var errorText = "Server error";
if ($.trim(errorThrown)) errorText += ": " + errorThrown;
$results.append("<li class='error'>" + errorText + "</li>");
- $results.show();
}
},
success: function(data, textStatus, jqXHR) {
@@ -31,18 +31,31 @@ body {
height: 73px;
}
- #logo-img, #search-wrapper {
+ #logo-img {
float: left;
}
#search-wrapper {
- margin: 35px 0px 0px 0px;
+ float: left;
+ margin-top: 33px;
+ margin-left: 65px;
}
#search-input {
- font-size: 20px;
width: 180px;
- margin-left: 125px;
+ margin-left: 12px;
+ font-size: 13px;
+ -webkit-appearance: none;
+ padding: 5px 5px 5px 24px;
+ border-radius: 20px;
+ background-color: #8AD1FD;
+ background-image: url(mag-glass.png);
+ background-repeat: no-repeat;
+ background-position: 8px 6px;
+ color: white;
+ outline: none;
+ -moz-box-shadow:inset 0 2px 2px rgba(0, 0, 0, 0.75);;
+ box-shadow:inset 0 1px 5px rgba(0, 0, 0, 0.75);
}
.a-result {
@@ -67,6 +67,7 @@
</span>
<div class="clear"></div>
</div>
+ <% if @group_upcoming_events && !@group_upcoming_events.empty? %>
<% for i in 0..3 %>
<% if @group_future_events[i] != nil %>
<% future_event = @group_future_events[i] %>

0 comments on commit 3329e93

Please sign in to comment.