mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into merge-upstream 

Conflicts:
	app/javascript/images/mastodon-drawer.png
	app/javascript/styles/mastodon/components.scss
pull/291/head
David Yip 2017-12-26 22:24:19 -06:00
parent 7347bc7334 65f30f65a2
commit 7174d1c955
No known key found for this signature in database
GPG Key ID: 7DA0036508FCC0CC
8 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
app/javascript/images/mastodon-getting-started.png → app/javascript/images/mastodon-drawer.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 45 KiB

BIN
app/javascript/images/wave-drawer.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

1
app/javascript/mastodon/features/compose/index.js
View File

@ -94,6 +94,7 @@ export default class Compose extends React.PureComponent {
<div className='drawer__inner' onFocus={this.onFocus}> <div className='drawer__inner' onFocus={this.onFocus}>
<NavigationContainer onClose={this.onBlur} /> <NavigationContainer onClose={this.onBlur} />
<ComposeFormContainer /> <ComposeFormContainer />
<div className='mastodon' />
</div> </div>
<Motion defaultStyle={{ x: -100 }} style={{ x: spring(showSearch ? 0 : -100, { stiffness: 210, damping: 20 }) }}> <Motion defaultStyle={{ x: -100 }} style={{ x: spring(showSearch ? 0 : -100, { stiffness: 210, damping: 20 }) }}>

2
app/javascript/mastodon/features/getting_started/index.js
View File

@ -98,7 +98,6 @@ export default class GettingStarted extends ImmutablePureComponent {
<ColumnLink icon='sign-out' text={intl.formatMessage(messages.sign_out)} href='/auth/sign_out' method='delete' /> <ColumnLink icon='sign-out' text={intl.formatMessage(messages.sign_out)} href='/auth/sign_out' method='delete' />
</div> </div>
<div className='getting-started__footer scrollable optionally-scrollable'>
<div className='static-content getting-started'> <div className='static-content getting-started'>
<p> <p>
<a href='https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/FAQ.md' rel='noopener' target='_blank'><FormattedMessage id='getting_started.faq' defaultMessage='FAQ' /></a> • <a href='https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/User-guide.md' rel='noopener' target='_blank'><FormattedMessage id='getting_started.userguide' defaultMessage='User Guide' /></a> • <a href='https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md' rel='noopener' target='_blank'><FormattedMessage id='getting_started.appsshort' defaultMessage='Apps' /></a> <a href='https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/FAQ.md' rel='noopener' target='_blank'><FormattedMessage id='getting_started.faq' defaultMessage='FAQ' /></a> • <a href='https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/User-guide.md' rel='noopener' target='_blank'><FormattedMessage id='getting_started.userguide' defaultMessage='User Guide' /></a> • <a href='https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md' rel='noopener' target='_blank'><FormattedMessage id='getting_started.appsshort' defaultMessage='Apps' /></a>
@ -111,7 +110,6 @@ export default class GettingStarted extends ImmutablePureComponent {
/> />
</p> </p>
</div> </div>
</div>
</Column> </Column>
); );
} }

16
app/javascript/styles/mastodon/components.scss
View File

@ -1758,7 +1758,7 @@
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
background: lighten($ui-base-color, 13%); background: lighten($ui-base-color, 13%) url('../images/wave-drawer.png') no-repeat bottom / 100% auto;
box-sizing: border-box; box-sizing: border-box;
padding: 0; padding: 0;
display: flex; display: flex;
@ -1771,6 +1771,11 @@
&.darker { &.darker {
background: $ui-base-color; background: $ui-base-color;
} }
> .mastodon {
background: url('../images/mastodon-drawer.png') no-repeat left bottom / contain;
flex: 1;
}
} }
.pseudo-drawer { .pseudo-drawer {
@ -2072,15 +2077,8 @@
overflow-y: auto; overflow-y: auto;
} }
.getting-started__footer {
display: flex;
flex-direction: column;
}
.getting-started { .getting-started {
box-sizing: border-box; background: $ui-base-color;
padding-bottom: 235px;
background: url('~images/mastodon-getting-started.png') no-repeat 0 100%;
flex: 1 0 auto; flex: 1 0 auto;
p { p {

2
app/lib/provider_discovery.rb
View File

@ -29,7 +29,7 @@ class ProviderDiscovery < OEmbed::ProviderDiscovery
end end
if format.nil? || format == :xml if format.nil? || format == :xml
provider_endpoint ||= html.at_xpath('//link[@type="application/xml+oembed"]')&.attribute('href')&.value provider_endpoint ||= html.at_xpath('//link[@type="text/xml+oembed"]')&.attribute('href')&.value
format ||= :xml if provider_endpoint format ||= :xml if provider_endpoint
end end

8
spec/fixtures/requests/oembed_json_xml.html vendored
View File

@ -1,8 +1,14 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<!--
oEmbed
https://oembed.com/
> The type attribute must contain either application/json+oembed for JSON
> responses, or text/xml+oembed for XML.
-->
<link href='https://host/provider.json' rel='alternate' type='application/json+oembed'> <link href='https://host/provider.json' rel='alternate' type='application/json+oembed'>
<link href='https://host/provider.xml' rel='alternate' type='application/xml+oembed'> <link href='https://host/provider.xml' rel='alternate' type='text/xml+oembed'>
</head> </head>
<body></body> <body></body>
</html> </html>

8
spec/fixtures/requests/oembed_xml.html vendored
View File

@ -1,7 +1,13 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<link href='https://host/provider.xml' rel='alternate' type='application/xml+oembed'> <!--
oEmbed
https://oembed.com/
> The type attribute must contain either application/json+oembed for JSON
> responses, or text/xml+oembed for XML.
-->
<link href='https://host/provider.xml' rel='alternate' type='text/xml+oembed'>
</head> </head>
<body></body> <body></body>
</html> </html>