diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-16 20:10:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-16 20:10:42 +0100 |
| commit | 6a3f08661f8d23e5f93717f36df1463842bfd936 (patch) | |
| tree | e84547527fd4d4891aa16d37b33f012676b5be9c /app | |
| parent | 1a0d3c9c65d663210494ec9b55912debad6331f5 (diff) | |
Fix scrollbar styles on compose textarea, small bugs (#10292)
Diffstat (limited to 'app')
3 files changed, 7 insertions, 2 deletions
diff --git a/app/javascript/mastodon/features/compose/components/poll_form.js b/app/javascript/mastodon/features/compose/components/poll_form.js index ff0062425..4fb95f3c9 100644 --- a/app/javascript/mastodon/features/compose/components/poll_form.js +++ b/app/javascript/mastodon/features/compose/components/poll_form.js @@ -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} /> diff --git a/app/javascript/mastodon/features/notifications/components/notification.js b/app/javascript/mastodon/features/notifications/components/notification.js index 4bdf09166..41e9324e6 100644 --- a/app/javascript/mastodon/features/notifications/components/notification.js +++ b/app/javascript/mastodon/features/notifications/components/notification.js @@ -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, diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index ceb28dd19..8da4e2f4a 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -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 |