Skip to content

Commit 452725a

Browse files
committed
refactor: improve layout
1 parent 956133b commit 452725a

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

src/components/AppBreadcrumb.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const AppBreadcrumb = () => {
3232
const breadcrumbs = getBreadcrumbs(currentLocation)
3333

3434
return (
35-
<CBreadcrumb className="m-0 ms-2">
35+
<CBreadcrumb className="my-0">
3636
<CBreadcrumbItem href="/">Home</CBreadcrumbItem>
3737
{breadcrumbs.map((breadcrumb, index) => {
3838
return (

src/components/AppContent.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import routes from '../routes'
77

88
const AppContent = () => {
99
return (
10-
<CContainer lg>
10+
<CContainer class="px-4" lg>
1111
<Suspense fallback={<CSpinner color="primary" />}>
1212
<Routes>
1313
{routes.map((route, idx) => {

src/components/AppFooter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { CFooter } from '@coreui/react'
33

44
const AppFooter = () => {
55
return (
6-
<CFooter>
6+
<CFooter className="px-4">
77
<div>
88
<a href="https://coreui.io" target="_blank" rel="noopener noreferrer">
99
CoreUI

src/components/AppHeader.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ const AppHeader = () => {
4444

4545
return (
4646
<CHeader position="sticky" className="mb-4 p-0" ref={headerRef}>
47-
<CContainer className="border-bottom" fluid>
47+
<CContainer className="border-bottom px-4" fluid>
4848
<CHeaderToggler
49-
className="ps-1"
5049
onClick={() => dispatch({ type: 'set', sidebarShow: !sidebarShow })}
50+
style={{ marginInlineStart: '-14px' }}
5151
>
5252
<CIcon icon={cilMenu} size="lg" />
5353
</CHeaderToggler>
@@ -80,17 +80,19 @@ const AppHeader = () => {
8080
<CIcon icon={cilEnvelopeOpen} size="lg" />
8181
</CNavLink>
8282
</CNavItem>
83-
<li className="nav-item py-2 py-lg-1">
83+
</CHeaderNav>
84+
<CHeaderNav>
85+
<li className="nav-item py-1">
8486
<div className="vr h-100 mx-2 text-body text-opacity-75"></div>
8587
</li>
8688
<CDropdown variant="nav-item" placement="bottom-end">
8789
<CDropdownToggle caret={false}>
8890
{colorMode === 'dark' ? (
89-
<CIcon icon={cilMoon} size="xl" />
91+
<CIcon icon={cilMoon} size="lg" />
9092
) : colorMode === 'auto' ? (
91-
<CIcon icon={cilContrast} size="xl" />
93+
<CIcon icon={cilContrast} size="lg" />
9294
) : (
93-
<CIcon icon={cilSun} size="xl" />
95+
<CIcon icon={cilSun} size="lg" />
9496
)}
9597
</CDropdownToggle>
9698
<CDropdownMenu>
@@ -123,15 +125,13 @@ const AppHeader = () => {
123125
</CDropdownItem>
124126
</CDropdownMenu>
125127
</CDropdown>
126-
<li className="nav-item py-2 py-lg-1">
128+
<li className="nav-item py-1">
127129
<div className="vr h-100 mx-2 text-body text-opacity-75"></div>
128130
</li>
129-
</CHeaderNav>
130-
<CHeaderNav className="ms-3">
131131
<AppHeaderDropdown />
132132
</CHeaderNav>
133133
</CContainer>
134-
<CContainer fluid>
134+
<CContainer className="px-4" fluid>
135135
<AppBreadcrumb />
136136
</CContainer>
137137
</CHeader>

src/components/header/AppHeaderDropdown.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import avatar8 from './../../assets/images/avatars/8.jpg'
2727
const AppHeaderDropdown = () => {
2828
return (
2929
<CDropdown variant="nav-item">
30-
<CDropdownToggle placement="bottom-end" className="py-0" caret={false}>
30+
<CDropdownToggle placement="bottom-end" className="py-0 pe-0" caret={false}>
3131
<CAvatar src={avatar8} size="md" />
3232
</CDropdownToggle>
3333
<CDropdownMenu className="pt-0" placement="bottom-end">

src/layout/DefaultLayout.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const DefaultLayout = () => {
77
<AppSidebar />
88
<div className="wrapper d-flex flex-column min-vh-100">
99
<AppHeader />
10-
<div className="body flex-grow-1 px-3">
10+
<div className="body flex-grow-1">
1111
<AppContent />
1212
</div>
1313
<AppFooter />

0 commit comments

Comments
 (0)