[hamradio-commits] [dump1090] 164/389: Upstream merge conflicts resolved

[Matthew Ernisse]

This is an automated email from the git hooks/post-receive script.

mernisse-guest pushed a commit to branch master
in repository dump1090.

commit cac715e40a1234546405fdf5be2361d3d2ba36e8
Merge: 78f565c f56679a
Author: terribl <terri at rannalla.net>
Date:   Sun May 12 09:50:20 2013 +0300

    Upstream merge conflicts resolved

 dump1090.c            | 10 +++++-----
 public_html/script.js | 25 +++++++++++++++++++++++++
 public_html/style.css |  5 +++++
 3 files changed, 35 insertions(+), 5 deletions(-)

diff --cc public_html/style.css
index 1226b04,86c8576..26837fc
--- a/public_html/style.css
+++ b/public_html/style.css
@@@ -1,44 -1,39 +1,49 @@@
 -html { height: 100% }
 -body { height: 100%; margin: 0; padding: 0 }
 -#map_canvas { height: 100% }
 +html { height: 100%; }
 +body { height: 100%; margin: 0; padding: 0; }
 +
 +#map_canvas {
 +    height: 100%;
 +}
 +
  #info {
 -position: absolute;
 -width:20%;
 -height:100%;
 -bottom:0px;
 -right:0px;
 -top:0px;
 -background-color: white;
 -border-left:1px #666 solid;
 -font-family:Helvetica;
 +    position: absolute;
 +    width: 300px;
 +    height: 100%;
 +    bottom: 0px;
 +    right: 0px;
 +    top: 0px;
 +    background-color: white;
 +    border-left: 1px #666 solid;
 +    font-family: Helvetica;
  }
 +
  #info div {
 -padding:0px;
 -padding-left:10px;
 -margin:0px;
 +    padding: 0px;
 +    padding-left: 10px;
 +    margin:0px;
  }
 +
  #info div h1 {
 -margin-top:10px;
 -font-size:16px;
 +    margin-top: 10px;
 +    font-size: 16px;
  }
 +
  #info div p {
 -font-size:14px;
 -color:#333;
 +    font-size: 14px;
 +    color: #333;
  }
 -#info_footer {
 -position: absolute;
 -display: none;
 -text-align: center;
 -padding:0px;
 -margin:0px;
 +
 +#tableinfo {
 +    font-size: x-small;
 +    font-family: monospace;
  }
 +
 +#tabinfo {
 +    cursor: pointer;
 +}
 +
+ #tableinfo {
+ font-size: x-small;
+ font-family: monospace;
+ }
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/dump1090.git