diff --git a/test/automated/browser/cypress/e2e/offline/01_offline_basic.cy.js b/test/automated/browser/cypress/e2e/offline/01_offline_basic.cy.js index 202054f5e..dc69b8a96 100644 --- a/test/automated/browser/cypress/e2e/offline/01_offline_basic.cy.js +++ b/test/automated/browser/cypress/e2e/offline/01_offline_basic.cy.js @@ -15,8 +15,8 @@ describe(`Basic tests`, () => { // Verify the tags show up it('Has correct tags visible', () => { - cy.contains('#owncast').should('be.visible'); - cy.contains('#streaming').should('be.visible'); + cy.contains('#owncast').should('exist'); + cy.contains('#streaming').should('exist'); }); // it('Can open notify modal', () => { diff --git a/web/components/chat/ChatContainer/ChatContainer.module.scss b/web/components/chat/ChatContainer/ChatContainer.module.scss index d3437f6c0..484e4f85f 100644 --- a/web/components/chat/ChatContainer/ChatContainer.module.scss +++ b/web/components/chat/ChatContainer/ChatContainer.module.scss @@ -1,3 +1,5 @@ +@import '../../../styles/mixins.scss'; + // The button that is displayed to scroll to the bottom of the chat. .toBottomWrap { display: flex; diff --git a/web/components/layouts/Main/Main.module.scss b/web/components/layouts/Main/Main.module.scss index 768e2f623..f1f59a9a4 100644 --- a/web/components/layouts/Main/Main.module.scss +++ b/web/components/layouts/Main/Main.module.scss @@ -1,11 +1,16 @@ @import '../../../styles/mixins.scss'; .layout { + // this margin is for fixed header + margin-top: 55px; @include screen(tablet) { position: absolute; top: 0; left: 0; bottom: 0; right: 0; + // this one is for fixed footer + margin-bottom: 30px } + } diff --git a/web/components/layouts/Main/Main.tsx b/web/components/layouts/Main/Main.tsx index e2915843a..7875901d1 100644 --- a/web/components/layouts/Main/Main.tsx +++ b/web/components/layouts/Main/Main.tsx @@ -8,6 +8,7 @@ import { Layout } from 'antd'; import dynamic from 'next/dynamic'; import Script from 'next/script'; import { ErrorBoundary } from 'react-error-boundary'; +import { Footer } from '../../ui/Footer/Footer'; import { ClientConfigStore, isChatAvailableSelector, @@ -30,12 +31,6 @@ import { AppStateOptions } from '../../stores/application-state'; import { Noscript } from '../../ui/Noscript/Noscript'; import { ServerStatus } from '../../../interfaces/server-status.model'; -const lockBodyStyle = ` -body { - overflow: hidden; -} -`; - // Lazy loaded components const FatalErrorStateModal = dynamic( @@ -51,13 +46,13 @@ const FatalErrorStateModal = dynamic( export const Main: FC = () => { const clientConfig = useRecoilValue(clientConfigStateAtom); const clientStatus = useRecoilValue(serverStatusState); - const { name, customStyles } = clientConfig; + const { name } = clientConfig; const isChatAvailable = useRecoilValue(isChatAvailableSelector); const fatalError = useRecoilValue(fatalErrorStateAtom); const appState = useRecoilValue(appStateAtom); const layoutRef = useRef(null); - const { chatDisabled } = clientConfig; + const { chatDisabled, version } = clientConfig; const { videoAvailable } = appState; const { online, streamTitle } = clientStatus; @@ -96,11 +91,6 @@ export const Main: FC = () => { - - @@ -168,6 +158,7 @@ export const Main: FC = () => { {fatalError && ( )} +