Merge pull request #166 from Cryptkeeper/uplot

5.5.0 release preview

.eslintrc.json

@@ -1,8 +1,7 @@
 {
     "env": {
         "browser": true,
-        "es6": true,
-	"jquery": true
+        "es6": true
     },
     "extends": [
         "standard"

assets/css/main.css

@@ -1,4 +1,7 @@
 @import url(https://fonts.googleapis.com/css?family=Open+Sans:700,300);
+
+@import url(uplot/dist/uPlot.min.css);
+
 @import url(../css/icons.css);
 
 * {
@@ -263,24 +266,6 @@ footer a:hover {
   display: inline-block;
 }
 
-.server .column-status .server-is-favorite {
-  cursor: pointer;
-  color: var(--color-gold);
-}
-
-.server .column-status .server-is-favorite:hover::before {
-  content: "\f006";
-}
-
-.server .column-status .server-is-not-favorite {
-  cursor: pointer;
-  color: var(--background-color);
-}
-
-.server .column-status .server-is-not-favorite:hover {
-  color: var(--color-gold);
-}
-
 .server .column-status .server-error {
   display: none;
   color: #e74c3c;
@@ -298,11 +283,27 @@ footer a:hover {
 }
 
 .server .column-graph {
-  float: right;
   height: 100px;
   width: 400px;
-  margin-right: -3px;
-  margin-bottom: 5px;
+}
+
+/* Favorite icons */
+.server-is-favorite {
+  cursor: pointer;
+  color: var(--color-gold);
+}
+
+.server-is-favorite:hover::before {
+  content: "\f006";
+}
+
+.server-is-not-favorite {
+  cursor: pointer;
+  color: var(--background-color);
+}
+
+.server-is-not-favorite:hover {
+  color: var(--color-gold);
 }
 
 /* Highlighted values */
@@ -331,19 +332,8 @@ footer a:hover {
 }
 
 /* Historical graph */
-#big-graph-mobile-load-request {
-  background: var(--background-color);
-  color: var(--text-color);
-  padding: 10px 0;
-  text-align: center;
-  display: none;
-  width: 100%;
-  margin-bottom: 10px;
-}
-
-#big-graph-mobile-load-request a {
-  display: inline-block;
-  color: var(--text-color);
+#big-graph {
+  padding-right: 65px;
 }
 
 #big-graph, #big-graph-controls, #big-graph-checkboxes {
@@ -461,3 +451,9 @@ footer a:hover {
     margin-bottom: 20px;
   }
 }
+
+/* uPlot.css overrides */
+.uplot .select {
+  background: var(--color-blue);
+  opacity: 0.3;
+}

assets/html/index.html

@@ -10,6 +10,8 @@
 
 	<meta charset="UTF-8">
 
+	<script defer src="../js/main.js"></script>
+
 	<title>Minetrack</title>
 
 </head>
@@ -59,13 +61,6 @@ <h1 class="logo-text">Minetrack</h1>
 			</div>
 		</header>
 
-		<div id="big-graph-mobile-load-request">
-			<strong>On a mobile device?</strong>
-			<p>Minetrack has skipped automatically loading the historical graph to help save data and power.</p>
-			<br>
-			<a id="big-graph-mobile-load-request-button" class="button">Load Historical Graph</a>
-		</div>
-
 		<div id="big-graph"></div>
 
 		<div id="big-graph-controls">
@@ -88,11 +83,6 @@ <h1 class="logo-text">Minetrack</h1>
 		<span class="icon-code"></span> Powered by open source software - <a href="https://github.com/Cryptkeeper/Minetrack">make it your own!</a>
 	</footer>
 
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.slim.min.js"></script>
-	<script src="https://cdnjs.cloudflare.com/ajax/libs/flot/0.8.3/jquery.flot.min.js"></script>
-
-	<script src="../js/main.js" defer></script>
-
 </body>
 
 </html>