make headers more compact

diff --git a/lib/template/address-html.php b/lib/template/address-html.php
index 696188653bc339b688823f5277da2c1a246e53a3..34bf852cacceadb5c5a50766ba485162a05be927 100644 (file)
--- a/lib/template/address-html.php
+++ b/lib/template/address-html.php
@@ -16,10 +16,10 @@
       <input name="lat" type="text" class="form-control input-sm" placeholder="latitude"  value="<?php echo htmlspecialchars($_GET['lat']); ?>" >
       <input name="lon" type="text" class="form-control input-sm" placeholder="longitude" value="<?php echo htmlspecialchars($_GET['lon']); ?>" >
     </div>
       <input name="lat" type="text" class="form-control input-sm" placeholder="latitude"  value="<?php echo htmlspecialchars($_GET['lat']); ?>" >
       <input name="lon" type="text" class="form-control input-sm" placeholder="longitude" value="<?php echo htmlspecialchars($_GET['lon']); ?>" >
     </div>

-    <div class="form-group">
+    <div class="form-group search-button-group">

       <button type="submit" class="btn btn-primary btn-sm">Search</button>
     </div>
       <button type="submit" class="btn btn-primary btn-sm">Search</button>
     </div>

-    <div>
+    <div class="search-type-link">

       <a href="<?php echo CONST_Website_BaseURL; ?>search.php">forward search</a>
     </div>
   </form>
       <a href="<?php echo CONST_Website_BaseURL; ?>search.php">forward search</a>
     </div>
   </form>

diff --git a/lib/template/search-html.php b/lib/template/search-html.php
index e99807965b4daf4c72d7e39bd73cfd54c525d130..e523c44680e9b268db9c1e39ee88ecfc87b1c5b2 100644 (file)
--- a/lib/template/search-html.php
+++ b/lib/template/search-html.php
@@ -14,7 +14,7 @@
                <div class="form-group">
                        <input id="q" name="q" type="text" class="form-control input-sm" placeholder="Search" value="<?php echo htmlspecialchars($sQuery); ?>" >
                </div>
                <div class="form-group">
                        <input id="q" name="q" type="text" class="form-control input-sm" placeholder="Search" value="<?php echo htmlspecialchars($sQuery); ?>" >
                </div>

-               <div class="form-group">
+               <div class="form-group search-button-group">

                        <button type="submit" class="btn btn-primary btn-sm">Search</button>
                        <?php if (CONST_Search_AreaPolygons) { ?>
                                <!-- <input type="checkbox" value="1" name="polygon" <?php if ($bAsText) echo "checked='checked'"; ?>/> Highlight -->
                        <button type="submit" class="btn btn-primary btn-sm">Search</button>
                        <?php if (CONST_Search_AreaPolygons) { ?>
                                <!-- <input type="checkbox" value="1" name="polygon" <?php if ($bAsText) echo "checked='checked'"; ?>/> Highlight -->


@@ -28,7 +28,7 @@
                                </label>
                        </div>
                </div>
                                </label>
                        </div>
                </div>

-               <div>
+               <div class="search-type-link">

                        <a href="<?php echo CONST_Website_BaseURL; ?>reverse.php?format=html">reverse search</a>
                </div>
        </form>
                        <a href="<?php echo CONST_Website_BaseURL; ?>reverse.php?format=html">reverse search</a>
                </div>
        </form>

diff --git a/website/css/common.css b/website/css/common.css
index 8a36339f02d8268b61f26fa633304da4d08b3f8e..aaf0b340491cd7946d09b2aa17d402a646da6103 100644 (file)
--- a/website/css/common.css
+++ b/website/css/common.css
@@ -1,6 +1,6 @@
 header {
   width: 100%;
 header {
   width: 100%;

-  padding: 15px;
+  padding: 5px;

   z-index: 5;
 }
 
   z-index: 5;
 }
 

diff --git a/website/css/search.css b/website/css/search.css
index 8ac51f9a94448f307400ccb08073c8876ccf8db9..55a6f9f5cbf5b0402aa60ce5f03cd7ba6ce10761 100644 (file)
--- a/website/css/search.css
+++ b/website/css/search.css
@@ -7,6 +7,11 @@ form {
 form #q {
   min-width: 500px;
 }
 form #q {
   min-width: 500px;
 }

+@media (max-width: 850px) {
+form #q {
+  min-width: 400px;
+}
+}

 form .checkbox-inline {
   margin-left: 10px;  
 }
 form .checkbox-inline {
   margin-left: 10px;  
 }


@@ -14,6 +19,13 @@ form label {
   font-weight: normal;
 }
 
   font-weight: normal;
 }
 

+.search-type-link {
+  display: inline;
+  margin-right: 2em;
+  position: absolute;
+  right: 0
+}
+

 .sidebar {
   width: 25%;
   padding: 15px;
 .sidebar {
   width: 25%;
   padding: 15px;


@@ -123,4 +135,7 @@ footer p {
   .sidebar {
     width: 100%;
   }
   .sidebar {
     width: 100%;
   }

+  .search-button-group {
+    display: inline
+  }

 }
 }