From dab1ae7574783bcb45999b0cfc23597c94adcde2 Mon Sep 17 00:00:00 2001 From: fatchan Date: Fri, 12 Jul 2019 09:52:57 +0000 Subject: [PATCH] lodash and postform changed --- gulp/res/css/style.css | 29 ++++++++++++++++++++--------- package.json | 2 ++ views/includes/postform.pug | 6 +++--- views/mixins/post.pug | 6 +++--- 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/gulp/res/css/style.css b/gulp/res/css/style.css index f9bc4247..583e998c 100644 --- a/gulp/res/css/style.css +++ b/gulp/res/css/style.css @@ -43,6 +43,7 @@ pre { } .replies { + padding-top: 5px; font-size: smaller; clear: both; } @@ -66,7 +67,7 @@ pre { margin-left: 5px; } .mr-1 { - margin-right: 1px; + margin-right: 1px!important; } .mr-5 { margin-right: 5px; @@ -184,9 +185,10 @@ p { .close { text-decoration: none; - width: 1.75em; justify-content: center; font-weight: bolder; + margin-left: auto; + width: 25px; } .reports { @@ -354,15 +356,19 @@ td, th { .post-files { float: left; - margin: 5px 10px 0 0; + margin-right: 10px; display: flex; flex-flow: row wrap; align-items: start; } +a, input, summary { + outline: 0; +} + .post-data { - margin-top: -10px; - padding-top: 10px; + /*margin-top: -10px; + padding-top: 10px;*/ overflow: hidden; } @@ -443,7 +449,7 @@ textarea { .post-message { text-align: left; - overflow: hidden; + /*overflow: hidden;*/ } .post-container, .ban { @@ -496,9 +502,8 @@ textarea { display:block; } -.post-info * { - /*margin-bottom: 0;*/ - /*margin-top: -2px;*/ +.post-info a { + } .post-container.op .post-info { @@ -565,6 +570,7 @@ input[type="submit"] { } input[type="file"] { + width: 200px; background: white; } @@ -599,6 +605,7 @@ input[type="file"] { .postform-col { flex-direction: column; flex-grow: 1; + align-items: end; } .postform-style { @@ -634,6 +641,10 @@ hr { @media only screen and (max-width: 600px) { + .close { + width: 30px; + } + input, .postform-style { height: 30px; box-sizing: border-box; diff --git a/package.json b/package.json index d8b1315b..968729f4 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,8 @@ "fs": "0.0.1-security", "fs-extra": "^7.0.1", "gm": "github:fatchan/gm", + "lodash": "^4.17.14", + "lodash.mergewith": "^4.6.2", "mongodb": "^3.2.7", "path": "^0.12.7", "pug": "^2.0.3", diff --git a/views/includes/postform.pug b/views/includes/postform.pug index b8b65e6b..31763d38 100644 --- a/views/includes/postform.pug +++ b/views/includes/postform.pug @@ -5,8 +5,8 @@ section.form-wrapper.flex-center unless board.settings.forceAnon section.postform-row .postform-label Name - input(type='text', name='name', placeholder=board.settings.defaultName autocomplete='off' maxlength='50') - a.close.postform-style.ml-1(href='#!') X + input.mr-1(type='text', name='name', placeholder=board.settings.defaultName autocomplete='off' maxlength='50') + a.close.postform-style(href='#!') X section.postform-row .postform-label Subject if !isThread && board.settings.forceOPSubject @@ -21,7 +21,7 @@ section.form-wrapper.flex-center label.postform-style.ph-5 input(type='checkbox', name='email', value='sage') | Sage - a.close.postform-style.ml-1(href='#!') X + a.close.postform-style(href='#!') X if !isThread section.postform-row .postform-label Subject diff --git a/views/mixins/post.pug b/views/mixins/post.pug index 9f4e7598..e0ddd9fd 100644 --- a/views/mixins/post.pug +++ b/views/mixins/post.pug @@ -37,13 +37,13 @@ mixin post(post, truncate, manage=false, globalmanage=false) if post.capcode span.post-capcode #{post.capcode} | - span #{post.date.toLocaleString()} + time(datetime=post.date.toISOString()) #{post.date.toLocaleString()} | if post.userId span.user-id(style=`background: #${post.userId}`) #{post.userId} | - span: a(href=`${postURL}#${post.postId}`) No. - span: a(href=`${postURL}#postform`) #{post.postId} + span: a.no-decoration(href=`${postURL}#${post.postId}`) No. + span: a.no-decoration(href=`${postURL}#postform`) #{post.postId} if !post.thread | span: a(href=`/${post.board}/thread/${post.thread || post.postId}.html#postform`) [Reply]