Skip to content

Commit c46cb84

Browse files
committed
v2.0.0-alpha.2
- refactor: FullHeader `<AppHeaderDropdown direction="down">` (required prop `direction`) - refactor: ButtonDropdowns `<Dropdown direction="up">` (deprecate 'dropup') - refactor: Dashboard legend badge pill - refactor: SocialButtons to BrandButtons `btn-brand` - refactor: Buttons spacing `mr-1` - update: reactstrap to `5.0.0` - update: react, react-dom to `16.3.1` - update: node-sass-chokidar to `1.1.0` - update: prop-types to `15.5.8` - update: react-scripts to `1.1.4`
1 parent e1b0c8d commit c46cb84

File tree

16 files changed

+447
-380
lines changed

16 files changed

+447
-380
lines changed

CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
## [react](./REACT.md) version `changelog`
22

3+
##### `v2.0.0-alpha.2`
4+
- refactor: FullHeader `<AppHeaderDropdown direction="down">` (required prop `direction`)
5+
- refactor: ButtonDropdowns `<Dropdown direction="up">` (deprecate 'dropup')
6+
- refactor: Dashboard legend badge pill
7+
- refactor: SocialButtons to BrandButtons `btn-brand`
8+
- refactor: Buttons spacing `mr-1`
9+
- update: reactstrap to `5.0.0`
10+
- update: react, react-dom to `16.3.1`
11+
- update: node-sass-chokidar to `1.1.0`
12+
- update: prop-types to `15.5.8`
13+
- update: react-scripts to `1.1.4`
14+
315
##### `v2.0.0-alpha.1`
416
- refactor: separation of concerns - (CoreUI template vs CoreUI components) prepare to use CoreUI as dependency
517
- refactor: project structure change

package.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "CoreUI-React",
3-
"version": "2.0.0-alpha.1",
3+
"version": "2.0.0-alpha.2",
44
"description": "CoreUI React Open Source Bootstrap 4 Admin Template",
55
"author": "Łukasz Holeczek",
66
"homepage": "http://coreui.io",
@@ -15,19 +15,19 @@
1515
"@coreui/styles": "next",
1616
"@coreui/react": "next",
1717
"bootstrap": "4.0.0",
18-
"chart.js": "2.7.2",
18+
"chart.js": "^2.7.2",
1919
"classnames": "^2.2.3",
20-
"flag-icon-css": "3.0.0",
20+
"flag-icon-css": "^3.0.0",
2121
"font-awesome": "^4.7.0",
22-
"node-sass-chokidar": "^1.1.0",
23-
"prop-types": "^15.5.8",
24-
"react": "^16.2.0",
25-
"react-chartjs-2": "2.7.0",
26-
"react-dom": "^16.2.0",
22+
"node-sass-chokidar": "^1.2.2",
23+
"prop-types": "^15.6.1",
24+
"react": "^16.3.1",
25+
"react-chartjs-2": "^2.7.0",
26+
"react-dom": "^16.3.1",
2727
"react-router-config": "^1.0.0-beta.4",
2828
"react-router-dom": "^4.2.2",
29-
"react-scripts": "1.1.1",
30-
"reactstrap": "5.0.0-beta",
29+
"react-scripts": "^1.1.4",
30+
"reactstrap": "^5.0.0",
3131
"simple-line-icons": "^2.4.1"
3232
},
3333
"devDependencies": {

public/index.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<meta charset="utf-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
7-
<meta name="description" content="%THEMENAME% - %THEMEDESC%">
7+
<meta name="description" content="CoreUI for React - Open Source Bootstrap Admin Template">
88
<meta name="author" content="Łukasz Holeczek">
9-
<meta name="keyword" content="%THEMEKEYWORDS%">
10-
<title>%THEMENAME% - %THEMEDESC%</title>
9+
<meta name="keyword" content="Bootstrap,Admin,Template,Open,Source,CSS,SCSS,HTML,RWD,Dashboard,React">
10+
<title>CoreUI for React</title>
1111
<!--
1212
manifest.json provides metadata used when your web app is added to the
1313
homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/

src/_nav.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ export default {
144144
icon: 'icon-cursor',
145145
},
146146
{
147-
name: 'Social Buttons',
148-
url: '/buttons/social-buttons',
147+
name: 'Brand Buttons',
148+
url: '/buttons/brand-buttons',
149149
icon: 'icon-cursor',
150150
},
151151
],

src/containers/Full/FullHeader.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class FullHeader extends Component {
4545
<NavItem className="d-md-down-none">
4646
<NavLink href="#"><i className="icon-location-pin"></i></NavLink>
4747
</NavItem>
48-
<AppHeaderDropdown>
48+
<AppHeaderDropdown direction="down">
4949
<DropdownToggle nav>
5050
<img src={'assets/img/avatars/6.jpg'} className="img-avatar" alt="[email protected]" />
5151
</DropdownToggle>
@@ -76,4 +76,4 @@ class FullHeader extends Component {
7676
FullHeader.propTypes = propTypes;
7777
FullHeader.defaultProps = defaultProps;
7878

79-
export default FullHeader;
79+
export default FullHeader;

src/routes.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import {
2424
Popovers,
2525
ProgressBar,
2626
SimpleLineIcons,
27-
SocialButtons,
27+
BrandButtons,
2828
Switches,
2929
Tables,
3030
Tabs,
@@ -63,7 +63,7 @@ const routes = [
6363
{ path: '/buttons/buttons', name: 'Buttons', component: Buttons },
6464
{ path: '/buttons/button-dropdowns', name: 'ButtonDropdowns', component: ButtonDropdowns },
6565
{ path: '/buttons/button-groups', name: 'ButtonGroups', component: ButtonGroups },
66-
{ path: '/buttons/social-buttons', name: 'Social Buttons', component: SocialButtons },
66+
{ path: '/buttons/brand-buttons', name: 'Brand Buttons', component: BrandButtons },
6767
{ path: '/icons', exact: true, name: 'Icons', component: Flags },
6868
{ path: '/icons/flags', name: 'Flags', component: Flags },
6969
{ path: '/icons/font-awesome', name: 'Font Awesome', component: FontAwesome },
@@ -76,4 +76,4 @@ const routes = [
7676
{ path: '/charts', name: 'Charts', component: Charts },
7777
];
7878

79-
export default routes;
79+
export default routes;

src/scss/style.css

+22-9
Original file line numberDiff line numberDiff line change
@@ -3680,12 +3680,15 @@ button.close {
36803680
.bs-popover-top .arrow, .bs-popover-auto[x-placement^="top"] .arrow {
36813681
bottom: calc((0.5rem + 1px) * -1); }
36823682
.bs-popover-top .arrow::before, .bs-popover-auto[x-placement^="top"] .arrow::before,
3683-
.bs-popover-top .arrow::after, .bs-popover-auto[x-placement^="top"] .arrow::after {
3683+
.bs-popover-top .arrow::after,
3684+
.bs-popover-auto[x-placement^="top"] .arrow::after {
36843685
border-width: 0.5rem 0.5rem 0; }
36853686
.bs-popover-top .arrow::before, .bs-popover-auto[x-placement^="top"] .arrow::before {
36863687
bottom: 0;
36873688
border-top-color: rgba(0, 0, 0, 0.25); }
3688-
.bs-popover-top .arrow::after, .bs-popover-auto[x-placement^="top"] .arrow::after {
3689+
3690+
.bs-popover-top .arrow::after,
3691+
.bs-popover-auto[x-placement^="top"] .arrow::after {
36893692
bottom: 1px;
36903693
border-top-color: #fff; }
36913694

@@ -3697,12 +3700,15 @@ button.close {
36973700
height: 1rem;
36983701
margin: 0.3rem 0; }
36993702
.bs-popover-right .arrow::before, .bs-popover-auto[x-placement^="right"] .arrow::before,
3700-
.bs-popover-right .arrow::after, .bs-popover-auto[x-placement^="right"] .arrow::after {
3703+
.bs-popover-right .arrow::after,
3704+
.bs-popover-auto[x-placement^="right"] .arrow::after {
37013705
border-width: 0.5rem 0.5rem 0.5rem 0; }
37023706
.bs-popover-right .arrow::before, .bs-popover-auto[x-placement^="right"] .arrow::before {
37033707
left: 0;
37043708
border-right-color: rgba(0, 0, 0, 0.25); }
3705-
.bs-popover-right .arrow::after, .bs-popover-auto[x-placement^="right"] .arrow::after {
3709+
3710+
.bs-popover-right .arrow::after,
3711+
.bs-popover-auto[x-placement^="right"] .arrow::after {
37063712
left: 1px;
37073713
border-right-color: #fff; }
37083714

@@ -3711,12 +3717,15 @@ button.close {
37113717
.bs-popover-bottom .arrow, .bs-popover-auto[x-placement^="bottom"] .arrow {
37123718
top: calc((0.5rem + 1px) * -1); }
37133719
.bs-popover-bottom .arrow::before, .bs-popover-auto[x-placement^="bottom"] .arrow::before,
3714-
.bs-popover-bottom .arrow::after, .bs-popover-auto[x-placement^="bottom"] .arrow::after {
3720+
.bs-popover-bottom .arrow::after,
3721+
.bs-popover-auto[x-placement^="bottom"] .arrow::after {
37153722
border-width: 0 0.5rem 0.5rem 0.5rem; }
37163723
.bs-popover-bottom .arrow::before, .bs-popover-auto[x-placement^="bottom"] .arrow::before {
37173724
top: 0;
37183725
border-bottom-color: rgba(0, 0, 0, 0.25); }
3719-
.bs-popover-bottom .arrow::after, .bs-popover-auto[x-placement^="bottom"] .arrow::after {
3726+
3727+
.bs-popover-bottom .arrow::after,
3728+
.bs-popover-auto[x-placement^="bottom"] .arrow::after {
37203729
top: 1px;
37213730
border-bottom-color: #fff; }
37223731
.bs-popover-bottom .popover-header::before, .bs-popover-auto[x-placement^="bottom"] .popover-header::before {
@@ -3737,12 +3746,15 @@ button.close {
37373746
height: 1rem;
37383747
margin: 0.3rem 0; }
37393748
.bs-popover-left .arrow::before, .bs-popover-auto[x-placement^="left"] .arrow::before,
3740-
.bs-popover-left .arrow::after, .bs-popover-auto[x-placement^="left"] .arrow::after {
3749+
.bs-popover-left .arrow::after,
3750+
.bs-popover-auto[x-placement^="left"] .arrow::after {
37413751
border-width: 0.5rem 0 0.5rem 0.5rem; }
37423752
.bs-popover-left .arrow::before, .bs-popover-auto[x-placement^="left"] .arrow::before {
37433753
right: 0;
37443754
border-left-color: rgba(0, 0, 0, 0.25); }
3745-
.bs-popover-left .arrow::after, .bs-popover-auto[x-placement^="left"] .arrow::after {
3755+
3756+
.bs-popover-left .arrow::after,
3757+
.bs-popover-auto[x-placement^="left"] .arrow::after {
37463758
right: 1px;
37473759
border-left-color: #fff; }
37483760

@@ -8095,7 +8107,8 @@ base-chart.chart {
80958107
left: 8px; }
80968108

80978109
.switch-pill .switch-label, .switch.switch-3d .switch-label,
8098-
.switch-pill .switch-handle, .switch.switch-3d .switch-handle {
8110+
.switch-pill .switch-handle,
8111+
.switch.switch-3d .switch-handle {
80998112
border-radius: 50em; }
81008113

81018114
.switch-pill .switch-label::before, .switch.switch-3d .switch-label::before {

0 commit comments

Comments
 (0)