asonix/mastodon
1
1
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
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
type='text'
placeholder={intl.formatMessage(messages.option_placeholder, { number: index + 1 })}
maxlength={25}
maxLength={25}
value={title}
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,
onReblog: PropTypes.func.isRequired,
onToggleHidden: PropTypes.func.isRequired,
status: PropTypes.option,
status: ImmutablePropTypes.map,
intl: PropTypes.object.isRequired,
getScrollPosition: PropTypes.func,
updateScrollBottom: PropTypes.func,

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

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