Merge remote-tracking branch 'github/master' into portable

debomatic-webui/public/stylesheets/style.css

@@ -118,6 +118,7 @@ footer .info {
 }
 
 #packages .search {
+  display: none;
   margin-bottom: 5px;
 }
 

debomatic-webui/views/distribution.ejs

@@ -13,11 +13,13 @@
   <aside id="sidebar" class="col-md-3">
     <nav id="packages">
       <h2>Packages</h2>
-      <div class="input-group search">
-        <input type="text" class="form-control text" placeholder="Search">
-        <span class="input-group-btn">
-          <a class="btn btn-default reset"><span class="glyphicon glyphicon-remove-sign"></span></a>
-        </span>
+      <div class="search">
+        <div class="input-group">
+          <input type="text" class="form-control text" placeholder="Search">
+          <span class="input-group-btn">
+            <a class="btn btn-default reset"><span class="glyphicon glyphicon-remove-sign"></span></a>
+          </span>
+        </div>
       </div>
       <ul class="nav nav-pills nav-stacked"></ul>
     </nav>