Merge pull request #126 from leafcloudhq/master

Fixed a display issue for long ipv6 addresses and port input on mobile
This commit is contained in:
Martin Polden 2021-01-10 13:30:23 +01:00 committed by GitHub
commit 994c2529e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 30 deletions

View File

@ -71,4 +71,4 @@ endif
@sha256sum $(GOPATH)/bin/$(XBIN) @sha256sum $(GOPATH)/bin/$(XBIN)
run: run:
go run cmd/echoip/main.go -a data/asn.mmdb -c data/city.mmdb -f data/country.mmdb -H x-forwarded-for -r -s go run cmd/echoip/main.go -a data/asn.mmdb -c data/city.mmdb -f data/country.mmdb -H x-forwarded-for -r -s -p

View File

@ -74,11 +74,11 @@
<h2>What do we know about this IP address?</h2> <h2>What do we know about this IP address?</h2>
<table class="info-table"> <table class="info-table">
<tr> <tr>
<th scope="row">IP address</th> <th scope="row">IP&nbsp;address</th>
<td>{{ .IP }}</td> <td>{{ .IP }}</td>
</tr> </tr>
<tr> <tr>
<th scope="row">IP address (decimal)</th> <th scope="row">IP&nbsp;address (decimal)</th>
<td>{{ .IPDecimal }}</td> <td>{{ .IPDecimal }}</td>
</tr> </tr>
{{ if .Country }} {{ if .Country }}
@ -103,7 +103,7 @@
</tr> </tr>
{{ end }} {{ if .RegionCode }} {{ end }} {{ if .RegionCode }}
<tr> <tr>
<th scope="row">Region code</th> <th scope="row">Region&nbsp;code</th>
<td>{{ .RegionCode }}</td> <td>{{ .RegionCode }}</td>
</tr> </tr>
{{ end }} {{ if .MetroCode }} {{ end }} {{ if .MetroCode }}
@ -113,7 +113,7 @@
</tr> </tr>
{{ end }} {{ if .PostalCode }} {{ end }} {{ if .PostalCode }}
<tr> <tr>
<th scope="row">Postal code</th> <th scope="row">Postal&nbsp;code</th>
<td>{{ .PostalCode }}</td> <td>{{ .PostalCode }}</td>
</tr> </tr>
{{ end }} {{ if .City }} {{ end }} {{ if .City }}
@ -153,17 +153,17 @@
</tr> </tr>
{{ end }} {{ if .UserAgent }} {{ if .UserAgent.Comment }} {{ end }} {{ if .UserAgent }} {{ if .UserAgent.Comment }}
<tr> <tr>
<th scope="row">User agent</th> <th scope="row">User&nbsp;agent</th>
<td>{{ .UserAgent.Product }}/{{ .UserAgent.Version }}</td> <td>{{ .UserAgent.Product }}/{{ .UserAgent.Version }}</td>
</tr> </tr>
{{ end }} {{ if .UserAgent.Comment }} {{ end }} {{ if .UserAgent.Comment }}
<tr> <tr>
<th scope="row">User agent: Comment</th> <th scope="row">User&nbsp;agent: Comment</th>
<td>{{ .UserAgent.Comment }}</td> <td>{{ .UserAgent.Comment }}</td>
</tr> </tr>
{{ end }} {{ if .UserAgent.RawValue }} {{ end }} {{ if .UserAgent.RawValue }}
<tr> <tr>
<th scope="row">User agent: Raw</th> <th scope="row">User&nbsp;agent: Raw</th>
<td>{{ .UserAgent.RawValue }}</td> <td>{{ .UserAgent.RawValue }}</td>
</tr> </tr>
{{ end }} {{ end }} {{ end }} {{ end }}
@ -200,52 +200,52 @@
</p> </p>
<div class="pure-form"> <div class="pure-form">
<!-- COMMAND WIDGET --> <!-- COMMAND WIDGET -->
<div class="buttons"> <div class="input-buttons">
<button <button
name="ip" name="ip"
class="button widget-select" class="pure-button widget-select"
onclick="changeInput(this.name, this)" onclick="changeInput(this.name, this)"
> >
ip ip
</button> </button>
<button <button
name="country" name="country"
class="button widget-select" class="pure-button widget-select"
onclick="changeInput(this.name, this)" onclick="changeInput(this.name, this)"
> >
country country
</button> </button>
<button <button
name="country-iso" name="country-iso"
class="button widget-select" class="pure-button widget-select"
onclick="changeInput(this.name, this)" onclick="changeInput(this.name, this)"
> >
country-iso country-iso
</button> </button>
<button <button
name="city" name="city"
class="button widget-select" class="pure-button widget-select"
onclick="changeInput(this.name, this)" onclick="changeInput(this.name, this)"
> >
city city
</button> </button>
<button <button
name="asn" name="asn"
class="button widget-select" class="pure-button widget-select"
onclick="changeInput(this.name, this)" onclick="changeInput(this.name, this)"
> >
asn asn
</button> </button>
<button <button
name="json" name="json"
class="button widget-select" class="pure-button widget-select"
onclick="changeInput(this.name, this)" onclick="changeInput(this.name, this)"
> >
json json
</button> </button>
<button <button
name="port" name="port"
class="button widget-select" class="pure-button widget-select"
onclick="changeInput(this.name, this)" onclick="changeInput(this.name, this)"
> >
port port
@ -266,12 +266,13 @@
</div> </div>
<div id="output" class="widgetbox output"></div> <div id="output" class="widgetbox output"></div>
<form class="pure-form"> <form class="pure-form input-buttons">
<fieldset> <fieldset>
<label for="ipCheckBox"> <label for="ipInput">
Check another IP (optional)
<input <input
id="ipInput" id="ipInput"
class="medium-input pure-input" class=""
type="text" type="text"
placeholder="IP to query" placeholder="IP to query"
onkeyup="updateIP(this.value)" onkeyup="updateIP(this.value)"

View File

@ -71,7 +71,6 @@
function navigate(event) { function navigate(event) {
console.log("navigate", compositePath) console.log("navigate", compositePath)
window.location = compositePath window.location = compositePath
event.preventDefault()
} }
function updatePort(value) { function updatePort(value) {

View File

@ -26,6 +26,7 @@
background: #f2f2f2; background: #f2f2f2;
font-size: 36px; font-size: 36px;
padding: 6px; padding: 6px;
word-wrap: break-word;
} }
svg.github-corner { svg.github-corner {
fill: #151513; fill: #151513;
@ -52,12 +53,12 @@
.info-table th { .info-table th {
padding: 5px; padding: 5px;
border: 2px solid #ababab; border: 2px solid #ababab;
word-wrap: break-word;
} }
.info-table th[scope="row"] { .info-table th[scope="row"] {
background-color: #d5d5d5; background-color: #d5d5d5;
text-align: left; text-align: left;
white-space: nowrap;
} }
.widgetbox { .widgetbox {
@ -88,11 +89,6 @@
text-align: right; text-align: right;
} }
.narrow-input {
width: 5.5em;
margin-top: 0.2em;
}
.medium-input { .medium-input {
width: 10em; width: 10em;
} }
@ -101,6 +97,11 @@
background-color: rgb(208 208 208); background-color: rgb(208 208 208);
} }
.input-buttons {
line-height: 2.6em;
font-size: smaller;
}
/* POST CORRECTION */ /* POST CORRECTION */
.leafcloud-logo .letters { .leafcloud-logo .letters {
fill: black; fill: black;
@ -113,7 +114,6 @@
a { a {
background-color: #161719; background-color: #161719;
color: #d8d9da; color: #d8d9da;
/* text-decoration: underline; */
} }
.ip { .ip {
border: 1px solid #313233; border: 1px solid #313233;
@ -137,13 +137,13 @@
background-color: #2e2e2e; background-color: #2e2e2e;
color: rgb(220, 220, 220); color: rgb(220, 220, 220);
text-align: left; text-align: left;
white-space: nowrap;
} }
button { .pure-button {
background-color: #2e2e2e; background-color: #2e2e2e;
color: rgb(220, 220, 220);
} }
button.selected { .pure-button.selected {
background-color: rgb(125 125 125); background-color: rgb(125 125 125);
} }