Merge pull request #150 from Hutchy68/fix/topnav-search

Fixing the search inputbox and button.

Foreground.skin.php

@@ -104,14 +104,11 @@ class foregroundTemplate extends BaseTemplate {
 			<ul id="top-bar-right" class="right">
 				<li class="has-form">
 					<form action="<?php $this->text( 'wgScript' ); ?>" id="searchform" class="mw-search">
-						<div class="row collapse">
-						<div class="small-8 columns">
+						<div class="row">
+						<div class="small-12 columns">
 							<?php echo $this->makeSearchInput(array('placeholder' => wfMessage('searchsuggest-search')->text(), 'id' => 'searchInput') ); ?>
-						</div>
-						<div class="small-4 columns">
 							<button type="submit" class="button search"><?php echo wfMessage( 'search' )->text() ?></button>
 						</div>
-						</div>
 						</form>
 				</li>
 				<li class="divider show-for-small"></li>

assets/stylesheets/foreground.css

@@ -431,8 +431,26 @@ button, .button {
 }
 
 .top-bar .button.search {
-  top: 1px;
-  text-align: left;
+  top: 0px;
+}
+
+.top-bar .button.search {
+  margin-left: 10px;
+}
+
+.top-bar-section .has-form {
+  padding: 0 5px;
+}
+
+.top-bar input {
+  top: 0px;
+}
+
+@media only screen and (min-width: 768px) {
+.top-bar .button.search {
+  top: 1px; }
+.top-bar .button.search {
+  margin-left: -4px; }
 }
 
 .top-bar-section .dropdown {