Skip to content

Commit a8ddd22

Browse files
authored
Merge pull request #51 from mrholek/v1.0.10
v1.0.10
2 parents be9e2ab + db35210 commit a8ddd22

File tree

15 files changed

+162
-156
lines changed

15 files changed

+162
-156
lines changed

CHANGELOG.md

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

3+
##### `v1.0.10`
4+
- refactor: `<InputGroupAddon addonType="prepend">`
5+
- refactor: `<InputGroupAddon addonType="append">`
6+
- refactor: `<InputGroupText>`
7+
- refactor: remove `<InputGroupButton>`
8+
- update: reactstrap to `5.0.0-beta`
9+
- update: dependencies
10+
311
###### `v1.0.9`
412
- refactor: Sidebar structure change
513

React_Full_Project/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "@coreui/react",
3-
"version": "1.0.9",
3+
"version": "1.0.10",
44
"description": "Open Source Bootstrap Admin Template",
55
"author": "Łukasz Holeczek",
66
"homepage": "http://coreui.io",
7-
"copyright": "Copyright 2017 creativeLabs Łukasz Holeczek",
7+
"copyright": "Copyright 2018 creativeLabs Łukasz Holeczek",
88
"license": "MIT",
99
"private": true,
1010
"devDependencies": {
@@ -14,7 +14,7 @@
1414
"babel-preset-env": "1.6.1",
1515
"babel-preset-react": "6.24.1",
1616
"copy-webpack-plugin": "4.3.1",
17-
"css-hot-loader": "1.3.5",
17+
"css-hot-loader": "1.3.6",
1818
"css-loader": "0.28.9",
1919
"extract-text-webpack-plugin": "3.0.2",
2020
"file-loader": "1.1.6",
@@ -24,11 +24,11 @@
2424
"rimraf": "2.6.2",
2525
"sass-loader": "6.0.6",
2626
"source-list-map": "2.0.0",
27-
"style-loader": "0.19.1",
28-
"uglify-js": "3.3.7",
27+
"style-loader": "0.20.1",
28+
"uglify-js": "3.3.9",
2929
"url-loader": "0.6.2",
3030
"webpack": "3.10.0",
31-
"webpack-dev-server": "2.9.7"
31+
"webpack-dev-server": "2.11.1"
3232
},
3333
"dependencies": {
3434
"bootstrap": "4.0.0",
@@ -41,7 +41,7 @@
4141
"react-dom": "16.2.0",
4242
"react-router-dom": "4.2.2",
4343
"react-transition-group": "2.2.1",
44-
"reactstrap": "5.0.0-alpha.4",
44+
"reactstrap": "5.0.0-beta",
4545
"simple-line-icons": "2.4.1"
4646
},
4747
"scripts": {

React_Full_Project/scss/core/_card.scss

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
.card-header {
2121

2222
.icon-bg {
23-
display: inline-body;
23+
display: inline-block;
2424
padding: $card-spacer-y $card-spacer-x !important;
2525
margin-top: -$card-spacer-y;
2626
margin-right: $card-spacer-x;
@@ -135,12 +135,12 @@
135135
}
136136

137137
[class^="icon-"], [class*=" icon-"] {
138-
display: inline-body;
138+
display: inline-block;
139139
vertical-align: middle;
140140
}
141141

142142
i {
143-
display: inline-body;
143+
display: inline-block;
144144
transition: .4s;
145145
}
146146

@@ -153,7 +153,7 @@
153153
width: 230px;
154154
margin: 6px;
155155

156-
.input-group-addon {
156+
.input-group-prepend, .input-group-append {
157157
background: #fff;
158158
}
159159

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
.input-group-addon,
2-
.input-group-btn {
3-
min-width: 40px;
1+
.input-group-prepend,
2+
.input-group-append {
43
white-space: nowrap;
54
vertical-align: middle; // Match the inputs
65
}

React_Full_Project/scss/style.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* CoreUI - Open Source Bootstrap Admin Template
3-
* @version v1.0.9
3+
* @version v1.0.10
44
* @link http://coreui.io
55
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
66
* @license MIT

0 commit comments

Comments
 (0)