merged master

This commit is contained in:
mrfry 2021-03-05 18:38:26 +01:00
parent 98fc6ba9ca
commit f7d737c6dc
5 changed files with 7 additions and 36 deletions

View file

@ -20,11 +20,12 @@
} }
.new { .new {
padding: 10px;
text-align: center; text-align: center;
border: 2px dashed var(--text-color); background-color: #191919;
border-radius: 3px; border-radius: 3px;
cursor: pointer; cursor: pointer;
margin: 8px;
padding: 8px;
} }
.new:hover { .new:hover {

View file

@ -60,8 +60,6 @@ export default function NewsEntry({
onDelete={onDelete} onDelete={onDelete}
comments={comments} comments={comments}
/> />
<hr />
<hr />
</div> </div>
) )
} }

View file

@ -1,6 +1,5 @@
.newsBody { .newsBody {
margin: 0px 5px; margin: 0px 5px;
font-size: 18px;
color: #fff; color: #fff;
} }
@ -41,4 +40,6 @@
.newsRoot { .newsRoot {
background-color: #191919; background-color: #191919;
margin: 8px;
padding: 8px;
} }

View file

@ -3,7 +3,7 @@
--primary-color: #9999ff; --primary-color: #9999ff;
--bright-color: #f2f2f2; --bright-color: #f2f2f2;
--background-color: #222426; --background-color: #222426;
--hoover-color: #191919; --hoover-color: #393939;
} }
@import url('https://fonts.googleapis.com/css2?family=Kameron&family=Overpass+Mono:wght@300;400&display=swap'); @import url('https://fonts.googleapis.com/css2?family=Kameron&family=Overpass+Mono:wght@300;400&display=swap');

View file

@ -242,9 +242,7 @@ export default function Index({ globalData }) {
return ( return (
<div> <div>
<div className={styles.title}>Hírek</div> <div className={styles.title}>Fórum</div>
<hr />
<div className={styles.title}>Forum</div>
<hr /> <hr />
<Composer <Composer
onSubmit={(type, title, content, file) => { onSubmit={(type, title, content, file) => {
@ -269,7 +267,6 @@ export default function Index({ globalData }) {
} }
}} }}
/> />
<hr />
<div>{newsItems}</div> <div>{newsItems}</div>
</div> </div>
) )
@ -282,7 +279,6 @@ export default function Index({ globalData }) {
return ( return (
<div className={styles.motd_body}> <div className={styles.motd_body}>
<div className={styles.title}>MOTD</div> <div className={styles.title}>MOTD</div>
<hr />
{motd ? ( {motd ? (
<div <div
className={styles.motd} className={styles.motd}
@ -295,23 +291,6 @@ export default function Index({ globalData }) {
) )
} }
// const renderUserSpecificMotd = () => {
// return (
// <div>
// <hr />
// <div className={styles.subtitle}>Üzenet admintól:</div>
// {userSpecificMotd ? (
// <div
// className={styles.motd}
// dangerouslySetInnerHTML={{ __html: userSpecificMotd.msg }}
// />
// ) : (
// <div>...</div>
// )}
// </div>
// )
// }
const renderDbSelector = () => { const renderDbSelector = () => {
if (allQrSelector) { if (allQrSelector) {
return ( return (
@ -366,14 +345,6 @@ export default function Index({ globalData }) {
> >
{'Összes kérdés TXT'} {'Összes kérdés TXT'}
</a> </a>
<a
onClick={() => {
setAllQrSelector('json')
}}
className={styles.button}
>
{'Összes kérdés JSON'}
</a>
</div> </div>
{renderMotd()} {renderMotd()}
{/*{userSpecificMotd && renderUserSpecificMotd()} */} {/*{userSpecificMotd && renderUserSpecificMotd()} */}