diff options
| -rw-r--r-- | .env.vagrant | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/components/components/status_content.jsx | 12 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/.env.vagrant b/.env.vagrant index 0ab0552c9..04b889d00 100644 --- a/.env.vagrant +++ b/.env.vagrant @@ -1 +1,2 @@ -VAGRANT=true \ No newline at end of file +VAGRANT=true +LOCAL_DOMAIN=mastodon.dev \ No newline at end of file diff --git a/app/assets/javascripts/components/components/status_content.jsx b/app/assets/javascripts/components/components/status_content.jsx index 521b557f0..ded98c1cd 100644 --- a/app/assets/javascripts/components/components/status_content.jsx +++ b/app/assets/javascripts/components/components/status_content.jsx @@ -86,6 +86,16 @@ const StatusContent = React.createClass({ const content = { __html: emojify(status.get('content')) }; const spoilerContent = { __html: emojify(status.get('spoiler_text', '')) }; + const spoilerStyle = { + backgroundColor: '#616b86', + borderRadius: '4px', + color: '#363c4b', + fontWeight: '500', + fontSize: '12px', + padding: '0 4px', + textTransform: 'uppercase' + }; + if (status.get('spoiler_text').length > 0) { const toggleText = hidden ? <FormattedMessage id='status.show_more' defaultMessage='Show more' /> : <FormattedMessage id='status.show_less' defaultMessage='Show less' />; @@ -93,7 +103,7 @@ const StatusContent = React.createClass({ return ( <div className='status__content' style={{ cursor: 'pointer' }} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}> <p style={{ marginBottom: hidden ? '0px' : '' }} > - <span dangerouslySetInnerHTML={spoilerContent} /> <a onClick={this.handleSpoilerClick}>{toggleText}</a> + <span dangerouslySetInnerHTML={spoilerContent} /> <a style={spoilerStyle} onClick={this.handleSpoilerClick}>[{toggleText}]</a> </p> <div style={{ display: hidden ? 'none' : 'block' }} dangerouslySetInnerHTML={content} /> diff --git a/config/routes.rb b/config/routes.rb index 15fb924f1..9423a0ae2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -68,6 +68,8 @@ Rails.application.routes.draw do end end + get '/admin', to: redirect('/admin/settings', status: 302) + namespace :api do # PubSubHubbub outgoing subscriptions resources :subscriptions, only: [:show] |