mirror of
https://github.com/owncast/owncast.git
synced 2024-11-28 19:19:06 +03:00
Clean up some styles and fix mobile rendering
This commit is contained in:
parent
02de9cf6df
commit
20ea5d051f
8 changed files with 17 additions and 70 deletions
|
@ -17,6 +17,7 @@ import {
|
||||||
ExperimentOutlined,
|
ExperimentOutlined,
|
||||||
EditOutlined,
|
EditOutlined,
|
||||||
} from '@ant-design/icons';
|
} from '@ant-design/icons';
|
||||||
|
|
||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
import { upgradeVersionAvailable } from '../utils/apis';
|
import { upgradeVersionAvailable } from '../utils/apis';
|
||||||
import { parseSecondsToDurationString } from '../utils/format';
|
import { parseSecondsToDurationString } from '../utils/format';
|
||||||
|
|
|
@ -4,11 +4,6 @@
|
||||||
padding: 20px;
|
padding: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.buttonsLogoTitleSection {
|
|
||||||
// margin-left: 1.5vw;
|
|
||||||
// margin-right: 1.5vw;
|
|
||||||
}
|
|
||||||
|
|
||||||
.row {
|
.row {
|
||||||
margin-bottom: 7px;
|
margin-bottom: 7px;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
.root {
|
.root {
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: 1fr auto;
|
grid-template-columns: 1fr auto;
|
||||||
|
height: 100%;
|
||||||
background-color: var(--theme-color-background-main);
|
background-color: var(--theme-color-background-main);
|
||||||
|
|
||||||
.topSection {
|
.topSection {
|
||||||
|
@ -25,26 +25,3 @@
|
||||||
top: 50%;
|
top: 50%;
|
||||||
z-index: 999999;
|
z-index: 999999;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mobile {
|
|
||||||
&.root {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
height: calc(100vh - 64px);
|
|
||||||
overflow: hidden;
|
|
||||||
.topSection {
|
|
||||||
display: grid;
|
|
||||||
grid-template-rows: 30vh 5vh 5vh;
|
|
||||||
height: 40vh;
|
|
||||||
}
|
|
||||||
.lowerSection {
|
|
||||||
height: 60vh;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
.mobileChat {
|
|
||||||
position: relative;
|
|
||||||
display: block;
|
|
||||||
height: 100%;
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,15 +1,10 @@
|
||||||
/* eslint-disable react/no-danger */
|
|
||||||
import { useRecoilState, useRecoilValue } from 'recoil';
|
import { useRecoilState, useRecoilValue } from 'recoil';
|
||||||
import { Layout, Tabs, Spin } from 'antd';
|
import { Layout, Tabs, Spin } from 'antd';
|
||||||
import { FC, useEffect, useState } from 'react';
|
import { FC, useEffect, useState } from 'react';
|
||||||
import cn from 'classnames';
|
|
||||||
import { LOCAL_STORAGE_KEYS, getLocalStorage, setLocalStorage } from '../../../utils/localStorage';
|
import { LOCAL_STORAGE_KEYS, getLocalStorage, setLocalStorage } from '../../../utils/localStorage';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
clientConfigStateAtom,
|
clientConfigStateAtom,
|
||||||
// chatMessagesAtom,
|
|
||||||
// chatDisplayNameAtom,
|
|
||||||
// chatUserIdAtom,
|
|
||||||
isChatVisibleSelector,
|
isChatVisibleSelector,
|
||||||
appStateAtom,
|
appStateAtom,
|
||||||
isOnlineSelector,
|
isOnlineSelector,
|
||||||
|
@ -23,9 +18,7 @@ import { FollowerCollection } from '../followers/FollowerCollection/FollowerColl
|
||||||
import styles from './Content.module.scss';
|
import styles from './Content.module.scss';
|
||||||
import { Sidebar } from '../Sidebar/Sidebar';
|
import { Sidebar } from '../Sidebar/Sidebar';
|
||||||
import { Footer } from '../Footer/Footer';
|
import { Footer } from '../Footer/Footer';
|
||||||
// import ChatContainer from '../../chat/ChatContainer';
|
|
||||||
// import { ChatMessage } from '../../../interfaces/chat-message.model';
|
|
||||||
// import ChatTextField from '../../chat/ChatTextField/ChatTextField';
|
|
||||||
import { ActionButtonRow } from '../../action-buttons/ActionButtonRow/ActionButtonRow';
|
import { ActionButtonRow } from '../../action-buttons/ActionButtonRow/ActionButtonRow';
|
||||||
import { ActionButton } from '../../action-buttons/ActionButton/ActionButton';
|
import { ActionButton } from '../../action-buttons/ActionButton/ActionButton';
|
||||||
import { NotifyReminderPopup } from '../NotifyReminderPopup/NotifyReminderPopup';
|
import { NotifyReminderPopup } from '../NotifyReminderPopup/NotifyReminderPopup';
|
||||||
|
@ -105,13 +98,9 @@ export const Content: FC = () => {
|
||||||
window.addEventListener('resize', checkIfMobile);
|
window.addEventListener('resize', checkIfMobile);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const rootClassName = cn(styles.root, {
|
|
||||||
[styles.mobile]: isMobile,
|
|
||||||
});
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<AntContent className={rootClassName}>
|
<AntContent className={styles.root}>
|
||||||
<div className={styles.leftContent}>
|
<div className={styles.leftContent}>
|
||||||
<Spin className={styles.loadingSpinner} size="large" spinning={appState.appLoading} />
|
<Spin className={styles.loadingSpinner} size="large" spinning={appState.appLoading} />
|
||||||
|
|
||||||
|
@ -168,26 +157,11 @@ export const Content: FC = () => {
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className={styles.lowerSection}>
|
<div className={styles.lowerSection}>
|
||||||
<Tabs defaultActiveKey="0" style={{ height: '100%' }}>
|
<Tabs defaultActiveKey="0">
|
||||||
{isChatVisible && isMobile && (
|
<TabPane tab="About" key="2">
|
||||||
<TabPane tab="Chat" key="0" style={{ height: '100%' }}>
|
|
||||||
{/* <div style={{ position: 'relative', height: '100%' }}>
|
|
||||||
<div className={s.mobileChat}>
|
|
||||||
<ChatContainer
|
|
||||||
messages={messages}
|
|
||||||
// loading={appState.chatLoading}
|
|
||||||
usernameToHighlight={chatDisplayName}
|
|
||||||
chatUserId={chatUserId}
|
|
||||||
isModerator={false}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div> */}
|
|
||||||
</TabPane>
|
|
||||||
)}
|
|
||||||
<TabPane tab="About" key="2" className={styles.pageContentSection}>
|
|
||||||
<CustomPageContent content={extraPageContent} />
|
<CustomPageContent content={extraPageContent} />
|
||||||
</TabPane>
|
</TabPane>
|
||||||
<TabPane tab="Followers" key="3" className={styles.pageContentSection}>
|
<TabPane tab="Followers" key="3">
|
||||||
<FollowerCollection />
|
<FollowerCollection />
|
||||||
</TabPane>
|
</TabPane>
|
||||||
</Tabs>
|
</Tabs>
|
||||||
|
@ -195,7 +169,7 @@ export const Content: FC = () => {
|
||||||
</div>
|
</div>
|
||||||
{isChatVisible && !isMobile && <Sidebar />}
|
{isChatVisible && !isMobile && <Sidebar />}
|
||||||
</AntContent>
|
</AntContent>
|
||||||
{!isMobile && <Footer version={version} />}
|
<Footer version={version} />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
|
@ -11,8 +11,9 @@
|
||||||
padding: 0;
|
padding: 0;
|
||||||
color: var(--theme-color-palette-0);
|
color: var(--theme-color-palette-0);
|
||||||
background-color: var(--theme-color-palette-4);
|
background-color: var(--theme-color-palette-4);
|
||||||
padding: calc(3 * var(--content-padding));
|
padding: calc(2 * var(--content-padding));
|
||||||
border-radius: var(--theme-rounded-corners);
|
border-radius: var(--theme-rounded-corners);
|
||||||
|
width: clamp(300px, 80%, 900px);
|
||||||
|
|
||||||
// Allow the content to fill the width on narrow screens.
|
// Allow the content to fill the width on narrow screens.
|
||||||
@media only screen and (max-width: 768px) {
|
@media only screen and (max-width: 768px) {
|
||||||
|
@ -28,4 +29,8 @@
|
||||||
div.summary {
|
div.summary {
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
p {
|
||||||
|
margin: unset;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
border-top: 1px solid rgba(214, 211, 211, 0.5);
|
border-top: 1px solid rgba(214, 211, 211, 0.5);
|
||||||
|
|
||||||
@media (max-width: 768px) {
|
@media (max-width: 600px) {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.innerContainer {
|
.innerContainer {
|
||||||
width: clamp(200px, 100%, 300px);
|
width: clamp(00px, 100%, 600px);
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
color: var(--theme-color-components-text-on-light);
|
color: var(--theme-color-components-text-on-light);
|
||||||
|
@ -12,6 +12,7 @@
|
||||||
margin: 1rem auto;
|
margin: 1rem auto;
|
||||||
border-radius: var(--theme-rounded-corners);
|
border-radius: var(--theme-rounded-corners);
|
||||||
padding: 1rem;
|
padding: 1rem;
|
||||||
|
font-size: 1.2rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.header {
|
.header {
|
||||||
|
|
|
@ -95,12 +95,6 @@ body {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (max-width: 768px) {
|
|
||||||
body {
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.emoji {
|
.emoji {
|
||||||
height: 30px;
|
height: 30px;
|
||||||
margin-left: 5px;
|
margin-left: 5px;
|
||||||
|
|
Loading…
Reference in a new issue