diff --git a/packages/grafana-data/src/themes/createColors.ts b/packages/grafana-data/src/themes/createColors.ts index b917c37adfbe2..38c65d64c973e 100644 --- a/packages/grafana-data/src/themes/createColors.ts +++ b/packages/grafana-data/src/themes/createColors.ts @@ -172,13 +172,13 @@ class LightColors implements ThemeColorsBase> { primary = { main: '#FF570AE5', - border: '#D9D9C8', + border: '#D7D7C7', text: '#101828', }; text = { primary: '#101828', - secondary: '#344054', + secondary: '#363636', disabled: '#9DA7B8', link: '#FF4702', maxContrast: palette.black, @@ -220,9 +220,9 @@ class LightColors implements ThemeColorsBase> { }; background = { - primary: '#F5F5F5', + primary: '#FFFFFF', canvas: '#F5F5F5', - secondary: '#F5f5f5', + secondary: '#FFFFFF', }; action = { diff --git a/packages/grafana-data/src/themes/createTypography.ts b/packages/grafana-data/src/themes/createTypography.ts index d0c8fe8189476..b09ac110ef839 100644 --- a/packages/grafana-data/src/themes/createTypography.ts +++ b/packages/grafana-data/src/themes/createTypography.ts @@ -53,8 +53,8 @@ export interface ThemeTypographyInput { htmlFontSize?: number; } -const defaultFontFamily = '"Poppins", Inter, Satoshi, sans-serif'; //'"Roboto", "Helvetica", "Arial", sans-serif'; -const defaultFontFamilyMonospace = '"SatoshiLight", "FigtreeLight", monospace'; // "'Roboto Mono', monospace"; +const defaultFontFamily = '"Work Sans", Inter, Satoshi, sans-serif'; +const defaultFontFamilyMonospace = '"SatoshiLight", "FigtreeLight", monospace'; export function createTypography(colors: ThemeColors, typographyInput: ThemeTypographyInput = {}): ThemeTypography { const { diff --git a/packages/grafana-ui/src/components/Pagination/Pagination.tsx b/packages/grafana-ui/src/components/Pagination/Pagination.tsx index 5917185f2bbae..e1745f1a9c1f1 100644 --- a/packages/grafana-ui/src/components/Pagination/Pagination.tsx +++ b/packages/grafana-ui/src/components/Pagination/Pagination.tsx @@ -2,7 +2,7 @@ import { css, cx } from '@emotion/css'; import { useMemo } from 'react'; import { useStyles2 } from '../../themes'; -import { Button, ButtonVariant } from '../Button'; +import { Button } from '../Button'; import { Icon } from '../Icon/Icon'; export interface Props { @@ -34,9 +34,9 @@ export const Pagination = ({ const pages = [...new Array(numberOfPages).keys()]; const condensePages = numberOfPages > pageLengthToCondense; - const getListItem = (page: number, variant: 'primary' | 'secondary') => ( + const getListItem = (page: number, fill?: 'outline') => (
  • -
  • @@ -44,7 +44,7 @@ export const Pagination = ({ return pages.reduce((pagesToRender, pageIndex) => { const page = pageIndex + 1; - const variant: ButtonVariant = page === currentPage ? 'primary' : 'secondary'; + const fill: 'outline' | undefined = page === currentPage ? undefined : 'outline'; // The indexes at which to start and stop condensing pages const lowerBoundIndex = pageLengthToCondense; @@ -72,7 +72,7 @@ export const Pagination = ({ (currentPageIsBetweenBounds && page >= currentPage - pageOffset && page <= currentPage + pageOffset) ) { // Renders a button for the page - pagesToRender.push(getListItem(page, variant)); + pagesToRender.push(getListItem(page, fill)); } else if ( (page === lowerBoundIndex && currentPage < lowerBoundIndex) || (page === upperBoundIndex && currentPage > upperBoundIndex) || @@ -87,7 +87,7 @@ export const Pagination = ({ ); } } else { - pagesToRender.push(getListItem(page, variant)); + pagesToRender.push(getListItem(page, fill)); } return pagesToRender; }, []); @@ -104,9 +104,9 @@ export const Pagination = ({ @@ -116,7 +116,7 @@ export const Pagination = ({