Merge branch 'master' of https://github.com/gabek/owncast
This commit is contained in:
@@ -8,9 +8,9 @@
|
||||
<link href="https://unpkg.com/tailwindcss@^1.0/dist/tailwind.min.css" rel="stylesheet" />
|
||||
<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
|
||||
|
||||
<link href="https://vjs.zencdn.net/7.8.2/video-js.css" rel="stylesheet">
|
||||
<link href="//unpkg.com/video.js@7.8.3/dist/video-js.css" rel="stylesheet">
|
||||
<link href="https://unpkg.com/@videojs/themes@1/dist/fantasy/index.css" rel="stylesheet" />
|
||||
<script src="//vjs.zencdn.net/7.8.2/video.js"></script>
|
||||
<script src="//unpkg.com/video.js@7.8.3/dist/video.js"></script>
|
||||
<script src="//unpkg.com/showdown/dist/showdown.min.js"></script>
|
||||
<script src="vendor/autolink.js"></script>
|
||||
<link href="./styles/layout.css" rel="stylesheet" />
|
||||
|
||||
@@ -47,13 +47,10 @@ async function setupApp() {
|
||||
const response = await fetch(pageContentFile);
|
||||
const descriptionMarkdown = await response.text()
|
||||
const descriptionHTML = new showdown.Converter().makeHtml(descriptionMarkdown);
|
||||
console.log(descriptionHTML)
|
||||
app.description = descriptionHTML;
|
||||
// Object.assign(this, configData);
|
||||
return this;
|
||||
} catch (error) {
|
||||
console.log(error);
|
||||
// No config file present. That's ok. It's not required.
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
4
webroot/static/content-example.md
Normal file
4
webroot/static/content-example.md
Normal file
@@ -0,0 +1,4 @@
|
||||
# Stream description and content can go here.
|
||||
|
||||
1. Edit `content.md` in markdown.
|
||||
1. And it'll go here.
|
||||
Reference in New Issue
Block a user