grantonthenet
/
microblog
forked from berserker/microblog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert redundant vanilla patches to upstream

Browse Source
local
Thor 2 years ago
parent 775e4c4be9
commit ca90a99560
6 changed files with 89 additions and 262 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      app/javascript/mastodon/actions/compose.js
  2. 59
      app/javascript/mastodon/components/media_gallery.js
  3. 2
      app/javascript/mastodon/features/compose/containers/upload_button_container.js
  4. 2
      app/javascript/mastodon/features/ui/index.js
  5. 3
      app/javascript/mastodon/utils/resize_image.js
  6. 277
      app/javascript/styles/mastodon/components.scss

8
app/javascript/mastodon/actions/compose.js
Unescape View File

@ -197,9 +197,7 @@ export function submitCompose(routerHistory) {
if (statusId === null && response.data.in_reply_to_id === null && response.data.visibility === 'public') { if (statusId === null && response.data.in_reply_to_id === null && response.data.visibility === 'public') {
insertIfOnline('community'); insertIfOnline('community');
if (!response.data.local_only) { insertIfOnline('public');
insertIfOnline('public');
}
insertIfOnline(`account:${response.data.account.id}`); insertIfOnline(`account:${response.data.account.id}`);
} }
}).catch(function (error) { }).catch(function (error) {
@ -230,7 +228,7 @@ export function submitComposeFail(error) {
export function uploadCompose(files) { export function uploadCompose(files) {
return function (dispatch, getState) { return function (dispatch, getState) {
const uploadLimit = 20; // attachment limit patch const uploadLimit = 4;
const media = getState().getIn(['compose', 'media_attachments']); const media = getState().getIn(['compose', 'media_attachments']);
const pending = getState().getIn(['compose', 'pending_media_attachments']); const pending = getState().getIn(['compose', 'pending_media_attachments']);
const progress = new Array(files.length).fill(0); const progress = new Array(files.length).fill(0);
@ -249,7 +247,7 @@ export function uploadCompose(files) {
dispatch(uploadComposeRequest()); dispatch(uploadComposeRequest());
for (const [i, f] of Array.from(files).entries()) { for (const [i, f] of Array.from(files).entries()) {
if (media.size + i > 19) break; // attachment limit patch if (media.size + i > 3) break;
resizeImage(f).then(file => { resizeImage(f).then(file => {
const data = new FormData(); const data = new FormData();

59
app/javascript/mastodon/components/media_gallery.js
Unescape View File

@ -87,39 +87,46 @@ class Item extends React.PureComponent {
let left = 'auto'; let left = 'auto';
let bottom = 'auto'; let bottom = 'auto';
let right = 'auto'; let right = 'auto';
let root = Math.sqrt(size); if (size === 1) {
let numCols = Math.ceil(root); width = 100;
let numRows = Math.ceil(size / numCols);
let col = index % numCols;
let row = Math.floor(index / numCols);
if(row === numRows - 1) {
width = 100 / (1 + ((size - 1) % numCols));
} else {
width = 100 / numCols;
} }
height = 100 / numRows;
if (size === 4 || (size === 3 && index > 0)) {
if(numCols > 1) { height = 50;
if(col === 0) { }
if (size === 2) {
if (index === 0) {
right = '2px'; right = '2px';
} else if(col === numCols - 1) {
left = '2px';;
} else { } else {
left = '2px'; left = '2px';
}
} else if (size === 3) {
if (index === 0) {
right = '2px'; right = '2px';
} else if (index > 0) {
left = '2px';
} }
}
if(numRows > 1) { if (index === 1) {
if(row === 0) {
bottom = '2px'; bottom = '2px';
} else if(row === numRows - 1) { } else if (index > 1) {
top = '2px'; top = '2px';
}
} else if (size === 4) {
if (index === 0 || index === 2) {
right = '2px';
}
if (index === 1 || index === 3) {
left = '2px';
}
if (index < 2) {
bottom = '2px';
} else { } else {
top = '2px'; top = '2px';
bottom = '2px';
} }
} }
@ -127,7 +134,7 @@ class Item extends React.PureComponent {
if (attachment.get('type') === 'unknown') { if (attachment.get('type') === 'unknown') {
return ( return (
<div className={classNames('media-gallery__item', { standalone })} key={attachment.get('id')} style={{ 'padding-left': left, 'padding-top': top, 'padding-right': right, 'padding-bottom': bottom, width: `${width}%`, height: `${height}%` }}> <div className={classNames('media-gallery__item', { standalone })} key={attachment.get('id')} style={{ left: left, top: top, right: right, bottom: bottom, width: `${width}%`, height: `${height}%` }}>
<a className='media-gallery__item-thumbnail' href={attachment.get('remote_url') || attachment.get('url')} style={{ cursor: 'pointer' }} title={attachment.get('description')} target='_blank' rel='noopener noreferrer'> <a className='media-gallery__item-thumbnail' href={attachment.get('remote_url') || attachment.get('url')} style={{ cursor: 'pointer' }} title={attachment.get('description')} target='_blank' rel='noopener noreferrer'>
<Blurhash <Blurhash
hash={attachment.get('blurhash')} hash={attachment.get('blurhash')}
@ -198,7 +205,7 @@ class Item extends React.PureComponent {
} }
return ( return (
<div className={classNames('media-gallery__item', { standalone })} key={attachment.get('id')} style={{ 'padding-left': left, 'padding-top': top, 'padding-right': right, 'padding-bottom': bottom, width: `${width}%`, height: `${height}%` }}> <div className={classNames('media-gallery__item', { standalone })} key={attachment.get('id')} style={{ left: left, top: top, right: right, bottom: bottom, width: `${width}%`, height: `${height}%` }}>
<Blurhash <Blurhash
hash={attachment.get('blurhash')} hash={attachment.get('blurhash')}
dummy={!useBlurhash} dummy={!useBlurhash}
@ -322,13 +329,13 @@ class MediaGallery extends React.PureComponent {
style.height = height; style.height = height;
} }
const size = media.take(20).size; const size = media.take(4).size;
const uncached = media.every(attachment => attachment.get('type') === 'unknown'); const uncached = media.every(attachment => attachment.get('type') === 'unknown');
if (standalone && this.isFullSizeEligible()) { if (standalone && this.isFullSizeEligible()) {
children = <Item standalone autoplay={autoplay} onClick={this.handleClick} attachment={media.get(0)} displayWidth={width} visible={visible} />; children = <Item standalone autoplay={autoplay} onClick={this.handleClick} attachment={media.get(0)} displayWidth={width} visible={visible} />;
} else { } else {
children = media.take(20).map((attachment, i) => <Item key={attachment.get('id')} autoplay={autoplay} onClick={this.handleClick} attachment={attachment} index={i} size={size} displayWidth={width} visible={visible || uncached} />); children = media.take(4).map((attachment, i) => <Item key={attachment.get('id')} autoplay={autoplay} onClick={this.handleClick} attachment={attachment} index={i} size={size} displayWidth={width} visible={visible || uncached} />);
} }
if (uncached) { if (uncached) {

2
app/javascript/mastodon/features/compose/containers/upload_button_container.js
Unescape View File

@ -3,7 +3,7 @@ import UploadButton from '../components/upload_button';
import { uploadCompose } from '../../../actions/compose'; import { uploadCompose } from '../../../actions/compose';
const mapStateToProps = state => ({ const mapStateToProps = state => ({
disabled: state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size + state.getIn(['compose', 'pending_media_attachments']) > 19 || state.getIn(['compose', 'media_attachments']).some(m => ['video', 'audio'].includes(m.get('type')))), disabled: state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size + state.getIn(['compose', 'pending_media_attachments']) > 3 || state.getIn(['compose', 'media_attachments']).some(m => ['video', 'audio'].includes(m.get('type')))),
unavailable: state.getIn(['compose', 'poll']) !== null, unavailable: state.getIn(['compose', 'poll']) !== null,
resetFileKey: state.getIn(['compose', 'resetFileKey']), resetFileKey: state.getIn(['compose', 'resetFileKey']),
}); });

2
app/javascript/mastodon/features/ui/index.js
Unescape View File

@ -69,7 +69,7 @@ const mapStateToProps = state => ({
isComposing: state.getIn(['compose', 'is_composing']), isComposing: state.getIn(['compose', 'is_composing']),
hasComposingText: state.getIn(['compose', 'text']).trim().length !== 0, hasComposingText: state.getIn(['compose', 'text']).trim().length !== 0,
hasMediaAttachments: state.getIn(['compose', 'media_attachments']).size > 0, hasMediaAttachments: state.getIn(['compose', 'media_attachments']).size > 0,
canUploadMore: !state.getIn(['compose', 'media_attachments']).some(x => ['audio', 'video'].includes(x.get('type'))) && state.getIn(['compose', 'media_attachments']).size < 20, canUploadMore: !state.getIn(['compose', 'media_attachments']).some(x => ['audio', 'video'].includes(x.get('type'))) && state.getIn(['compose', 'media_attachments']).size < 4,
dropdownMenuIsOpen: state.getIn(['dropdown_menu', 'openId']) !== null, dropdownMenuIsOpen: state.getIn(['dropdown_menu', 'openId']) !== null,
firstLaunch: state.getIn(['settings', 'introductionVersion'], 0) < INTRODUCTION_VERSION, firstLaunch: state.getIn(['settings', 'introductionVersion'], 0) < INTRODUCTION_VERSION,
username: state.getIn(['accounts', me, 'username']), username: state.getIn(['accounts', me, 'username']),

3
app/javascript/mastodon/utils/resize_image.js
Unescape View File

@ -1,7 +1,6 @@
import EXIF from 'exif-js'; import EXIF from 'exif-js';
//const MAX_IMAGE_PIXELS = 2073600; // 1920x1080px const MAX_IMAGE_PIXELS = 2073600; // 1920x1080px
const MAX_IMAGE_PIXELS = 8294400; // 3840x2160px (HiDPI patch)
const _browser_quirks = {}; const _browser_quirks = {};

277
app/javascript/styles/mastodon/components.scss
Unescape View File

@ -50,14 +50,16 @@
cursor: pointer; cursor: pointer;
display: inline-block; display: inline-block;
font-family: inherit; font-family: inherit;
font-size: 17px; font-size: 14px;
font-weight: 500; font-weight: 500;
height: 36px;
letter-spacing: 0; letter-spacing: 0;
line-height: 22px; line-height: 36px;
overflow: hidden; overflow: hidden;
padding: 7px 18px; padding: 0 16px;
position: relative; position: relative;
text-align: center; text-align: center;
text-transform: uppercase;
text-decoration: none; text-decoration: none;
text-overflow: ellipsis; text-overflow: ellipsis;
transition: all 100ms ease-in; transition: all 100ms ease-in;
@ -98,6 +100,17 @@
outline: 0 !important; outline: 0 !important;
} }
&.button-primary,
&.button-alternative,
&.button-secondary,
&.button-alternative-2 {
font-size: 16px;
line-height: 36px;
height: auto;
text-transform: none;
padding: 4px 16px;
}
&.button-alternative { &.button-alternative {
color: $inverted-text-color; color: $inverted-text-color;
background: $ui-primary-color; background: $ui-primary-color;
@ -122,7 +135,7 @@
&.button-secondary { &.button-secondary {
color: $darker-text-color; color: $darker-text-color;
background: transparent; background: transparent;
padding: 6px 17px; padding: 3px 15px;
border: 1px solid $ui-primary-color; border: 1px solid $ui-primary-color;
&:active, &:active,
@ -815,18 +828,11 @@
} }
.emojione { .emojione {
width: 32px; width: 20px;
height: 32px; height: 20px;
margin: 0; margin: -3px 0 0;
}
img.emojione[alt^=":sticker_"] {
width: 128px;
height: 128px;
display: block;
margin: 0;
} }
p { p {
margin-bottom: 20px; margin-bottom: 20px;
white-space: pre-wrap; white-space: pre-wrap;
@ -1108,39 +1114,42 @@
font-size: 15px; font-size: 15px;
} }
.status-check-box__status { .status-check-box {
display: block; border-bottom: 1px solid $ui-secondary-color;
box-sizing: border-box; display: flex;
width: 100%;
padding: 0 10px;
.detailed-status__display-name { .status-check-box__status {
color: lighten($inverted-text-color, 16%); margin: 10px 0 10px 10px;
flex: 1;
overflow: hidden;
span { .media-gallery {
display: inline; max-width: 250px;
} }
&:hover strong { .status__content {
text-decoration: none; padding: 0;
white-space: normal;
} }
}
.media-gallery, .video-player,
.audio-player, .audio-player {
.video-player { margin-top: 8px;
margin-top: 8px; max-width: 250px;
max-width: 250px; }
}
.status__content { .media-gallery__item-thumbnail {
padding: 0; cursor: default;
white-space: normal; }
} }
}
.media-gallery__item-thumbnail { .status-check-box-toggle {
cursor: default; align-items: center;
} display: flex;
flex: 0 0 auto;
justify-content: center;
padding: 10px;
} }
.status__prepend { .status__prepend {
@ -1770,7 +1779,7 @@ a.account__display-name {
.image-loader__preview-canvas { .image-loader__preview-canvas {
max-width: $media-modal-media-max-width; max-width: $media-modal-media-max-width;
max-height: $media-modal-media-max-height; max-height: $media-modal-media-max-height;
background: url('~images/void.png') repeat; background: url('../images/void.png') repeat;
object-fit: contain; object-fit: contain;
} }
@ -5094,192 +5103,6 @@ a.status-card.compact:hover {
max-width: 700px; max-width: 700px;
} }
.report-dialog-modal {
max-width: 90vw;
width: 480px;
height: 80vh;
background: lighten($ui-secondary-color, 8%);
color: $inverted-text-color;
border-radius: 8px;
overflow: hidden;
position: relative;
flex-direction: column;
display: flex;
&__container {
box-sizing: border-box;
border-top: 1px solid $ui-secondary-color;
padding: 20px;
flex-grow: 1;
display: flex;
flex-direction: column;
min-height: 0;
overflow: auto;
}
&__title {
font-size: 28px;
line-height: 33px;
font-weight: 700;
margin-bottom: 15px;
@media screen and (max-height: 800px) {
font-size: 22px;
}
}
&__subtitle {
font-size: 17px;
font-weight: 600;
line-height: 22px;
margin-bottom: 4px;
}
&__lead {
font-size: 17px;
line-height: 22px;
color: lighten($inverted-text-color, 16%);
margin-bottom: 30px;
}
&__actions {
margin-top: 30px;
display: flex;
.button {
flex: 1 1 auto;
}
}
&__statuses {
flex-grow: 1;
min-height: 0;
overflow: auto;
}
.status__content a {
color: $highlight-text-color;
}
.status__content,
.status__content p {
color: $inverted-text-color;
}
.dialog-option .poll__input {
border-color: $inverted-text-color;
color: $ui-secondary-color;
display: inline-flex;
align-items: center;
justify-content: center;
svg {
width: 8px;
height: auto;
}
&:active,
&:focus,
&:hover {
border-color: lighten($inverted-text-color, 15%);
border-width: 4px;
}
&.active {
border-color: $inverted-text-color;
background: $inverted-text-color;
}
}
.poll__option.dialog-option {
padding: 15px 0;
flex: 0 0 auto;
border-bottom: 1px solid $ui-secondary-color;
&:last-child {
border-bottom: 0;
}
& > .poll__option__text {
font-size: 13px;
color: lighten($inverted-text-color, 16%);
strong {
font-size: 17px;
font-weight: 500;
line-height: 22px;
color: $inverted-text-color;
display: block;
margin-bottom: 4px;
&:last-child {
margin-bottom: 0;
}
}
}
}
.flex-spacer {
background: transparent;
}
&__textarea {
display: block;
box-sizing: border-box;
width: 100%;
margin: 0;
color: $inverted-text-color;
background: $simple-background-color;
padding: 10px;
font-family: inherit;
font-size: 17px;
line-height: 22px;
resize: vertical;
border: 0;
outline: 0;
border-radius: 4px;
margin: 20px 0;
&::placeholder {
color: $dark-text-color;
}
&:focus {
outline: 0;
}
}
&__toggle {
display: flex;
align-items: center;
& > span {
font-size: 17px;
font-weight: 500;
margin-left: 10px;
}
}
.button.button-secondary {
border-color: $inverted-text-color;
color: $inverted-text-color;
flex: 0 0 auto;
&:hover,
&:focus,
&:active {
border-color: lighten($inverted-text-color, 15%);
color: lighten($inverted-text-color, 15%);
}
}
hr {
border: 0;
background: transparent;
margin: 15px 0;
}
}
.report-modal__container { .report-modal__container {
display: flex; display: flex;
border-top: 1px solid $ui-secondary-color; border-top: 1px solid $ui-secondary-color;
@ -6877,7 +6700,7 @@ noscript {
width: 100px; width: 100px;
height: 100px; height: 100px;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
background: url('~images/reticle.png') no-repeat 0 0; background: url('../images/reticle.png') no-repeat 0 0;
border-radius: 50%; border-radius: 50%;
box-shadow: 0 0 0 9999em rgba($base-shadow-color, 0.35); box-shadow: 0 0 0 9999em rgba($base-shadow-color, 0.35);
} }

Write Preview
Loading…
Cancel
Save