nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix scrollbar styles on compose textarea, small bugs (#10292)

This commit is contained in:
Eugen Rochko 2019-03-16 20:10:42 +01:00 committed by GitHub
parent 1a0d3c9c65
commit 6a3f08661f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/features/compose/components/poll_form.js
View File

@ -48,7 +48,7 @@ class Option extends React.PureComponent {
<input <input
type='text' type='text'
placeholder={intl.formatMessage(messages.option_placeholder, { number: index + 1 })} placeholder={intl.formatMessage(messages.option_placeholder, { number: index + 1 })}
maxlength={25} maxLength={25}
value={title} value={title}
onChange={this.handleOptionTitleChange} onChange={this.handleOptionTitleChange}
/> />

2
app/javascript/mastodon/features/notifications/components/notification.js
View File

@ -33,7 +33,7 @@ class Notification extends ImmutablePureComponent {
onFavourite: PropTypes.func.isRequired, onFavourite: PropTypes.func.isRequired,
onReblog: PropTypes.func.isRequired, onReblog: PropTypes.func.isRequired,
onToggleHidden: PropTypes.func.isRequired, onToggleHidden: PropTypes.func.isRequired,
status: PropTypes.option, status: ImmutablePropTypes.map,
intl: PropTypes.object.isRequired, intl: PropTypes.object.isRequired,
getScrollPosition: PropTypes.func, getScrollPosition: PropTypes.func,
updateScrollBottom: PropTypes.func, updateScrollBottom: PropTypes.func,

5
app/javascript/styles/mastodon/components.scss
View File

@ -357,6 +357,11 @@
padding-bottom: 0; padding-bottom: 0;
padding-right: 10px + 22px; padding-right: 10px + 22px;
resize: none; resize: none;
scrollbar-color: initial;
&::-webkit-scrollbar {
all: unset;
}
@media screen and (max-width: 600px) { @media screen and (max-width: 600px) {
height: 100px !important; // prevent auto-resize textarea height: 100px !important; // prevent auto-resize textarea