nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix up timeout, improve contrast on "show more", add responsive style 

for extremely wide monitors
This commit is contained in:
Eugen Rochko 2017-01-26 18:48:56 +01:00
parent cc5c1e5feb
commit 7329fbd8a4
4 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/components/actions/notifications.jsx
View File

@ -40,7 +40,7 @@ export function updateNotifications(notification, intlMessages, intlLocale) {
// Desktop notifications // Desktop notifications
if (typeof window.Notification !== 'undefined' && showAlert) { if (typeof window.Notification !== 'undefined' && showAlert) {
const title = new IntlMessageFormat(intlMessages[`notification.${notification.type}`], intlLocale).format({ name: notification.account.display_name.length > 0 ? notification.account.display_name : notification.account.username }); const title = new IntlMessageFormat(intlMessages[`notification.${notification.type}`], intlLocale).format({ name: notification.account.display_name.length > 0 ? notification.account.display_name : notification.account.username });
const body = $('<p>').html(notification.status ? notification.status.content : '').text(); const body = (notification.status && notification.status.spoiler_text.length > 0) ? notification.status.spoiler_text : $('<p>').html(notification.status ? notification.status.content : '').text();
new Notification(title, { body, icon: notification.account.avatar, tag: notification.id }); new Notification(title, { body, icon: notification.account.avatar, tag: notification.id });
} }

5
app/assets/javascripts/components/features/ui/components/columns_area.jsx
View File

@ -3,12 +3,15 @@ import PureRenderMixin from 'react-addons-pure-render-mixin';
const style = { const style = {
display: 'flex', display: 'flex',
flex: '1 1 auto', flex: '1 1 auto',
justifyContent: 'flex-start',
overflowX: 'auto' overflowX: 'auto'
}; };
const ColumnsArea = React.createClass({ const ColumnsArea = React.createClass({
propTypes: {
children: React.PropTypes.node
},
mixins: [PureRenderMixin], mixins: [PureRenderMixin],
render () { render () {

27
app/assets/stylesheets/components.scss
View File

@ -139,10 +139,10 @@
} }
.status__content__spoiler-link { .status__content__spoiler-link {
background: lighten($color1, 26%); background: lighten($color1, 30%);
&:hover { &:hover {
background: lighten($color1, 29%); background: lighten($color1, 33%);
text-decoration: none; text-decoration: none;
} }
} }
@ -261,6 +261,15 @@
.status__avatar { .status__avatar {
opacity: 0.5; opacity: 0.5;
} }
.status__content__spoiler-link {
background: lighten($color1, 26%);
&:hover {
background: lighten($color1, 29%);
text-decoration: none;
}
}
} }
.notification__display-name { .notification__display-name {
@ -354,6 +363,7 @@
.columns-area { .columns-area {
flex-direction: row; flex-direction: row;
justify-content: flex-start;
} }
@media screen and (min-width: 360px) { @media screen and (min-width: 360px) {
@ -371,6 +381,19 @@
width: 280px; width: 280px;
} }
@media screen and (min-width: 2560px) {
.columns-area {
justify-content: center;
}
.column, .drawer {
width: 350px;
border-radius: 4px;
height: 90vh;
margin-top: 5vh;
}
}
.drawer__inner { .drawer__inner {
background: linear-gradient(rgba(lighten($color1, 13%), 1), rgba(lighten($color1, 13%), 0.65)); background: linear-gradient(rgba(lighten($color1, 13%), 1), rgba(lighten($color1, 13%), 0.65));
} }

5
config/initializers/timeout.rb
View File

@ -1 +1,4 @@
Rack::Timeout.timeout = 30 if Rails.env.production? if Rails.env.production?
Rack::Timeout.service_timeout = 15
Rack::Timeout::Logger.disable
end