Merge pull request #10 from Cryptkeeper/fat

Fat
This commit is contained in:
Cryptkeeper 2015-12-18 22:24:00 -06:00
commit ddf33064dd
3 changed files with 46 additions and 17 deletions

@ -13,14 +13,23 @@ body {
font-weight: 300 !important; font-weight: 300 !important;
} }
/* Header */ /* Page layout */
#header { html, body {
height: 100%;
}
#push {
position: relative;
min-height: 100%;
}
/* Header, footer */
#header, #footer {
background: #EBEBEB; background: #EBEBEB;
color: #3B3738; color: #3B3738;
padding: 20px 0; padding: 20px 0;
text-align: center; text-align: center;
border-top: 1px solid #DED3D6; width: 1540px;
width: 840px;
margin: 0 auto; margin: 0 auto;
} }
@ -47,11 +56,18 @@ body {
font-size: 42px; font-size: 42px;
} }
#footer {
border-top-right-radius: 2px;
border-top-left-radius: 2px;
font-size: 16px;
text-transform: uppercase;
}
/* Tagline */ /* Tagline */
#tagline { #tagline {
padding: 10px 0; padding: 10px 0;
text-align: center; text-align: center;
width: 840px; width: 1540px;
margin: 0 auto; margin: 0 auto;
border-bottom-left-radius: 2px; border-bottom-left-radius: 2px;
border-bottom-right-radius: 2px; border-bottom-right-radius: 2px;
@ -78,19 +94,17 @@ body {
/* Server listing */ /* Server listing */
#server-container { #server-container {
width: 800px; width: 1540px;
margin: 10px auto 20px auto; margin: 10px auto;
} overflow: auto;
#server-container .server:nth-child(2n) {
background: #4E4E4E;
border-radius: 2px;
} }
.server { .server {
overflow: auto; overflow: auto;
padding: 10px; padding: 5px 10px;
margin: 5px; margin: 0 5px;
width: 740px;
display: inline-block;
} }
.server > .column > img { .server > .column > img {
@ -161,6 +175,7 @@ h3 {
top: 10px; top: 10px;
left: 10px; left: 10px;
overflow: auto; overflow: auto;
display: none;
} }
.quick-jump-icon { .quick-jump-icon {
@ -180,7 +195,7 @@ h3 {
/* The big graph */ /* The big graph */
#big-graph, #big-graph-controls, #big-graph-checkboxes { #big-graph, #big-graph-controls, #big-graph-checkboxes {
width: 1000px; width: 1540px;
margin: 15px auto 0 auto; margin: 15px auto 0 auto;
} }
@ -188,6 +203,10 @@ h3 {
width: 100%; width: 100%;
} }
#big-graph {
margin-top: 20px;
}
#big-graph-controls { #big-graph-controls {
margin: 10px auto; margin: 10px auto;
} }

@ -16,6 +16,8 @@
<div id="tooltip"></div> <div id="tooltip"></div>
<div id="push">
<div id="header"> <div id="header">
<h1 class="text-uppercase">Minetrack</h1> <h1 class="text-uppercase">Minetrack</h1>
@ -63,6 +65,14 @@
<div id="server-container" class="container"></div> <div id="server-container" class="container"></div>
</div>
<div id="footer">
Copyright &copy; 2015. All rights reserved. Logo copyrights belong to their respective owners.
</div>
<div id="quick-jump-container"></div> <div id="quick-jump-container"></div>
<!-- External JS assets --> <!-- External JS assets -->

@ -287,7 +287,7 @@ $(document).ready(function() {
for (var i = 0; i < keys.length; i++) { for (var i = 0; i < keys.length; i++) {
html += '<td><input type="checkbox" class="graph-control" id="graph-controls" data-target-network="' + keys[i] + '" checked=checked> ' + keys[i] + '</input></td>'; html += '<td><input type="checkbox" class="graph-control" id="graph-controls" data-target-network="' + keys[i] + '" checked=checked> ' + keys[i] + '</input></td>';
if (sinceBreak >= 3) { if (sinceBreak >= 7) {
sinceBreak = 0; sinceBreak = 0;
html += '</tr><tr>'; html += '</tr><tr>';
@ -354,7 +354,7 @@ $(document).ready(function() {
<br />\ <br />\
<p class="text-center-align rank" id="ranking_' + safeName(info.name) + '"></p>\ <p class="text-center-align rank" id="ranking_' + safeName(info.name) + '"></p>\
</div>\ </div>\
<div class="column" style="width: 280px;">\ <div class="column" style="width: 220px;">\
<h3>' + info.name + '&nbsp;<span class="type">' + info.type + '</span></h3>\ <h3>' + info.name + '&nbsp;<span class="type">' + info.type + '</span></h3>\
<span class="color-gray">' + info.ip + '</span>\ <span class="color-gray">' + info.ip + '</span>\
<br />\ <br />\