Merge branch 'develop' into stable

2 files changed, 35 insertions, 7 deletions

diff --git a/src/SMAPI.Web/wwwroot/Content/css/log-parser.css b/src/SMAPI.Web/wwwroot/Content/css/log-parser.css
index cbf09ffe..789274e2 100644
--- a/src/SMAPI.Web/wwwroot/Content/css/log-parser.css
+++ b/src/SMAPI.Web/wwwroot/Content/css/log-parser.css
@@ -20,27 +20,52 @@ caption {
     font-family: monospace;
 }
 
-#upload-button {
+input#upload-button {
     background: #ccf;
     border: 1px solid #000088;
 }
 
-#upload-button {
+input#upload-button {
     background: #eef;
 }
 
+table caption {
+    font-weight: bold;
+}
+
+/*********
+** Result banner
+*********/
+.banner {
+    border: 2px solid gray;
+    border-radius: 5px;
+    padding: 1em;
+}
+
+.banner.success {
+    border-color: green;
+    background: #CFC;
+}
+
+.banner.error {
+    border-color: red;
+    background: #FCC;
+}
+
 /*********
 ** Log metadata & filters
 *********/
 #metadata, #mods, #filters {
-    font-weight: bold;
     border-bottom: 1px dashed #888888;
-    padding-bottom: 10px;
     margin-bottom: 5px;
 }
 
-table#metadata,
-table#mods {
+#metadata th {
+    text-align: right;
+    padding-right: 0.7em;
+}
+
+table#metadata, table#mods {
     border: 1px solid #000000;
     background: #ffffff;
     border-radius: 5px;
@@ -115,6 +140,7 @@ table#mods {
 #filters {
     margin: 1em 0 0 0;
     padding: 0;
+    font-weight: bold;
 }
 
 #filters span {
diff --git a/src/SMAPI.Web/wwwroot/Content/js/log-parser.js b/src/SMAPI.Web/wwwroot/Content/js/log-parser.js
index 38a75a80..c4a35e96 100644
--- a/src/SMAPI.Web/wwwroot/Content/js/log-parser.js
+++ b/src/SMAPI.Web/wwwroot/Content/js/log-parser.js
@@ -92,7 +92,9 @@ smapi.logParser = function (data, sectionUrl) {
     *********/
     var error = $("#error");
     
-    $("#upload-button").on("click", function() {
+    $("#upload-button").on("click", function(e) {
+        e.preventDefault();
+
         $("#input").val("");
         $("#popup-upload").fadeIn();
     });