From 5935cbbf54e94c0317fb7ff155eed44a98c79fe7 Mon Sep 17 00:00:00 2001
From: Gisle Aune <dev@gisle.me>
Date: Wed, 17 Oct 2018 19:44:11 +0200
Subject: [PATCH] story-content, logs-content: Changed text width from 75 to 90
 characters, added grouping of multipart log posts, and darkened background.

---
 marko/page/logs-content/components/page/index.marko |  3 ++-
 marko/page/logs-content/components/page/style.less  |  2 +-
 marko/page/logs-content/components/post/index.marko |  7 +++++--
 marko/page/logs-content/components/post/style.less  | 12 +++++++++++-
 marko/page/logs-content/view.marko                  |  2 +-
 marko/page/story-content/components/page/style.less |  2 +-
 marko/page/story-content/view.marko                 |  2 +-
 package.json                                        |  2 +-
 server.js                                           |  2 +-
 9 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/marko/page/logs-content/components/page/index.marko b/marko/page/logs-content/components/page/index.marko
index 5daed7e..d039f0d 100644
--- a/marko/page/logs-content/components/page/index.marko
+++ b/marko/page/logs-content/components/page/index.marko
@@ -16,12 +16,13 @@
         so you can still read it (or back it up) before leaving the page.
       </p>
     </annotation>
-    <post for(post in state.log.posts)
+    <post for(post in state.log.posts | status-var=loop)
           key=post.id
           on-move("movePost", post)
           on-remove("removePost", post)
           on-edited("postEdited")
           user=input.user
+          prev=(state.log.posts[loop.getIndex() - 1] || {})
           post=post
           characters=state.log.characters
           last=(post.position === state.log.posts.length)
diff --git a/marko/page/logs-content/components/page/style.less b/marko/page/logs-content/components/page/style.less
index bc5bb0a..8ee3144 100644
--- a/marko/page/logs-content/components/page/style.less
+++ b/marko/page/logs-content/components/page/style.less
@@ -1,6 +1,6 @@
 div.logs-content {
   width: 90%;
-  max-width: 75ch;
+  max-width: 95ch;
   margin: auto;
 
   div.header {
diff --git a/marko/page/logs-content/components/post/index.marko b/marko/page/logs-content/components/post/index.marko
index 6f84f53..f85cf40 100644
--- a/marko/page/logs-content/components/post/index.marko
+++ b/marko/page/logs-content/components/post/index.marko
@@ -1,4 +1,6 @@
-<div if(!state.removed) class=["post", component.kindClass("post-type")]>
+$ const multipart = (input.post.nick == input.prev.nick && input.prev.multipart !== false);
+
+<div if(!state.removed) class=["post", component.kindClass("post-type"), multipart ? "multipart" : null]>
   <div class="post-meta-row">
     <div class="options color-menu">
       <if-permitted user=input.user permission="post.move">
@@ -24,7 +26,8 @@
     <markdown class="post-content post-scene" source=state.text />
   </div>
   <div if(input.post.kind === "action") class="post-body color-text">
-    <markdown class="post-content post-action" source=(state.shortName + state.nameSuffix + " " + state.text) />
+    $ const prefix = (!multipart ? state.shortName + state.nameSuffix + " " : "");
+    <markdown class="post-content post-action" source=(prefix + state.text) />
   </div>
    <div if(input.post.kind === "text") class="post-body color-text">
     <markdown class="post-content post-text" source=state.text />
diff --git a/marko/page/logs-content/components/post/style.less b/marko/page/logs-content/components/post/style.less
index da74ae1..6415d59 100644
--- a/marko/page/logs-content/components/post/style.less
+++ b/marko/page/logs-content/components/post/style.less
@@ -10,7 +10,7 @@ div.post {
     position: absolute;
     text-align: right;
     width: calc(100% - 35.5ch);
-    max-width: 75ch;
+    max-width: 95ch;
 
     a {
       display: inline-block;
@@ -53,4 +53,14 @@ div.post {
     margin-top: 0;
     padding-top: 0;
   }
+}
+
+div.post.multipart {
+  margin-top: -1.25em;
+
+  div.post-meta {
+    span {
+      display: none;
+    }
+  }
 }
\ No newline at end of file
diff --git a/marko/page/logs-content/view.marko b/marko/page/logs-content/view.marko
index 2a0715f..5cef72e 100644
--- a/marko/page/logs-content/view.marko
+++ b/marko/page/logs-content/view.marko
@@ -1,6 +1,6 @@
 <include("../layout", {title: "Logs", site: "logs"})>
   <@body>
-    <background src="/assets/images/bg.png" opacity=0.25 />
+    <background src="/assets/images/bg.png" opacity=0.125 />
     <page log=input.log user=input.user selected=input.selected />
   </@body>
 </include>
\ No newline at end of file
diff --git a/marko/page/story-content/components/page/style.less b/marko/page/story-content/components/page/style.less
index 7f70b4b..d77db11 100644
--- a/marko/page/story-content/components/page/style.less
+++ b/marko/page/story-content/components/page/style.less
@@ -1,6 +1,6 @@
 .story-content {
   width: 90%;
-  max-width: 75ch;
+  max-width: 95ch;
   margin: auto;
 
   h1 {
diff --git a/marko/page/story-content/view.marko b/marko/page/story-content/view.marko
index eebd5ab..f41c1c7 100644
--- a/marko/page/story-content/view.marko
+++ b/marko/page/story-content/view.marko
@@ -1,6 +1,6 @@
 <include("../layout", {title: "Stories", site: "story"})>
   <@body>
-    <background src="/assets/images/bg.png" opacity=0.25 />
+    <background src="/assets/images/bg.png" opacity=0.125 />
     <page story=input.story categories=input.categories user=input.user selected=input.selected />
   </@body>
 </include>
\ No newline at end of file
diff --git a/package.json b/package.json
index 9c10868..6590f14 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gisle/rpdata-frontend",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "RPData (www.aiterp.net) frontend/proxy",
   "main": "./index.js",
   "scripts": {
diff --git a/server.js b/server.js
index 3ed95b9..ddc7bf3 100644
--- a/server.js
+++ b/server.js
@@ -33,7 +33,7 @@ lasso.configure({
   outputDir: "./.static", // Place all generated JS/CSS/etc. files into the "static" dir
   bundlingEnabled: isProduction, // Only enable bundling in production
   minify: isProduction, // Only minify JS and CSS code in production
-  fingerprintsEnabled: true, // Only add fingerprints to URLs in production
+  fingerprintsEnabled: isProduction, // Only add fingerprints to URLs in production
 
   require: {
     builtins: {