diff --git a/packages/core/components/DataTable/components/ExpandCollapse.tsx b/packages/core/components/DataTable/components/ExpandCollapse.tsx index 7b9d34b78..9c5e3a079 100644 --- a/packages/core/components/DataTable/components/ExpandCollapse.tsx +++ b/packages/core/components/DataTable/components/ExpandCollapse.tsx @@ -2,7 +2,7 @@ import Icon from '../../ui/Icon' import { fontSizes } from '../../../helpers/cove/fontSettings' const ExpandCollapse = ({ expanded, setExpanded, tableTitle, fontSize, viewport }) => { - const titleFontSize = ['sm', 'xs', 'xxs'].includes(viewport) ? '13px' : `${fontSizes[fontSize]}px` + const titleFontSize = ['xs', 'xxs'].includes(viewport) ? '13px' : `${fontSizes[fontSize]}px` return (
= props => { const whiteSpace = wrapColumns ? 'unset' : 'nowrap' const minWidth = cellMinWidth + 'px' const fontSizes = { small: 16, medium: 18, large: 20 } - const cellFontSize = ['sm', 'xs', 'xxs'].includes(viewport) ? '11px' : `${fontSizes[fontSize]}px` + const cellFontSize = ['xs', 'xxs'].includes(viewport) ? '12px' : `${fontSizes[fontSize]}px` return ( diff --git a/packages/core/styles/_global-variables.scss b/packages/core/styles/_global-variables.scss index 693eba93c..b42c08e52 100644 --- a/packages/core/styles/_global-variables.scss +++ b/packages/core/styles/_global-variables.scss @@ -91,8 +91,8 @@ $colors: ( --font-size: 17px; } -@media (max-width: 768px) { +@media (max-width: 576px) { :root { - --font-size: 0.9em; + --font-size: 13px; } } diff --git a/packages/dashboard/src/components/CollapsibleVisualizationRow.tsx b/packages/dashboard/src/components/CollapsibleVisualizationRow.tsx index 5f9ed0ea0..20f87940b 100644 --- a/packages/dashboard/src/components/CollapsibleVisualizationRow.tsx +++ b/packages/dashboard/src/components/CollapsibleVisualizationRow.tsx @@ -8,10 +8,16 @@ type CollapsableVizRow = { groupName: string currentViewport: string } -const CollapsibleVisualizationRow: React.FC = ({ allExpanded, fontSize, groupName, currentViewport, children }) => { +const CollapsibleVisualizationRow: React.FC = ({ + allExpanded, + fontSize, + groupName, + currentViewport, + children +}) => { const [isExpanded, setIsExpanded] = useState(allExpanded) const fontSizes = { small: 16, medium: 18, large: 20 } - const titleFontSize = ['sm', 'xs', 'xxs'].includes(currentViewport) ? '13px' : `${fontSizes[fontSize]}px` + const titleFontSize = ['xs', 'xxs'].includes(currentViewport) ? '13px' : `${fontSizes[fontSize]}px` useEffect(() => { setIsExpanded(allExpanded)