From d8a0c1916676fc1fa5e0eb0739a79a8fae9d40d0 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Wed, 27 Dec 2017 11:29:49 +0900 Subject: [PATCH 1/2] Fix XML oEmbed support discovery (#6104) --- app/lib/provider_discovery.rb | 2 +- spec/fixtures/requests/oembed_json_xml.html | 8 +++++++- spec/fixtures/requests/oembed_xml.html | 8 +++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/lib/provider_discovery.rb b/app/lib/provider_discovery.rb index 04ba381010..5732e4fcb4 100644 --- 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 diff --git a/spec/fixtures/requests/oembed_json_xml.html b/spec/fixtures/requests/oembed_json_xml.html index b5fc9bed09..8afd8e9972 100644 --- a/spec/fixtures/requests/oembed_json_xml.html +++ b/spec/fixtures/requests/oembed_json_xml.html @@ -1,8 +1,14 @@ + - + diff --git a/spec/fixtures/requests/oembed_xml.html b/spec/fixtures/requests/oembed_xml.html index 5d7633e713..bdfcca1707 100644 --- a/spec/fixtures/requests/oembed_xml.html +++ b/spec/fixtures/requests/oembed_xml.html @@ -1,7 +1,13 @@ - + + From 093af89c4365608cfbdede92d65fa8ccd79430be Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Wed, 27 Dec 2017 11:31:30 +0900 Subject: [PATCH 2/2] Move the mastodon on Getting Started column to drawer column (#6109) Getting Started column obtained many links, and it became much taller. Because of its height, Getting Started column required long scrolling on devices with small screen, such as 4 inch phones and 10 inch laptops. This change moves the mastodon which took large space on the column to drawer column. The drawer column has only the compose form and has more space. --- ...etting-started.png => mastodon-drawer.png} | Bin 34539 -> 32449 bytes app/javascript/images/wave-drawer.png | Bin 0 -> 3269 bytes .../mastodon/features/compose/index.js | 1 + .../features/getting_started/index.js | 24 ++++++++---------- .../styles/mastodon/components.scss | 16 +++++------- 5 files changed, 19 insertions(+), 22 deletions(-) rename app/javascript/images/{mastodon-getting-started.png => mastodon-drawer.png} (56%) create mode 100644 app/javascript/images/wave-drawer.png diff --git a/app/javascript/images/mastodon-getting-started.png b/app/javascript/images/mastodon-drawer.png similarity index 56% rename from app/javascript/images/mastodon-getting-started.png rename to app/javascript/images/mastodon-drawer.png index e05dd493fe806f3aeda546b18080a9575b10aed7..a1fb642a003b2e2b652b1e6022a84f08dc76105f 100644 GIT binary patch delta 12951 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 diff --git a/app/javascript/images/wave-drawer.png b/app/javascript/images/wave-drawer.png new file mode 100644 index 0000000000000000000000000000000000000000..ca9f9e1d85d222e7bf80649c55783db928cc79d4 GIT binary patch literal 3269 zcmV;$3_A0PP)001ut1^@s6g=d3U000U7X+uL$Nkc;* zaB^>EX>4Tx07!|ImUmPXSsKM(Rp&%%Xfiah$vGp?EXLrxe*|WFK_v&}P^Ui(m)%&9^03-)i za&jUp1V9oujpyrZM-L7OrQ@Ce67q-u9MEL3Q3mz zB+Q9QWg|A;2uE^K*+~eWMOcHK%u7R<<8*%wq9k03b#neR>8v2Js>0BCN;d#BmWmg|Ia{mc>DM0b#AAq|FGEWDr)1 z{1=~?fAfs|=E-8keB-sVd==h5Dm5*NuK$02j{mKs#PmPcSpDkcC~kls@)kf!2Ka+0 zkP6a}kq(fh)1tD{RwvqTPTs>}-;JEv?ysKOApnGE09?P$PUmH;^;WM7U;q&a0#P6d;wg%2n4*SC!;TSjt z&W7{hy>JCw2cLjD;4APgcns#lFW^NKK#@>1lmbc{Wrngxd7(m4(I_5jJE{;>j;ceo zqPkK2s5>Y=Y993gjYU(@bhI|w677NxK(o;)=nxirdsz0W?7SRJjwu%}S0;B!Zcd&mZ!I4uUnYN9 z{yANYZc9(3SJ3>SGXkoO>wYXY!S`*r2ZCmXO?H27x9h#1ZPM%Ju z&P!co-B8{Ay8XIe^o;cq^^WU3)ECir)6diI)_-lFVZb)1GPr9!z#}tyosIR(xx^b%gbg)_fZU8$Fpm_V!QC3ld$!)gVYPUn%Be(bNP}-5dV>;J4w{a(NXTr{3^7Qgb z^WN?X+SQ#eo1dFM^_}x~Ed>Gvyn>0{mb+`dM}Hsp{m>r6J%{&vDdZI1EYd3~FZxu> zF24DL{tp#Dtn7{6J5*v)a&#YdA9vsQew+P`rNX7zrBeqy4|J5#%L>ch9t=M?P;OLS zbBK5-{Sd#xqoV7u^5K1lKUKz7j#b%JwN=Yh@2Oro!Z|W}lzFtZMz*G?=HriXKi;c# zuI;E(tt&rR{Xd!g)Ko83UsV6Of!n}u^lj{GGHq&VmT4|&fm_mB=1zp2 z7(VH6va40QwYH7cR&)xSNUL^-VF%Q)rDLHpwv*o# z(lv6X&LS&;G&uV{jpOVfq#C)ynJQH1b@ z$@h&P%s%vg4Ei{;ocRg&sp7Nx=k71=UmmR_t*j)oc&x8c0EHAB9Sy+i1^_4_08odK z{2;KF$NtPR(^}tB&EN1^X8S4=0BUmq2w?&cgj5YujMW&_1AsTe{!9R;D}JkgDmB{B zV9krviA0m~m6bO^0N~UC_&l+)vfR0{^0^+_>;nLL-mT@pRmmZlGpO+#zSV*mgGgGod|RCwC$+)HlUKn#T8w2+f{J5XdXm-p z{^bB86)CdVtN9tshCNPSPr(2!; zPixn@{!aH1T7NR0b1%}%>)SiC%xH#6<4L>@Y34rViqZtWR(FD#C)LE(2Cj}FP489x zx0t~9jOnwU?m2%(U-uk$uah*rYtFw{rwMEVTa`5&j9167M{iZWw`ks~btE@L;)SYi z^Rbl{it)SJ(Ts}h@L5-G<`G@7bD zNxFAC+ikFMVgj4M6?!XwQQvy*^hfDD zMz>w-IQ##zCh)vkx9aWEJkM(H+U#p`Um3&N8mZ3rS9-^@qLLdTP5)N2OwilSbpEA1 zVKwwj?voZPU5DscBg_OgfwyYzY&svcC;ph3V)kh@@=@ +
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js index 11fb6d3651..2f02f245f8 100644 --- a/app/javascript/mastodon/features/getting_started/index.js +++ b/app/javascript/mastodon/features/getting_started/index.js @@ -98,19 +98,17 @@ export default class GettingStarted extends ImmutablePureComponent { -
-
-

- -

-

- tootsuite/mastodon }} - /> -

-
+
+

+ +

+

+ tootsuite/mastodon }} + /> +

); diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 63664d6074..3240b38a42 100644 --- 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 {