Merge branch 'develop' into stable

4 files changed, 33 insertions, 5 deletions

diff --git a/src/SMAPI.Web/wwwroot/Content/css/log-parser.css b/src/SMAPI.Web/wwwroot/Content/css/log-parser.css
index ea28cd7d..d5013207 100644
--- a/src/SMAPI.Web/wwwroot/Content/css/log-parser.css
+++ b/src/SMAPI.Web/wwwroot/Content/css/log-parser.css
@@ -219,6 +219,18 @@ table caption {
     font-weight: bold;
 }
 
+#log .section-start {
+    cursor: pointer;
+}
+
+#log .section-toggle-message {
+    color: blue;
+}
+
+#log .log-message-text {
+    white-space: pre-wrap;
+}
+
 #log {
     border-spacing: 0;
 }
@@ -233,7 +245,6 @@ table caption {
     border-bottom: 1px dotted #ccc;
     border-top: 2px solid #fff;
     vertical-align: top;
-    white-space: pre-wrap;
 }
 
 #log td:not(:last-child) {
@@ -244,7 +255,6 @@ table caption {
 }
 
 #log td[data-title]:hover {
-    font-size: 1px;
     overflow: inherit;
     position: relative;
 }
diff --git a/src/SMAPI.Web/wwwroot/Content/css/mods.css b/src/SMAPI.Web/wwwroot/Content/css/mods.css
index f42800da..fc5fff47 100644
--- a/src/SMAPI.Web/wwwroot/Content/css/mods.css
+++ b/src/SMAPI.Web/wwwroot/Content/css/mods.css
@@ -6,7 +6,7 @@
 }
 
 #intro {
-    width: 50em;
+    max-width: 60em;
 }
 
 #beta-blurb {
@@ -135,3 +135,7 @@ table.wikitable > caption {
 #mod-list tr[data-status="workaround"] .mod-page-links {
     text-decoration: line-through;
 }
+
+#mod-list td.smapi-3-col span {
+    border-bottom: 1px dashed gray;
+}
diff --git a/src/SMAPI.Web/wwwroot/Content/js/log-parser.js b/src/SMAPI.Web/wwwroot/Content/js/log-parser.js
index 0c654205..e87a1a5c 100644
--- a/src/SMAPI.Web/wwwroot/Content/js/log-parser.js
+++ b/src/SMAPI.Web/wwwroot/Content/js/log-parser.js
@@ -69,6 +69,13 @@ smapi.logParser = function (data, sectionUrl) {
                 updateModFilters();
             },
 
+            toggleSection: function (name) {
+                if (!data.enableFilters)
+                    return;
+
+                this.showSections[name] = !this.showSections[name];
+            },
+
             showAllMods: function () {
                 if (!data.enableFilters)
                     return;
@@ -95,6 +102,10 @@ smapi.logParser = function (data, sectionUrl) {
 
             filtersAllow: function(modId, level) {
                 return this.showMods[modId] !== false && this.showLevels[level] !== false;
+            },
+
+            sectionsAllow: function (section) {
+                return this.showSections[section] !== false;
             }
         }
     });
diff --git a/src/SMAPI.Web/wwwroot/Content/js/mods.js b/src/SMAPI.Web/wwwroot/Content/js/mods.js
index 05114b00..874fbf25 100644
--- a/src/SMAPI.Web/wwwroot/Content/js/mods.js
+++ b/src/SMAPI.Web/wwwroot/Content/js/mods.js
@@ -102,15 +102,18 @@ smapi.modList = function (mods, enableBeta) {
         // set SMAPI 3.0 display text
         switch (mod.Smapi3Status) {
             case "ok":
-                mod.Smapi3DisplayText = "✓";
+                mod.Smapi3DisplayText = "✓ yes";
+                mod.Smapi3Tooltip = "The latest version of this mod is compatible with SMAPI 3.0.";
                 break;
 
             case "broken":
-                mod.Smapi3DisplayText = "✖";
+                mod.Smapi3DisplayText = "✖ no";
+                mod.Smapi3Tooltip = "This mod will break in SMAPI 3.0; consider notifying the author.";
                 break;
 
             default:
                 mod.Smapi3DisplayText = "↻ " + mod.Smapi3Status;
+                mod.Smapi3Tooltip = "This mod has a pending update for SMAPI 3.0 which hasn't been released yet.";
                 break;
         }