summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-03-31 19:33:17 +0000
committerlambda <pleromagit@rogerbraun.net>2018-03-31 19:33:17 +0000
commit5fa8237bc1dcabca050dc5d8d9325fec649e1723 (patch)
treecac60d44906c1f478d70d5897437656d540f75b9 /lib
parent86525e3a345d79b3ab3dcece72e6f6bc8f7af961 (diff)
parent7f2174d81160b1e61b2a69b008575df3b2475f4b (diff)
downloadpleroma-5fa8237bc1dcabca050dc5d8d9325fec649e1723.tar.gz
pleroma-5fa8237bc1dcabca050dc5d8d9325fec649e1723.zip
Merge branch 'new-mastofe' into 'develop'
Bring Mastodon frontend up-to-date See merge request pleroma/pleroma!87
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/templates/mastodon_api/mastodon/index.html.eex7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/pleroma/web/templates/mastodon_api/mastodon/index.html.eex b/lib/pleroma/web/templates/mastodon_api/mastodon/index.html.eex
index f96b15d64..6a00b9e2c 100644
--- a/lib/pleroma/web/templates/mastodon_api/mastodon/index.html.eex
+++ b/lib/pleroma/web/templates/mastodon_api/mastodon/index.html.eex
@@ -9,14 +9,17 @@
<link rel="icon" type="image/png" href="/favicon.png"/>
<link rel="stylesheet" media="all" href="/packs/common.css" />
<link rel="stylesheet" media="all" href="/packs/default.css" />
-<link rel="stylesheet" media="all" href="/packs/pl-dark-masto-fe.css" />
<script src="/packs/common.js"></script>
<script src="/packs/locale_en.js"></script>
+<link as='script' crossorigin='anonymous' href='/packs/features/getting_started.js' rel='preload'>
+<link as='script' crossorigin='anonymous' href='/packs/features/compose.js' rel='preload'>
+<link as='script' crossorigin='anonymous' href='/packs/features/home_timeline.js' rel='preload'>
+<link as='script' crossorigin='anonymous' href='/packs/features/notifications.js' rel='preload'>
<script id='initial-state' type='application/json'><%= raw @initial_state %></script>
<script src="/packs/application.js"></script>
</head>
-<body class='app-body'>
+<body class='app-body no-reduce-motion'>
<div class='app-holder' data-props='{&quot;locale&quot;:&quot;en&quot;}' id='mastodon'>
</div>
</body>