Mirroristas/owncast
2
0
Fork 0
mirror of https://github.com/owncast/owncast.git synced 2024-10-10 19:16:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): restore page margin and background color. Closes #2959

Browse Source
This commit is contained in:
Gabe Kangas 2023-04-26 21:24:26 -07:00
parent 12d321b097
commit 97fb5a80d0
No known key found for this signature in database
GPG Key ID: 4345B2060657F330
5 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/components/common/ContentHeader/ContentHeader.module.scss
View File

@ -6,8 +6,8 @@ $vert-spacing: 0.75rem;
position: relative; position: relative;
display: grid; display: grid;
padding: var(--content-padding); padding: var(--content-padding);
padding-left: calc(var(--content-padding) * 2); padding-left: var(--content-padding);
padding-right: calc(var(--content-padding) * 2); padding-right: var(--content-padding);
} }
.row { .row {

4
web/components/layouts/Main/Main.module.scss
View File

@ -3,6 +3,7 @@
.layout { .layout {
// this margin is for fixed header // this margin is for fixed header
margin-top: 55px; margin-top: 55px;
background-color: var(--theme-color-main-background);
@include screen(tablet) { @include screen(tablet) {
position: absolute; position: absolute;
top: 0; top: 0;
@ -10,7 +11,6 @@
bottom: 0; bottom: 0;
right: 0; right: 0;
// this one is for fixed footer // this one is for fixed footer
margin-bottom: 30px margin-bottom: 30px;
} }
} }

3
web/components/ui/Content/Content.tsx
View File

@ -21,6 +21,7 @@ import {
import { ClientConfig } from '../../../interfaces/client-config.model'; import { ClientConfig } from '../../../interfaces/client-config.model';
import styles from './Content.module.scss'; import styles from './Content.module.scss';
import desktopStyles from './DesktopContent.module.scss';
import { Sidebar } from '../Sidebar/Sidebar'; import { Sidebar } from '../Sidebar/Sidebar';
import { OfflineBanner } from '../OfflineBanner/OfflineBanner'; import { OfflineBanner } from '../OfflineBanner/OfflineBanner';
import { AppStateOptions } from '../../stores/application-state'; import { AppStateOptions } from '../../stores/application-state';
@ -271,6 +272,7 @@ export const Content: FC = () => {
/> />
) : ( ) : (
<Col span={24} style={{ paddingRight: dynamicPadding }}> <Col span={24} style={{ paddingRight: dynamicPadding }}>
<div className={desktopStyles.bottomSectionContent}>
<DesktopContent <DesktopContent
name={name} name={name}
summary={summary} summary={summary}
@ -280,6 +282,7 @@ export const Content: FC = () => {
setShowFollowModal={setShowFollowModal} setShowFollowModal={setShowFollowModal}
supportFediverseFeatures={supportFediverseFeatures} supportFediverseFeatures={supportFediverseFeatures}
/> />
</div>
</Col> </Col>
)} )}
</Row> </Row>

7
web/components/ui/Content/DesktopContent.module.scss Normal file
View File

@ -0,0 +1,7 @@
$bottomMargin: 4vh;
.bottomSectionContent {
// background-color: green;
width: calc(100% - (2 * $bottomMargin));
margin: 0 $bottomMargin 0 $bottomMargin;
}

4
web/components/ui/Content/MobileContent.module.scss
View File

@ -9,3 +9,7 @@
position: relative; position: relative;
top: 0px; top: 0px;
} }
.mobileTabs {
margin-bottom: 0px;
}