Browse Source

story-content, logs-content: Changed text width from 75 to 90 characters, added grouping of multipart log posts, and darkened background.

1.0 1.0.6
Gisle Aune 6 years ago
parent
commit
5935cbbf54
  1. 3
      marko/page/logs-content/components/page/index.marko
  2. 2
      marko/page/logs-content/components/page/style.less
  3. 7
      marko/page/logs-content/components/post/index.marko
  4. 12
      marko/page/logs-content/components/post/style.less
  5. 2
      marko/page/logs-content/view.marko
  6. 2
      marko/page/story-content/components/page/style.less
  7. 2
      marko/page/story-content/view.marko
  8. 2
      package.json
  9. 2
      server.js

3
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. so you can still read it (or back it up) before leaving the page.
</p> </p>
</annotation> </annotation>
<post for(post in state.log.posts)
<post for(post in state.log.posts | status-var=loop)
key=post.id key=post.id
on-move("movePost", post) on-move("movePost", post)
on-remove("removePost", post) on-remove("removePost", post)
on-edited("postEdited") on-edited("postEdited")
user=input.user user=input.user
prev=(state.log.posts[loop.getIndex() - 1] || {})
post=post post=post
characters=state.log.characters characters=state.log.characters
last=(post.position === state.log.posts.length) last=(post.position === state.log.posts.length)

2
marko/page/logs-content/components/page/style.less

@ -1,6 +1,6 @@
div.logs-content { div.logs-content {
width: 90%; width: 90%;
max-width: 75ch;
max-width: 95ch;
margin: auto; margin: auto;
div.header { div.header {

7
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="post-meta-row">
<div class="options color-menu"> <div class="options color-menu">
<if-permitted user=input.user permission="post.move"> <if-permitted user=input.user permission="post.move">
@ -24,7 +26,8 @@
<markdown class="post-content post-scene" source=state.text /> <markdown class="post-content post-scene" source=state.text />
</div> </div>
<div if(input.post.kind === "action") class="post-body color-text"> <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>
<div if(input.post.kind === "text") class="post-body color-text"> <div if(input.post.kind === "text") class="post-body color-text">
<markdown class="post-content post-text" source=state.text /> <markdown class="post-content post-text" source=state.text />

12
marko/page/logs-content/components/post/style.less

@ -10,7 +10,7 @@ div.post {
position: absolute; position: absolute;
text-align: right; text-align: right;
width: calc(100% - 35.5ch); width: calc(100% - 35.5ch);
max-width: 75ch;
max-width: 95ch;
a { a {
display: inline-block; display: inline-block;
@ -54,3 +54,13 @@ div.post {
padding-top: 0; padding-top: 0;
} }
} }
div.post.multipart {
margin-top: -1.25em;
div.post-meta {
span {
display: none;
}
}
}

2
marko/page/logs-content/view.marko

@ -1,6 +1,6 @@
<include("../layout", {title: "Logs", site: "logs"})> <include("../layout", {title: "Logs", site: "logs"})>
<@body> <@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 /> <page log=input.log user=input.user selected=input.selected />
</@body> </@body>
</include> </include>

2
marko/page/story-content/components/page/style.less

@ -1,6 +1,6 @@
.story-content { .story-content {
width: 90%; width: 90%;
max-width: 75ch;
max-width: 95ch;
margin: auto; margin: auto;
h1 { h1 {

2
marko/page/story-content/view.marko

@ -1,6 +1,6 @@
<include("../layout", {title: "Stories", site: "story"})> <include("../layout", {title: "Stories", site: "story"})>
<@body> <@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 /> <page story=input.story categories=input.categories user=input.user selected=input.selected />
</@body> </@body>
</include> </include>

2
package.json

@ -1,6 +1,6 @@
{ {
"name": "@gisle/rpdata-frontend", "name": "@gisle/rpdata-frontend",
"version": "1.0.5",
"version": "1.0.6",
"description": "RPData (www.aiterp.net) frontend/proxy", "description": "RPData (www.aiterp.net) frontend/proxy",
"main": "./index.js", "main": "./index.js",
"scripts": { "scripts": {

2
server.js

@ -33,7 +33,7 @@ lasso.configure({
outputDir: "./.static", // Place all generated JS/CSS/etc. files into the "static" dir outputDir: "./.static", // Place all generated JS/CSS/etc. files into the "static" dir
bundlingEnabled: isProduction, // Only enable bundling in production bundlingEnabled: isProduction, // Only enable bundling in production
minify: isProduction, // Only minify JS and CSS code 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: { require: {
builtins: { builtins: {

Loading…
Cancel
Save