Skip to content

Commit 71b1911

Browse files
committed
refactor: minor fixes
1 parent b1ba7d8 commit 71b1911

File tree

9 files changed

+1069
-517
lines changed

9 files changed

+1069
-517
lines changed

CHANGELOG.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
## [react](./REACT.md) version `changelog`
1+
## [CoreUI](https://coreui.io/) for [react](./REACT.md) changelog
2+
3+
##### `v2.0.0-alpha.3`
4+
- refactor: Colors
5+
- refactor: FullAside - ListGroup (deprecate callout)
6+
- refactor: Full* containers minor fixes
7+
- refactor: Dropdowns minor fixes
28

39
##### `v2.0.0-alpha.2`
410
- refactor: FullHeader `<AppHeaderDropdown direction="down">` (required prop `direction`)

package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "CoreUI-React",
3-
"version": "2.0.0-alpha.2",
3+
"version": "2.0.0-alpha.3",
44
"description": "CoreUI React Open Source Bootstrap 4 Admin Template",
55
"author": "Łukasz Holeczek",
66
"homepage": "http://coreui.io",
@@ -12,8 +12,9 @@
1212
"url": "[email protected]:mrholek/CoreUI-React.git"
1313
},
1414
"dependencies": {
15-
"@coreui/styles": "next",
16-
"@coreui/react": "next",
15+
"@coreui/coreui": "^2.0.0-beta.5",
16+
"@coreui/react": "^2.0.0-alpha.5",
17+
"babel-jest": "^22.4.3",
1718
"bootstrap": "4.0.0",
1819
"chart.js": "^2.7.2",
1920
"classnames": "^2.2.3",

src/containers/Full/Full.js

+3-11
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,7 @@ class Full extends Component {
3838
<AppSidebarMinimizer />
3939
</AppSidebar>
4040
<main className="main">
41-
<AppBreadcrumb appRoutes={routes}>
42-
<li class="breadcrumb-menu d-md-down-none">
43-
<div class="btn-group" role="group" aria-label="Button group with nested dropdown">
44-
<a class="btn" href="#"><i class="icon-speech"></i></a>
45-
<a class="btn" href="/dashboard"><i class="icon-graph"></i> &nbsp;Dashboard</a>
46-
<a class="btn" href="#"><i class="icon-settings"></i> &nbsp;Settings</a>
47-
</div>
48-
</li>
49-
</AppBreadcrumb>
41+
<AppBreadcrumb appRoutes={routes}/>
5042
<Container fluid>
5143
<Switch>
5244
{routes.map((route, idx) => {
@@ -60,11 +52,11 @@ class Full extends Component {
6052
</Switch>
6153
</Container>
6254
</main>
63-
<AppAside fixed hidden display="lg">
55+
<AppAside fixed hidden>
6456
<FullAside />
6557
</AppAside>
6658
</div>
67-
<AppFooter fixed>
59+
<AppFooter>
6860
<FullFooter />
6961
</AppFooter>
7062
</div>

src/containers/Full/FullFooter.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ const defaultProps = {};
1010
class FullFooter extends Component {
1111
render() {
1212

13+
// eslint-disable-next-line
1314
const { children, ...attributes } = this.props;
1415

1516
return (
@@ -24,4 +25,4 @@ class FullFooter extends Component {
2425
FullFooter.propTypes = propTypes;
2526
FullFooter.defaultProps = defaultProps;
2627

27-
export default FullFooter;
28+
export default FullFooter;

src/containers/Full/FullHeader.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ const defaultProps = {};
1313
class FullHeader extends Component {
1414
render() {
1515

16+
// eslint-disable-next-line
1617
const { children, ...attributes } = this.props;
1718

1819
return (
@@ -67,7 +68,7 @@ class FullHeader extends Component {
6768
</AppHeaderDropdown>
6869
</Nav>
6970
<AppAsideToggler className="d-md-down-none" />
70-
<AppAsideToggler className="d-lg-none" mobile />
71+
{/*<AppAsideToggler className="d-lg-none" mobile />*/}
7172
</React.Fragment>
7273
);
7374
}

0 commit comments

Comments
 (0)