Skip to content

Commit 1d30c2f

Browse files
authored
Merge pull request #402 from hackergarten/Issue_365_improve_mastodon_widget
replace mastodon widget with new script
2 parents 8eb363e + ea64ae5 commit 1d30c2f

File tree

5 files changed

+795
-667
lines changed

5 files changed

+795
-667
lines changed

css/mastodon-timeline.min.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/mastodon.widget.css

Lines changed: 0 additions & 264 deletions
This file was deleted.

index.html

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<link href="css/main.css" rel="stylesheet">
2828

2929
<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
30-
<link href="css/mastodon.widget.css" rel="stylesheet">
30+
<link href="css/mastodon-timeline.min.css" rel="stylesheet">
3131

3232
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
3333
<!--[if lt IE 9]>
@@ -155,23 +155,19 @@
155155
<li><a href="feed.xml">Hackergarten Events RSS Feed</a></li>
156156
<li><a href="http://github.com/hackergarten">Public Git Repository</a><br>
157157
<li><a href="https://fosstodon.org/@hackergarten">@Hackergarten on Mastodon</a></li>
158-
<li><a href="http://www.twitter.com/Hackergarten">@Hackergarten on Twitter</a></li>
159158
<li><a href="https://gitter.im/hackergarten?utm_source=share-link&utm_medium=link&utm_campaign=share-link">Gitter</a></li>
160159
<li>Slack: <a href="https://forms.gle/93guiZ3rXtW4azdo6">request invitation</a> and/or <a href="https://hackergarten.slack.com/">enter workspace</a></li>
161160
</ul>
162161
</div>
163162
</div>
164163

165164
<div class="panel panel-default">
166-
<div class="panel-heading">Mastodon</div>
167-
<div class="mastodon-timeline mastodon-timeline-light" id="mastodon-timeline"></div>
168-
</div>
169-
170-
<div class="panel panel-default">
171-
<div class="panel-heading">Twitter</div>
172-
<div class="panel-body">
173-
<a class="twitter-timeline" data-width="500" data-height="500" data-dnt="true" data-link-color="#428bca" href="https://twitter.com/Hackergarten?ref_src=twsrc%5Etfw">Tweets by Hackergarten</a> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
165+
<div class="panel-heading">#Hackergarten on fosstodon.org Mastodon Instance</div>
166+
<div class="mt-timeline">
167+
<div id="mt-body" class="mt-body" role="feed">
168+
<div class="loading-spinner"></div>
174169
</div>
170+
</div>
175171
</div>
176172

177173
<div class="panel panel-default">
@@ -275,17 +271,7 @@ <h4><strong>Hack {{ngDialogData.title}}.</strong></h4>
275271
<script src="scripts/github.js"></script>
276272
<script src="scripts/locations.js"></script>
277273

278-
<script src="scripts/mastodon.widget.js"></script>
279-
<script>
280-
document.addEventListener("DOMContentLoaded", function() {
281-
var mapi = new MastodonApi({
282-
target_selector: '#mastodon-timeline',
283-
pic_icon : '<i class="fa fa-picture-o"></i>',
284-
boosts_count_icon : '<i class="fa fa-retweet"></i>',
285-
favourites_count_icon : '<i class="fa fa-star"></i>'
286-
});
287-
});
288-
</script>
274+
<script src="scripts/mastodon-timeline.js"></script>
289275

290276
<script>
291277
function checkLicense() {

0 commit comments

Comments
 (0)