diff --git a/src/components/ReactTable4/BasicTable.js b/src/components/ReactTable4/BasicTable.js index 432f203..272a0bd 100644 --- a/src/components/ReactTable4/BasicTable.js +++ b/src/components/ReactTable4/BasicTable.js @@ -133,12 +133,12 @@ const BasicTable = ({ settingsIcon }) => { {/* */}
{/* right box */} -
+
{/* left box */}
{/* search box */} diff --git a/src/components/ReactTable4/ColumnSearch.js b/src/components/ReactTable4/ColumnSearch.js index b1de9e9..8633716 100644 --- a/src/components/ReactTable4/ColumnSearch.js +++ b/src/components/ReactTable4/ColumnSearch.js @@ -1,7 +1,7 @@ import React, { useState } from "react"; import search from "./search-normal.svg"; -import settings from "./settings.svg"; +import cancleIcon from "./zarbedar-icon.svg"; export const ColumnSearch = ({ column }) => { const { filterValue, setFilter } = column; @@ -12,9 +12,9 @@ export const ColumnSearch = ({ column }) => {
{activeSearchBox && ( setActiveSearchBox(false)} /> )} diff --git a/src/components/ReactTable4/GlobalFilter.js b/src/components/ReactTable4/GlobalFilter.js index bfb437b..1ebf2fc 100644 --- a/src/components/ReactTable4/GlobalFilter.js +++ b/src/components/ReactTable4/GlobalFilter.js @@ -2,7 +2,7 @@ import React, { useState } from "react"; import { useAsyncDebounce } from "react-table"; import search from "./search-normal.svg"; -import settings from "./settings.svg"; +import cancleIcon from "./zarbedar-icon.svg"; export const GlobalFilter = ({ filter, setFilter }) => { const [activeSearchBox, setActiveSearchBox] = useState(false); @@ -17,9 +17,9 @@ export const GlobalFilter = ({ filter, setFilter }) => {
{activeSearchBox && ( setActiveSearchBox(false)} /> )} diff --git a/src/components/ReactTable4/SliderColumnFilter.js b/src/components/ReactTable4/SliderColumnFilter.js index 9016181..f5aa2bb 100644 --- a/src/components/ReactTable4/SliderColumnFilter.js +++ b/src/components/ReactTable4/SliderColumnFilter.js @@ -27,7 +27,7 @@ export const SliderColumnFilter = ({ setFilter(parseInt(e.target.value, 10)); }} /> -
+
setFilter(undefined)} diff --git a/src/components/ReactTable4/index.js b/src/components/ReactTable4/index.js index 28c6101..425707b 100644 --- a/src/components/ReactTable4/index.js +++ b/src/components/ReactTable4/index.js @@ -2,6 +2,8 @@ import React, { useRef } from "react"; import BasicTable from "./BasicTable"; // import useDraggableScroll from "use-draggable-scroll"; +import cancleIcon from "./zarbedar-icon.svg"; + const ReactTable4 = ({ breadCrumbs, subTitle, title }) => { return (
@@ -90,7 +92,7 @@ export function Tabbar({}) { ]; return (
    { const slider = window.document.querySelector(".tabbar"); window.isDown = true; @@ -113,19 +115,16 @@ export function Tabbar({}) { }} > {tabs.map((el) => ( -
  • - { - if (window.isDown) return e.preventDefault(); - ///do here - }} - aria-current="page" - className="inline-block py-4 px-4 text-sm font-medium text-center text-blue-600 bg-gray-100 rounded-t-lg active dark:bg-gray-800 dark:text-blue-500" - > - - {el} x - - +
  • { + if (window.isDown) return e.preventDefault(); + }} + aria-current="page" + className="flex flex-row items-center text-sm text-center active px-2 py-1 rounded-sm mx-1" + style={{ backgroundColor: "#F1F6FF" }} + > + {el} +
  • ))}
diff --git a/src/components/ReactTable4/zarbedar-icon.svg b/src/components/ReactTable4/zarbedar-icon.svg index 57c3638..682f7a5 100644 --- a/src/components/ReactTable4/zarbedar-icon.svg +++ b/src/components/ReactTable4/zarbedar-icon.svg @@ -1,10 +1,6 @@ - - - - - - - - + + + +