From 6a3f08661f8d23e5f93717f36df1463842bfd936 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 16 Mar 2019 20:10:42 +0100 Subject: [PATCH] Fix scrollbar styles on compose textarea, small bugs (#10292) --- .../mastodon/features/compose/components/poll_form.js | 2 +- .../features/notifications/components/notification.js | 2 +- app/javascript/styles/mastodon/components.scss | 5 +++++ 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 ff0062425d..4fb95f3c9f 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 { diff --git a/app/javascript/mastodon/features/notifications/components/notification.js b/app/javascript/mastodon/features/notifications/components/notification.js index 4bdf09166a..41e9324e6f 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 ceb28dd19f..8da4e2f4a1 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