Merge pull request #41 from ccnmtl/search-input-changes

Search input changes
ccnmtl · Apr 17, 2017 · ae90821 · ae90821
2 parents e05bb44 + 730d9b8
commit ae90821
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 57 deletions.
diff --git a/list.css b/list.css
@@ -1,20 +1,20 @@
 .event
 {
-	width: 100%;
-	margin-top: 2.5em;
+    width: 100%;
+    margin-top: 2.5em;
 }
 
 .event *, form *, select, input { font-size: 14px!important; }
 input { border-radius: 5px; }
 
 .event .event_specifics
 {
-	padding-top: 1.25em;
-	border-top: 1px solid #eee;
+    padding-top: 1.25em;
+    border-top: 1px solid #eee;
 }
 .event .event_specifics h3 a
 {
-	font-size: 1.25em!important;
+    font-size: 1.25em!important;
 }
 
 .event .event_specifics a:hover { cursor: pointer; }
@@ -24,63 +24,63 @@ input { border-radius: 5px; }
 
 #loader-animation-container
 {
-	position: absolute;
-	height: 200px;
-	background-color: white;
-	width: 100%;
-	display: flex;
-	justify-content: center;
-	align-items: center;
+    position: absolute;
+    height: 200px;
+    background-color: white;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
 }
 
 .ball-pulse > div { background-color: #666; }
 
 button#clear-search
 {
-	background-color: #fff;
-	border-radius: 5px;
+    background-color: #fff;
+    border-radius: 5px;
 }
 
 .search-wrapper
 {
-	position: relative;
-	background-color: #f3f3f3;
-	margin-top: 1em;
-	padding: .5em;
-	border-radius: 5px;
+    position: relative;
+    background-color: #f3f3f3;
+    margin-top: 1em;
+    padding: .5em;
+    border-radius: 5px;
 }
 
-#left-area ul, .entry-content ul, .comment-content ul, body.et-pb-preview #main-content .container ul
-{
-	padding: 0px;
-	line-height: 26px;
+#left-area ul, .entry-content ul,
+.comment-content ul,
+body.et-pb-preview #main-content .container ul {
+    padding: 0px;
+    line-height: 26px;
 }
 
 .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { background-color: #eee!important; }
 
 .ctl-theme .current
 {
-	background-color: #75AADB!important;
-	color: white;
-	border-color: #444;
-	cursor: default;
-	border-radius: 5px;
+    background-color: #75AADB!important;
+    color: white;
+    border-color: #444;
+    cursor: default;
+    border-radius: 5px;
 }
 
-form, label, input, select
-{
-	display: block;
-	margin-top: 5px;
-	width: 100%;
+form, label, input, select {
+    display: block;
+    margin-top: 5px;
+    width: 100%;
 }
 
 label input
 {
-	padding: 2px;
-	border: 1px solid #bbb;
-	color: #4e4e4e;
-	background-color: #fff;
-	height: 24px;
+    padding: 2px;
+    border: 1px solid #bbb;
+    color: #4e4e4e;
+    background-color: #fff;
+    height: 24px;
 }
 
 .sharedaddy { display: none; }
@@ -89,28 +89,34 @@ label input
 
 @media (min-width: 981px)
 {
-	/*start - desktop widget layout*/
-	.search-wrapper
-	{
-		position: relative;
-		width: 100%;
-		background-color: #fff;
-	}
-
-	form {position: absolute; top: 0%; left: 0%; width: 25%; padding-right: .5em;}
-
+    /*start - desktop widget layout*/
+    .search-wrapper
+    {
+        position: relative;
+        width: 100%;
+        background-color: #fff;
+    }
+
+    form.search-container {
+        position: absolute;
+        top: 0%;
+        left: 0%;
+        width: 25%;
+        padding-right: .5em;
+    }
+
     #location-dropdown-container {position: absolute; top: 0%; left: 25%; width: 25%; padding-right: .5em;}
 
     #audience-dropdown-container {position: absolute; top: 0%; left: 50%; width: 25%; padding-right: .5em; }
 
-	label#from {position: absolute; top: 0%; left: 75%; width: 12.5%; padding-right: .5em; margin: 0;}
-	label#to {position: absolute; top: 0%; left: 87.5%; width: 12.5%;  margin: 0;}
+    label#from {position: absolute; top: 0%; left: 75%; width: 12.5%; padding-right: .5em; margin: 0;}
+    label#to {position: absolute; top: 0%; left: 87.5%; width: 12.5%;  margin: 0;}
+
+    button#clear-search
+    {
+        display: none;
+    }
 
-	button#clear-search
-	{
-	display: none;
-	}
-
     /*stop - desktop widget layout*/
 
 }
diff --git a/main.js b/main.js
@@ -211,8 +211,8 @@
             '</div>' +
             '<div class="search-wrapper">' +
 
-            '<form role="search">' +
-            '<input id="q" type="text" required="" class="search-box" ' +
+            '<form class="search-container" role="search">' +
+            '<input id="q" type="search" required="" class="search-box" ' +
             'placeholder="I\'m searching for...">' +
             '<button class="close-icon" id="clear-search" type="reset">' +
             'Reset</button>' +
@@ -258,6 +258,9 @@
         });
 
         $('#clear-search').click(clearSearch);
+        $('form.search-container').submit(function(e) {
+            e.preventDefault();
+        });
         $('#q').keyup(function() {
             $('#calendarList').empty();