Merge branch 'develop' into stable

3 files changed, 144 insertions, 4 deletions

diff --git a/src/SMAPI.Web/wwwroot/Content/css/file-upload.css b/src/SMAPI.Web/wwwroot/Content/css/file-upload.css
index ff170691..f29d46aa 100644
--- a/src/SMAPI.Web/wwwroot/Content/css/file-upload.css
+++ b/src/SMAPI.Web/wwwroot/Content/css/file-upload.css
@@ -11,7 +11,7 @@
     border-radius: 5px;
     border: 1px solid #000088;
     outline: none;
-    box-shadow: inset 0px 0px 1px 1px rgba(0, 0, 192, .2);
+    box-shadow: inset 0 0 1px 1px rgba(0, 0, 192, .2);
 }
 
 #submit {
diff --git a/src/SMAPI.Web/wwwroot/Content/css/log-parser.css b/src/SMAPI.Web/wwwroot/Content/css/log-parser.css
index 8c3acceb..1d457e35 100644
--- a/src/SMAPI.Web/wwwroot/Content/css/log-parser.css
+++ b/src/SMAPI.Web/wwwroot/Content/css/log-parser.css
@@ -113,7 +113,7 @@ table caption {
 }
 
 .table tr {
-    background: #eee
+    background: #eee;
 }
 
 #mods span.notice {
@@ -148,18 +148,79 @@ table caption {
     font-style: italic;
 }
 
+.table .content-packs-collapsed {
+    opacity: 0.75;
+    font-size: 0.9em;
+    font-style: italic;
+}
+
 #metadata td:first-child {
     padding-right: 5px;
 }
 
 .table tr:nth-child(even) {
-    background: #fff
+    background: #fff;
 }
 
 #filters {
     margin: 1em 0 0 0;
-    padding: 0;
+    padding: 0 0 0.5em;
+    display: flex;
+    justify-content: space-between;
+    width: calc(100vw - 16em);
+}
+
+#filters > div {
+    align-self: center;
+}
+
+#filters .toggles {
+    display: flex;
+}
+
+#filters .toggles > div:first-child {
     font-weight: bold;
+    padding: 0.2em 1em 0 0;
+}
+
+#filters .filter-text {
+    margin-top: 0.5em;
+}
+
+#filters .filter-error {
+    color: #880000;
+}
+
+#filters .filter-error,
+#filters .stats {
+    margin-top: 0.5em;
+    font-size: 0.75em;
+}
+
+#filters.sticky {
+    position: fixed;
+    top: 0;
+    left: 0em;
+    background: #fff;
+    margin: 0;
+    padding: 0.5em;
+    width: calc(100% - 1em);
+}
+
+@media (min-width: 1020px) and (max-width: 1199px) {
+    #filters:not(.sticky) {
+        width: calc(100vw - 13em);
+    }
+}
+
+@media (max-width: 1019px) {
+    #filters:not(.sticky) {
+        width: calc(100vw - 5em);
+    }
+
+    #filters {
+        display: block;
+    }
 }
 
 #filters span {
@@ -173,6 +234,17 @@ table caption {
     color: #000;
     border-color: #880000;
     background-color: #fcc;
+
+    user-select: none;
+}
+
+#filters .filter-text span {
+    padding: 3px 0.5em;
+}
+
+#filters .whole-word i {
+    padding: 0 1px;
+    border: 1px dashed;
 }
 
 #filters span:hover {
@@ -188,11 +260,48 @@ table caption {
     background: #efe;
 }
 
+#filters .pager {
+    margin-top: 0.5em;
+    text-align: right;
+}
+
+#filters .pager div {
+    margin-top: 0.5em;
+}
+
+#filters .pager div span {
+    padding: 0 0.5em;
+    margin: 0 1px;
+}
+
+#filters .pager span {
+    background-color: #eee;
+    border-color: #888;
+}
+
+#filters .pager span.active {
+    font-weight: bold;
+    border-color: transparent;
+    background: transparent;
+    cursor: unset;
+}
+
+#filters .pager span.disabled {
+    opacity: 0.3;
+    cursor: unset;
+}
+
+#filters .pager span:not(.disabled):hover {
+    background-color: #fff;
+}
+
+
 /*********
 ** Log
 *********/
 #log .mod-repeat {
     font-size: 0.85em;
+    font-style: italic;
 }
 
 #log .trace {
@@ -237,6 +346,11 @@ table caption {
     white-space: pre-wrap;
 }
 
+#log .log-message-text strong {
+    background-color: yellow;
+    font-weight: normal;
+}
+
 #log {
     border-spacing: 0;
 }
diff --git a/src/SMAPI.Web/wwwroot/Content/css/main.css b/src/SMAPI.Web/wwwroot/Content/css/main.css
index dcc7a798..a0a407d8 100644
--- a/src/SMAPI.Web/wwwroot/Content/css/main.css
+++ b/src/SMAPI.Web/wwwroot/Content/css/main.css
@@ -97,6 +97,22 @@ a {
     margin-left: 1em;
 }
 
+/* quick navigation */
+
+#quickNav {
+    position: fixed;
+    bottom: 3em;
+    width: 12em;
+}
+
+@media (max-height: 400px) {
+    #quickNav {
+        position: unset;
+        width: auto;
+    }
+}
+
+
 /* footer */
 #footer {
     margin: 1em;
@@ -111,11 +127,16 @@ a {
 
 /* mobile fixes */
 @media (min-width: 1020px) and (max-width: 1199px) {
+    #quickNav,
     #sidebar {
         width: 7em;
         background: none;
     }
 
+    #quickNav h4 {
+        width: unset;
+    }
+
     #content-column {
         left: 7em;
     }
@@ -138,4 +159,9 @@ a {
         top: inherit;
         left: inherit;
     }
+
+    #quickNav {
+        position: unset;
+        width: auto;
+    }
 }