diff --git a/CHANGELOG.md b/CHANGELOG.md index cfdaf276..6c49007a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,19 @@ All notable changes to this project will be documented in this file. Dates are displayed in UTC. +#### [3.4.3](https://github.com/coreui/coreui-react/compare/3.4.2...3.4.3) + +> 22 December 2020 + +- fix(CDataTable): correct itemsPerPageSelect padding [`#171`](https://github.com/coreui/coreui-react/pull/171) +- fix(CDataTable): tableFilter and cleaner minor cleanup [`1b5079f`](https://github.com/coreui/coreui-react/commit/1b5079f76020d579d2edc00da20edec0956521bf) + #### [3.4.2](https://github.com/coreui/coreui-react/compare/3.4.1...3.4.2) > 18 December 2020 - fix(CToast): add missing color prop [`f48c98c`](https://github.com/coreui/coreui-react/commit/f48c98cf7f66ed3089730fbb37da5d0c4a975563) +- chore(release): 3.4.2 [`939098f`](https://github.com/coreui/coreui-react/commit/939098f265dc9fe8d908995db369bae3f3c65ef9) #### [3.4.1](https://github.com/coreui/coreui-react/compare/3.4.0...3.4.1) diff --git a/package.json b/package.json index e9cbeae4..323dab26 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@coreui/react", - "version": "3.4.2", + "version": "3.4.3", "description": "CoreUI React 17 Bootstrap 4 components", "license": "MIT", "author": { @@ -87,7 +87,7 @@ "del-cli": "^3.0.1", "enzyme": "^3.11.0", "enzyme-to-json": "^3.6.1", - "eslint": "^7.15.0", + "eslint": "^7.16.0", "eslint-plugin-import": "^2.22.1", "eslint-plugin-react": "^7.21.5", "expect": "^26.6.2", diff --git a/src/table/CDataTable.css b/src/table/CDataTable.css new file mode 100644 index 00000000..9cc1914f --- /dev/null +++ b/src/table/CDataTable.css @@ -0,0 +1,18 @@ +.c-datatable-filter { + display: flex; + flex-flow: row nowrap; + justify-content: flex-start; + align-items: center; +} +.c-datatable-filter label { + margin-bottom: 0; +} +.c-datatable-items-per-page { + display: flex; + flex-flow: row nowrap; + justify-content: flex-end; + align-items: center; +} +.c-datatable-items-per-page label { + margin-bottom: 0; +} diff --git a/src/table/CDataTable.js b/src/table/CDataTable.js index 821492c1..7d1c0163 100644 --- a/src/table/CDataTable.js +++ b/src/table/CDataTable.js @@ -3,9 +3,10 @@ import PropTypes from 'prop-types' import classNames from 'classnames' import CPagination from '../pagination/CPagination' import CElementCover from '../element-cover/CElementCover' -import style from './CDataTable.module.css' import CIcon from '@coreui/icons-react' import { cilArrowTop, cilBan, cilFilterX } from '@coreui/icons' +import style from './CDataTable.module.css' +import './CDataTable.css' //component - CoreUI / CTable const CDataTable = props => { @@ -343,7 +344,7 @@ const CDataTable = props => { const cleanerProps = { content: cilFilterX, - className: `ml-2 ${isFiltered ? 'text-danger' : 'transparent'}`, + className: `mfs-2 ${isFiltered ? 'text-danger' : 'transparent'}`, role: isFiltered ? 'button' : null, tabIndex: isFiltered ? 0 : null, } @@ -414,11 +415,11 @@ const CDataTable = props => {
{ (tableFilter || cleaner) && -
+
{ tableFilter && <> - + { { if (event.key === 'Enter') clean() }} /> ) } @@ -444,9 +446,9 @@ const CDataTable = props => { } { itemsPerPageSelect && -
-
- +
+
+