mirror of
https://github.com/mastodon/mastodon
synced 2024-12-18 08:38:20 +09:00
Improve glow
This commit is contained in:
parent
53ae431867
commit
9d4cad6307
@ -7,7 +7,8 @@ const iconStyle = {
|
||||
position: 'absolute',
|
||||
right: '0',
|
||||
top: '-48px',
|
||||
cursor: 'pointer'
|
||||
cursor: 'pointer',
|
||||
zIndex: '3'
|
||||
};
|
||||
|
||||
const ColumnCollapsable = React.createClass({
|
||||
|
@ -16,6 +16,7 @@ const messages = defineMessages({
|
||||
});
|
||||
|
||||
const mapStateToProps = state => ({
|
||||
hasUnread: state.getIn(['timelines', 'public', 'unread']) > 0,
|
||||
accessToken: state.getIn(['meta', 'access_token'])
|
||||
});
|
||||
|
||||
@ -24,7 +25,8 @@ const CommunityTimeline = React.createClass({
|
||||
propTypes: {
|
||||
dispatch: React.PropTypes.func.isRequired,
|
||||
intl: React.PropTypes.object.isRequired,
|
||||
accessToken: React.PropTypes.string.isRequired
|
||||
accessToken: React.PropTypes.string.isRequired,
|
||||
hasUnread: React.PropTypes.bool
|
||||
},
|
||||
|
||||
mixins: [PureRenderMixin],
|
||||
@ -58,10 +60,10 @@ const CommunityTimeline = React.createClass({
|
||||
},
|
||||
|
||||
render () {
|
||||
const { intl } = this.props;
|
||||
const { intl, hasUnread } = this.props;
|
||||
|
||||
return (
|
||||
<Column icon='users' heading={intl.formatMessage(messages.title)}>
|
||||
<Column icon='users' active={hasUnread} heading={intl.formatMessage(messages.title)}>
|
||||
<ColumnBackButtonSlim />
|
||||
<StatusListContainer type='community' emptyMessage={<FormattedMessage id='empty_column.community' defaultMessage='The local timeline is empty. Write something publicly to get the ball rolling!' />} />
|
||||
</Column>
|
||||
|
@ -12,6 +12,7 @@ import { FormattedMessage } from 'react-intl';
|
||||
import createStream from '../../stream';
|
||||
|
||||
const mapStateToProps = state => ({
|
||||
hasUnread: state.getIn(['timelines', 'tag', 'unread']) > 0,
|
||||
accessToken: state.getIn(['meta', 'access_token'])
|
||||
});
|
||||
|
||||
@ -20,7 +21,8 @@ const HashtagTimeline = React.createClass({
|
||||
propTypes: {
|
||||
params: React.PropTypes.object.isRequired,
|
||||
dispatch: React.PropTypes.func.isRequired,
|
||||
accessToken: React.PropTypes.string.isRequired
|
||||
accessToken: React.PropTypes.string.isRequired,
|
||||
hasUnread: React.PropTypes.bool
|
||||
},
|
||||
|
||||
mixins: [PureRenderMixin],
|
||||
@ -72,10 +74,10 @@ const HashtagTimeline = React.createClass({
|
||||
},
|
||||
|
||||
render () {
|
||||
const { id } = this.props.params;
|
||||
const { id, hasUnread } = this.props.params;
|
||||
|
||||
return (
|
||||
<Column icon='hashtag' heading={id}>
|
||||
<Column icon='hashtag' active={hasUnread} heading={id}>
|
||||
<ColumnBackButtonSlim />
|
||||
<StatusListContainer type='tag' id={id} emptyMessage={<FormattedMessage id='empty_column.hashtag' defaultMessage='There is nothing in this hashtag yet.' />} />
|
||||
</Column>
|
||||
|
@ -1,3 +1,4 @@
|
||||
import { connect } from 'react-redux';
|
||||
import PureRenderMixin from 'react-addons-pure-render-mixin';
|
||||
import StatusListContainer from '../ui/containers/status_list_container';
|
||||
import Column from '../ui/components/column';
|
||||
@ -9,19 +10,24 @@ const messages = defineMessages({
|
||||
title: { id: 'column.home', defaultMessage: 'Home' }
|
||||
});
|
||||
|
||||
const mapStateToProps = state => ({
|
||||
hasUnread: state.getIn(['timelines', 'home', 'unread']) > 0
|
||||
});
|
||||
|
||||
const HomeTimeline = React.createClass({
|
||||
|
||||
propTypes: {
|
||||
intl: React.PropTypes.object.isRequired
|
||||
intl: React.PropTypes.object.isRequired,
|
||||
hasUnread: React.PropTypes.bool
|
||||
},
|
||||
|
||||
mixins: [PureRenderMixin],
|
||||
|
||||
render () {
|
||||
const { intl } = this.props;
|
||||
const { intl, hasUnread } = this.props;
|
||||
|
||||
return (
|
||||
<Column icon='home' heading={intl.formatMessage(messages.title)}>
|
||||
<Column icon='home' active={hasUnread} heading={intl.formatMessage(messages.title)}>
|
||||
<ColumnSettingsContainer />
|
||||
<StatusListContainer {...this.props} type='home' emptyMessage={<FormattedMessage id='empty_column.home' defaultMessage="You aren't following anyone yet. Visit {public} or use search to get started and meet other users." values={{ public: <Link to='/timelines/public'><FormattedMessage id='empty_column.home.public_timeline' defaultMessage='the public timeline' /></Link> }} />} />
|
||||
</Column>
|
||||
@ -30,4 +36,4 @@ const HomeTimeline = React.createClass({
|
||||
|
||||
});
|
||||
|
||||
export default injectIntl(HomeTimeline);
|
||||
export default connect(mapStateToProps)(injectIntl(HomeTimeline));
|
||||
|
@ -16,6 +16,7 @@ const messages = defineMessages({
|
||||
});
|
||||
|
||||
const mapStateToProps = state => ({
|
||||
hasUnread: state.getIn(['timelines', 'public', 'unread']) > 0,
|
||||
accessToken: state.getIn(['meta', 'access_token'])
|
||||
});
|
||||
|
||||
@ -24,7 +25,8 @@ const PublicTimeline = React.createClass({
|
||||
propTypes: {
|
||||
dispatch: React.PropTypes.func.isRequired,
|
||||
intl: React.PropTypes.object.isRequired,
|
||||
accessToken: React.PropTypes.string.isRequired
|
||||
accessToken: React.PropTypes.string.isRequired,
|
||||
hasUnread: React.PropTypes.bool
|
||||
},
|
||||
|
||||
mixins: [PureRenderMixin],
|
||||
@ -58,10 +60,10 @@ const PublicTimeline = React.createClass({
|
||||
},
|
||||
|
||||
render () {
|
||||
const { intl } = this.props;
|
||||
const { intl, hasUnread } = this.props;
|
||||
|
||||
return (
|
||||
<Column icon='globe' heading={intl.formatMessage(messages.title)}>
|
||||
<Column icon='globe' active={hasUnread} heading={intl.formatMessage(messages.title)}>
|
||||
<ColumnBackButtonSlim />
|
||||
<StatusListContainer type='public' emptyMessage={<FormattedMessage id='empty_column.public' defaultMessage='There is nothing here! Write something publicly, or manually follow users from other instances to fill it up' />} />
|
||||
</Column>
|
||||
|
@ -786,6 +786,7 @@ a.status__content__spoiler-link {
|
||||
flex: 0 0 auto;
|
||||
cursor: pointer;
|
||||
color: $color4;
|
||||
z-index: 3;
|
||||
|
||||
&:hover {
|
||||
text-decoration: underline;
|
||||
@ -1079,6 +1080,12 @@ button.active i.fa-retweet {
|
||||
background: lighten($color1, 4%);
|
||||
flex: 0 0 auto;
|
||||
cursor: pointer;
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
|
||||
&.active {
|
||||
box-shadow: 0 1px 0 rgba($color4, 0.3);
|
||||
}
|
||||
|
||||
&.active .fa {
|
||||
color: $color4;
|
||||
@ -1209,11 +1216,13 @@ button.active i.fa-retweet {
|
||||
|
||||
.status-list__unread-indicator, .notifications__unread-indicator {
|
||||
position: absolute;
|
||||
top: 48px;
|
||||
top: 35px;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
right: 0;
|
||||
margin: 0 auto;
|
||||
width: 60%;
|
||||
pointer-events: none;
|
||||
height: 30px;
|
||||
z-index: 2;
|
||||
background: linear-gradient(to bottom, rgba($color4, 0.3) 0%, rgba($color4, 0) 60%);
|
||||
height: 28px;
|
||||
z-index: 1;
|
||||
background: radial-gradient(ellipse, rgba($color4, 0.23) 0%, rgba($color4, 0) 60%);
|
||||
}
|
||||
|
@ -26,7 +26,7 @@ class Formatter
|
||||
end
|
||||
|
||||
def reformat(html)
|
||||
sanitize(html, tags: %w(a br p), attributes: %w(href rel))
|
||||
sanitize(html, tags: %w(a br p span), attributes: %w(href rel class))
|
||||
end
|
||||
|
||||
def simplified_format(account)
|
||||
|
Loading…
Reference in New Issue
Block a user