Skip to content

Commit 0863cd3

Browse files
authored
Fix scrollbar styles on compose textarea, small bugs (mastodon#10292)
1 parent 9c03a35 commit 0863cd3

3 files changed

Lines changed: 7 additions & 2 deletions

File tree

app/javascript/mastodon/features/compose/components/poll_form.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class Option extends React.PureComponent {
4848
<input
4949
type='text'
5050
placeholder={intl.formatMessage(messages.option_placeholder, { number: index + 1 })}
51-
maxlength={25}
51+
maxLength={25}
5252
value={title}
5353
onChange={this.handleOptionTitleChange}
5454
/>

app/javascript/mastodon/features/notifications/components/notification.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class Notification extends ImmutablePureComponent {
3333
onFavourite: PropTypes.func.isRequired,
3434
onReblog: PropTypes.func.isRequired,
3535
onToggleHidden: PropTypes.func.isRequired,
36-
status: PropTypes.option,
36+
status: ImmutablePropTypes.map,
3737
intl: PropTypes.object.isRequired,
3838
getScrollPosition: PropTypes.func,
3939
updateScrollBottom: PropTypes.func,

app/javascript/styles/mastodon/components.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,11 @@
357357
padding-bottom: 0;
358358
padding-right: 10px + 22px;
359359
resize: none;
360+
scrollbar-color: initial;
361+
362+
&::-webkit-scrollbar {
363+
all: unset;
364+
}
360365

361366
@media screen and (max-width: 600px) {
362367
height: 100px !important; // prevent auto-resize textarea

0 commit comments

Comments
 (0)