Merge branch 'SturgeonFish-new-dev-patch-13808' into 'master'

css tweak for log table

Closes #304

See merge request fatchan/jschan!207
merge-requests/208/head
Thomas Lynch 4 years ago
commit c966663341
  1. 4
      gulp/res/css/style.css
  2. 71
      gulp/res/css/themes/tempus-cozette.css
  3. 33
      helpers/files/videothumbnail.js
  4. 2
      views/includes/postform.pug

@ -500,6 +500,10 @@ th {
color: var(--alt-font-color, --font-color)
}
.fw td, .fw th {
width: 15%; /*Fixes log tables when large actions are taken*/
}
td, th {
padding: 5px;
/*word-break: break-all;*/

@ -0,0 +1,71 @@
:root {
--icon-color: invert(17%) sepia(89%) saturate(7057%) hue-rotate(2deg) brightness(93%) contrast(120%);
--alt-label-color: #260E22;
--alt-font-color: #c5c8c6;
--background-top: #260E22;
--background-rest: #090A18;
--navbar-color: #260E22;
--post-color: #260E22;
--post-outline-color: #090A18;
--label-color: #260E22;
--box-border-color: #111;
--darken: #00000050;
--highlighted-post-color: #54264C;
--highlighted-post-outline-color: #111;
--board-title: #c5c8c6;
--hr: #282a2e;
--font-color: #c5c8c6;
--name-color: #c5c8c6;
--capcode-color: #f00;
--subject-color: #b294bb;
--link-color: #c5c8c6;
--post-link-color: #5f89ac;
--link-hover: #81a2be;
--input-borders: #111;
--input-color: #c5c8c6;
--input-background: #090A18;
--dice-color: darkorange;
--title-color: #d70000;
--greentext-color: green;
--pinktext-color: #E0727F;
}
#float .post-container, div#livetext, div#threadstats, .catalog-tile,
nav.pages, div.pages, .post-container:not(.op), nav.stickynav,
summary.toggle-summary, table, div.catalog-tile, div.highlighted,
div.hoverhighlighted, a.toggle-summary, .board-banner {
border-width: 1px;
border-radius: 2px;
}
input[type], textarea, .label, .rlabel, button, select:not(.postmenu),
.close, #settingsmodal, .postform-style, img, .spoiler, .code, .mono,
.detected, #postform {
border-radius: 2px;
}
table {
box-shadow: 0 0 3px #00000040;
}
.post-container.op {
border-width: 1px;
}
.post-check {
opacity: 0;
margin-right: -1em;
transition: opacity 100ms, margin-right 100ms;
}
.post-check:hover {
opacity: 1;
margin-right: unset;
}
.post-file-info {
overflow-wrap: anywhere;
}
.spoiler {
padding: 0 1px
}
.wrapbar + hr:first-of-type {
margin: 1px 0 0 0;
}
body, small, .post-file-info, .quote, input, textarea {
font-family: monospace!important;
font-size: 9pt!important;
}

@ -3,23 +3,34 @@ const ffmpeg = require('fluent-ffmpeg')
, uploadDirectory = require(__dirname+'/uploadDirectory.js');
module.exports = (file, geometry, timestamp) => {
return new Promise((resolve, reject) => {
ffmpeg(`${uploadDirectory}/file/${file.filename}`)
const command = ffmpeg(`${uploadDirectory}/file/${file.filename}`)
.on('end', () => {
return resolve();
})
.on('error', function(err, stdout, stderr) {
return reject(err);
})
.screenshots({
timestamps: [timestamp],
count: 1,
filename: `thumb-${file.hash}${file.thumbextension}`,
folder: `${uploadDirectory}/file/`,
size: geometry.width > geometry.height ? `${thumbSize}x?` : `?x${thumbSize}`
//keep aspect ratio, but also making sure taller/wider thumbs dont exceed thumbSize in either dimension
});
if (timestamp === 0) {
//bypass issue with some dumb files like audio album art covert not working with .screenshots
command.inputOptions([
'-t',
0
])
.outputOptions([
`-vf scale=${geometry.width > geometry.height ? thumbSize + ':-2' : '-2:' + thumbSize}`
])
.output(`${uploadDirectory}/file/thumb-${file.hash}${file.thumbextension}`)
.run();
} else {
command.screenshots({
timestamps: [timestamp],
count: 1,
filename: `thumb-${file.hash}${file.thumbextension}`,
folder: `${uploadDirectory}/file/`,
size: geometry.width > geometry.height ? `${thumbSize}x?` : `?x${thumbSize}`
//keep aspect ratio, but also making sure taller/wider thumbs dont exceed thumbSize in either dimension
});
}
});
};

@ -39,7 +39,7 @@ section.form-wrapper.flex-center
- const minLength = (isThread ? board.settings.minReplyMessageLength : board.settings.minThreadMessageLength) || 0;
- const maxLength = Math.min((isThread ? board.settings.maxReplyMessageLength : board.settings.maxThreadMessageLength), globalLimits.fieldLength.message) || globalLimits.fieldLength.message;
textarea#message(name='message', rows='5', autocomplete='off' minlength=minLength maxlength=maxLength required=messageRequired)
if board.settings.maxFiles > 0
if board.settings.maxFiles > 0 && Object.values(board.settings.allowedFileTypes).some(x => x === true)
- const maxFiles = board.settings.maxFiles;
section.row
.label

Loading…
Cancel
Save