Skip to content

Commit d253f95

Browse files
committed
style: 修复两处内容过多导致溢出的样式问题
1 parent 8b3738e commit d253f95

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

Diff for: src/web/components/panels/CommonPanel.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ const RightPanel = styled.div`
2727
width: ${(props) => props.theme.style.sidebarWidth};
2828
background-color: ${(props) => props.theme.style.sidebarBackgroundColor};
2929
padding: 8px;
30+
overflow: auto;
3031
3132
${(props) =>
3233
props.theme.mixins.mobile('position: absolute;height: 100%;right: 0;')}

Diff for: src/web/routes/Main/Content/Group/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export const Group: React.FC = TMemo(() => {
3535
<GroupProvider groupInfo={groupInfo}>
3636
<PageContent
3737
sidebar={
38-
<div>
38+
<>
3939
<GroupHeader groupUUID={groupUUID} />
4040
<SidebarItemsContainer>
4141
<SidebarItem
@@ -53,7 +53,7 @@ export const Group: React.FC = TMemo(() => {
5353
/>
5454
))}
5555
</SidebarItemsContainer>
56-
</div>
56+
</>
5757
}
5858
>
5959
<Switch>

Diff for: src/web/routes/Main/Content/PageContent.tsx

+2
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ const SidebarContainer = styled.div<{
3939
width: ${(props) => (props.showSidebar ? props.theme.style.sidebarWidth : 0)};
4040
background-color: ${(props) => props.theme.style.sidebarBackgroundColor};
4141
overflow: hidden;
42+
display: flex;
43+
flex-direction: column;
4244
`;
4345

4446
interface PageContentProps {

Diff for: src/web/routes/Main/Content/Personal/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export const Personal: React.FC = TMemo(() => {
4343
return (
4444
<PageContent
4545
sidebar={
46-
<div>
46+
<>
4747
<SectionHeader>{getUserName(currentUserInfo)}</SectionHeader>
4848
<SidebarItemsContainer>
4949
<SidebarItem
@@ -99,7 +99,7 @@ export const Personal: React.FC = TMemo(() => {
9999
})}
100100
</div>
101101
</SidebarItemsContainer>
102-
</div>
102+
</>
103103
}
104104
>
105105
<Switch>

Diff for: src/web/routes/Main/Content/style.tsx

+2
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@ export const SidebarHeaderText = styled.div`
1010

1111
export const SidebarItemsContainer = styled.div`
1212
padding: 8px;
13+
flex: 1;
14+
overflow: auto;
1315
`;

0 commit comments

Comments
 (0)