Skip to content

Commit 42d7466

Browse files
committed
save7
1 parent acec7c8 commit 42d7466

4 files changed

Lines changed: 13 additions & 5 deletions

File tree

src/frontend/apps/impress/src/features/docs/doc-header/components/FloatingBar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export const FloatingBar = () => {
2323
const sm = spacingsTokens['sm'];
2424
return css`
2525
position: sticky;
26-
top: calc(-${base});
26+
top: 0;
2727
left: 0;
2828
right: 0;
2929
width: calc(100% + ${base} + ${base});

src/frontend/apps/impress/src/features/right-panel/components/RightPanel.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { css } from 'styled-components';
44
import { Box } from '@/components';
55
import { CommentSideBar } from '@/features/docs/doc-editor/components/comments/CommentSideBar';
66
import { useDocStore } from '@/features/docs/doc-management';
7+
import { HEADER_HEIGHT } from '@/features/header';
78

89
import { useRightPanelStore } from './useRightPanelStore';
910

@@ -22,6 +23,7 @@ export const RightPanel = () => {
2223
aria-label={t('Right panel')}
2324
aria-hidden={!isPanelOpen}
2425
$width="300px"
26+
$minHeight={`calc(100dvh - ${HEADER_HEIGHT}px)`}
2527
$position="sticky"
2628
$hasTransition="slow"
2729
$background="var(--c--contextuals--background--surface--secondary)"

src/frontend/apps/impress/src/layouts/MainLayout.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,7 @@ const MainContent = ({
114114
$width="100%"
115115
$height={`calc(100dvh - ${HEADER_HEIGHT}px)`}
116116
$position="relative"
117-
$padding={{
118-
all: isDesktop ? 'base' : '0',
119-
}}
117+
$padding={isDesktop ? 'base' : '0'}
120118
$background={
121119
currentBackgroundColor === 'white'
122120
? 'var(--c--contextuals--background--surface--primary)'

src/frontend/apps/impress/src/pages/docs/[id]/index.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import Head from 'next/head';
55
import { useRouter } from 'next/router';
66
import { useEffect, useState } from 'react';
77
import { useTranslation } from 'react-i18next';
8+
import { createGlobalStyle } from 'styled-components';
89

910
import { Box, Loading } from '@/components';
1011
import { DEFAULT_QUERY_RETRY } from '@/core';
@@ -33,6 +34,12 @@ const DocEditor = dynamic(
3334
},
3435
);
3536

37+
const DocLayoutGlobalStyle = createGlobalStyle`
38+
#${MAIN_LAYOUT_ID} {
39+
padding: 0;
40+
}
41+
`;
42+
3643
export function DocLayout() {
3744
const {
3845
query: { id },
@@ -63,8 +70,9 @@ export function DocLayout() {
6370
}}
6471
>
6572
<MainLayout enableResizablePanel={true}>
73+
<DocLayoutGlobalStyle />
6674
<Box $direction="row" $width="100%">
67-
<Box $width="100%" $margin={{ horizontal: 'auto' }}>
75+
<Box $width="100%" $margin={{ horizontal: 'auto' }} $padding="base">
6876
<FloatingBar />
6977
<DocPage id={id} />
7078
</Box>

0 commit comments

Comments
 (0)