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

Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss
2018-01-19 15:22:10 -06:00
parent 2b2de41bc7 0b888acfd4
commit 2ca965c704
90 changed files with 375 additions and 496 deletions
--- a/app/javascript/images/elephant-friend-1.png
+++ b/app/javascript/images/elephant-friend-1.png
--- a/app/javascript/images/elephant_ui_plane.svg
+++ b/app/javascript/images/elephant_ui_plane.svg
--- a/app/javascript/images/icon_done.svg
+++ b/app/javascript/images/icon_done.svg
@ -0,0 +1,4 @@
+<svg fill="#FFFFFF" height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
+    <path d="M0 0h24v24H0z" fill="none"/>
+    <path d="M9 16.2L4.8 12l-1.4 1.4L9 19 21 7l-1.4-1.4L9 16.2z"/>
+</svg>
--- a/app/javascript/images/mastodon-ui.png
+++ b/app/javascript/images/mastodon-ui.png
--- a/app/javascript/images/wave-compose-standalone.png
+++ b/app/javascript/images/wave-compose-standalone.png
--- a/app/javascript/images/wave-drawer.png
+++ b/app/javascript/images/wave-drawer.png
--- a/app/javascript/images/wave-modal.png
+++ b/app/javascript/images/wave-modal.png