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

Conflicts: app/javascript/images/mastodon-drawer.png app/javascript/styles/mastodon/components.scss
7 years ago · f722fcb5a6
parent dde1db7efb 093af89c43
commit f722fcb5a6
8 changed files with 34 additions and 25 deletions
--- a/app/javascript/images/mastodon-getting-started.png
+++ b/app/javascript/images/mastodon-getting-started.png
--- a/app/javascript/images/wave-drawer.png
+++ b/app/javascript/images/wave-drawer.png
--- a/app/javascript/mastodon/features/compose/index.js
+++ b/app/javascript/mastodon/features/compose/index.js
@ -94,6 +94,7 @@ export default class Compose extends React.PureComponent {
          <div className='drawer__inner' onFocus={this.onFocus}>
            <NavigationContainer onClose={this.onBlur} />
            <ComposeFormContainer />
+            <div className='mastodon' />
          </div>

          <Motion defaultStyle={{ x: -100 }} style={{ x: spring(showSearch ? 0 : -100, { stiffness: 210, damping: 20 }) }}>
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@ -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' />
        </div>

-        <div className='getting-started__footer scrollable optionally-scrollable'>
        <div className='static-content getting-started'>
          <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>
@ -111,7 +110,6 @@ export default class GettingStarted extends ImmutablePureComponent {
            />
          </p>
        </div>
-        </div>
      </Column>
    );
  }
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -1758,7 +1758,7 @@
  position: absolute;
  top: 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;
  padding: 0;
  display: flex;
@ -1771,6 +1771,11 @@
  &.darker {
    background: $ui-base-color;
  }
+
+  > .mastodon {
+    background: url('../images/mastodon-drawer.png') no-repeat left bottom / contain;
+    flex: 1;
+  }
 }

 .pseudo-drawer {
@ -2072,15 +2077,8 @@
  overflow-y: auto;
 }

-.getting-started__footer {
-  display: flex;
-  flex-direction: column;
-}
-
 .getting-started {
-  box-sizing: border-box;
-  padding-bottom: 235px;
-  background: url('~images/mastodon-getting-started.png') no-repeat 0 100%;
+  background: $ui-base-color;
  flex: 1 0 auto;

  p {
--- a/app/lib/provider_discovery.rb
+++ b/app/lib/provider_discovery.rb
@ -29,7 +29,7 @@ class ProviderDiscovery < OEmbed::ProviderDiscovery
      end

      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
      end

--- a/spec/fixtures/requests/oembed_json_xml.html
+++ b/spec/fixtures/requests/oembed_json_xml.html
@ -1,8 +1,14 @@
 <!DOCTYPE html>
 <html>
  <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.xml' rel='alternate' type='application/xml+oembed'>
+    <link href='https://host/provider.xml' rel='alternate' type='text/xml+oembed'>
  </head>
  <body></body>
 </html>
--- a/spec/fixtures/requests/oembed_xml.html
+++ b/spec/fixtures/requests/oembed_xml.html
@ -1,7 +1,13 @@
 <!DOCTYPE html>
 <html>
  <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>
  <body></body>
 </html>