diff --git a/gulp/res/css/style.css b/gulp/res/css/style.css index 891b216f..37bfa3b2 100644 --- a/gulp/res/css/style.css +++ b/gulp/res/css/style.css @@ -61,6 +61,7 @@ body { box-sizing: border-box; padding: 10px; width: max-content; + width: -moz-max-content; } a, a:visited { @@ -87,7 +88,7 @@ object { background: #d6daf0; } -.catalog-tile-button { +.ecatalog-tile-button { width: 100%; line-height: 30px; float: left; @@ -98,11 +99,8 @@ object { overflow: hidden; } -.catalog-tile-content { - padding: 5px; -} - .catalog-tile { + padding: 5px; margin: 2px; text-align: center; max-height: 300px; @@ -128,7 +126,7 @@ object { .catalog { display:flex; align-items:flex-start; - justify-content: space-evenly; + justify-content: center; flex-flow: row wrap; } @@ -219,7 +217,7 @@ td, th { align-items: center; } -.post-container, .pages, .toggle-summary { +.post-container, .pages, .toggle-summary, .catalog-tile { background: #D6DAF0; border: 1px solid #B7C5D9; } @@ -260,6 +258,7 @@ td, th { display: flex; flex-flow: column wrap; width: max-content; + width: -moz-max-content; } .toggle { @@ -470,7 +469,7 @@ input textarea { input[type="text"], input[type="submit"], input[type="password"], input[type="file"], textarea { border: 1px solid #a9a9a9; font-size: inherit; - font-family: arial,helvetica,sans-serif; + font-family: arial, helvetica, sans-serif; margin: 0; flex-grow: 1; border-radius: 0px; @@ -574,7 +573,7 @@ hr { } .post-info { - background-color: #B7C5D9; + /*background-color: #B7C5D9;*/ } } diff --git a/views/includes/footer.pug b/views/includes/footer.pug index 25ab0523..2f1c38a3 100644 --- a/views/includes/footer.pug +++ b/views/includes/footer.pug @@ -1,2 +1,2 @@ .footer - a(href='https://github.com/fatchan/jschan/') not lynxchan™ + a(href='https://github.com/fatchan/jschan/') open source diff --git a/views/mixins/catalogtile.pug b/views/mixins/catalogtile.pug index 24155d6a..36379e9a 100644 --- a/views/mixins/catalogtile.pug +++ b/views/mixins/catalogtile.pug @@ -1,30 +1,28 @@ mixin catalogtile(board, post, truncate) article(class='catalog-tile') - const postURL = `/${board._id}/thread/${post.postId}.html#${post.postId}` - a.catalog-tile-button(href=postURL) Open Thread - if post.subject - span: a.no-decoration.post-subject(href=postURL) #{post.subject} - .catalog-tile-content - if post.files.length > 0 - .post-file-src - a(href=postURL) - if post.spoiler - object(data='/img/spoiler.png' width='64' height='64') - else - object.catalog-thumb(data=`/img/thumb-${post.files[0].filename.split('.')[0]}.jpg` width='64' height='64') - header.post-info - if post.sticky - img(src='/img/sticky.svg' height='12') - if post.saged - img(src='/img/saged.svg' height='12') - if post.locked - img(src='/img/locked.svg' height='12') + if post.files.length > 0 + .post-file-src + a(href=postURL) + if post.spoiler + object(data='/img/spoiler.png' width='64' height='64') + else + object.catalog-thumb(data=`/img/thumb-${post.files[0].filename.split('.')[0]}.jpg` width='64' height='64') + header.post-info + if post.sticky + img(src='/img/sticky.svg' height='12') | - span: a(href=postURL) No.#{post.postId} + if post.saged + img(src='/img/saged.svg' height='12') | - span Replies: #{post.replyposts} + if post.locked + img(src='/img/locked.svg' height='12') | - span Images: #{post.replyfiles} - if post.message - br - blockquote.no-m-p.post-message !{post.message} + span Replies: #{post.replyposts} + | + span Files: #{post.replyfiles} + br + span: a.no-decoration.post-subject(href=postURL) #{post.subject || 'No Subject'} + if post.message + br + blockquote.no-m-p.post-message !{post.message} diff --git a/views/mixins/post.pug b/views/mixins/post.pug index a8ae0fd3..7286708d 100644 --- a/views/mixins/post.pug +++ b/views/mixins/post.pug @@ -10,11 +10,13 @@ mixin post(post, truncate, manage=false, globalmanage=false) if !post.thread if post.sticky img(src='/img/sticky.svg' height='12') + | if post.saged img(src='/img/saged.svg' height='12') + | if post.locked img(src='/img/locked.svg' height='12') - | + | if post.subject span.post-subject #{post.subject} | diff --git a/views/pages/catalog.pug b/views/pages/catalog.pug index 945732bb..be09ee56 100644 --- a/views/pages/catalog.pug +++ b/views/pages/catalog.pug @@ -7,6 +7,8 @@ block head block content include ../includes/boardheader.pug br + include ../includes/postform.pug + br nav.pages#top a(href='#bottom') [Bottom] | diff --git a/wipe.js b/wipe.js index e35fe808..2037bdb2 100644 --- a/wipe.js +++ b/wipe.js @@ -42,7 +42,7 @@ const Mongo = require(__dirname+'/db/db.js') moderators: [], banners: [], settings: { - captcha: false, + captcha: true, forceAnon: true, ids: true, threadLimit: 100, @@ -63,7 +63,7 @@ const Mongo = require(__dirname+'/db/db.js') moderators: [], banners: [], settings: { - captcha: true, + captcha: false, forceAnon: false, ids: false, threadLimit: 100,