diff --git a/src/assets/css/main.css b/src/assets/css/main.css index 8734c3c..5bcf9b4 100644 --- a/src/assets/css/main.css +++ b/src/assets/css/main.css @@ -1,7 +1,26 @@ @import './base.css'; -/* @import 'devextreme/dist/css/dx.material.blue.light.css'; */ @import 'devextreme/dist/css/dx.material.blue.light.compact.css'; -/* @import 'devextreme/dist/css/dx.light.css'; */ -/* @import 'devextreme/dist/css/dx.light.compact.css'; */ @import url('https://fonts.googleapis.com/css2?family=Plus+Jakarta+Sans:wght@400;500;700&display=swap'); -@import './style.css'; \ No newline at end of file +@import './style.css'; + +.dx-datagrid-total-footer{ + background-color: #035b71 !important; +} +.dx-datagrid-total-footer .dx-row.dx-footer-row{ + background-color: #035b71 !important; +} +.dx-datagrid-total-footer > td{ + background-color: #035b71 !important; +} +.dx-row.dx-datagrid-group-footer > td{ + background-color: #e6eff1 !important; +} +.dx-datagrid-rowsview .dx-row.dx-group-row { + background-color: #F7F7F7 !important; +} +.dx-datagrid-group-footer{ + background-color: #e6eff1 !important; +} +.dx-pager .dx-page-sizes .dx-selection, .dx-pager .dx-pages .dx-selection{ + background-color: #035b71 !important; +} \ No newline at end of file diff --git a/src/assets/css/style.css b/src/assets/css/style.css index 5829961..a7c42d2 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -705,8 +705,6 @@ select { --tw-backdrop-sepia: ; } -/* DevExpress */ - /* NavBar */ .menu-item { diff --git a/src/assets/css/tailwind.css b/src/assets/css/tailwind.css index 70189b1..cb1564b 100644 --- a/src/assets/css/tailwind.css +++ b/src/assets/css/tailwind.css @@ -3,13 +3,6 @@ @tailwind utilities; @layer components { - /* DevExpress */ - .dx-datagrid-rowsview .dx-row.dx-group-row { - @apply !bg-['#F7F7F7']; - } - .dx-datagrid-group-footer{ - @apply !bg-primary-500; - } /* NavBar */ .menu-item { @apply w-full text-left block px-4 py-3 text-base text-gray-800;