LogalDeveloper/owncast
0
Fork 0
Code Activity

fix: Use Kebab-Case, and resolve Merge Conflict

Browse Source
This commit is contained in:
Jannik Volkland
2020-10-07 08:42:46 +02:00
parent 4c02b6eea1
commit 813884ef21
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webroot/js/app.js
View File

@@ -3,7 +3,7 @@ import htm from 'https://unpkg.com/htm?module';
const html = htm.bind(h); const html = htm.bind(h);
import { OwncastPlayer } from './components/player.js'; import { OwncastPlayer } from './components/player.js';
import SocialIconsList from './components/socialIconsList.js'; import SocialIconsList from './components/social-icons-list.js';
import UsernameForm from './components/chat/username.js'; import UsernameForm from './components/chat/username.js';
import Chat from './components/chat/chat.js'; import Chat from './components/chat/chat.js';
import Websocket from './utils/websocket.js'; import Websocket from './utils/websocket.js';

6
webroot/js/components/socialIconsList.js → webroot/js/components/social-icons-list.js
View File

@@ -1,5 +1,5 @@
import { h, Component } from 'https://unpkg.com/preact?module'; import { h, Component } from '/js/web_modules/preact.js';
import htm from 'https://unpkg.com/htm?module'; import htm from '/js/web_modules/htm.js';
const html = htm.bind(h); const html = htm.bind(h);
import { SOCIAL_PLATFORMS } from '../utils/social.js'; import { SOCIAL_PLATFORMS } from '../utils/social.js';
@@ -60,4 +60,4 @@ export default function (props) {
<span class="follow-label text-xs font-bold mr-2 uppercase">Follow me:</span> <span class="follow-label text-xs font-bold mr-2 uppercase">Follow me:</span>
${list} ${list}
</ul>`; </ul>`;
} }