diff --git a/ui-common/src/components/modals/TrafficStatsModal/TimelineBarChart/TimelineBarChart.module.sass b/ui-common/src/components/modals/TrafficStatsModal/TimelineBarChart/TimelineBarChart.module.sass index 4a154af5d..672ca9f24 100644 --- a/ui-common/src/components/modals/TrafficStatsModal/TimelineBarChart/TimelineBarChart.module.sass +++ b/ui-common/src/components/modals/TrafficStatsModal/TimelineBarChart/TimelineBarChart.module.sass @@ -1,3 +1,5 @@ +@import "../../../../variables.module" + .barChartContainer width: 100% display: flex @@ -6,3 +8,4 @@ .axisText font-size: 12px opacity: 0.9 + font-family: $text-font-family diff --git a/ui-common/src/components/modals/TrafficStatsModal/TrafficPieChart/TrafficPieChart.module.sass b/ui-common/src/components/modals/TrafficStatsModal/TrafficPieChart/TrafficPieChart.module.sass new file mode 100644 index 000000000..2b0b38080 --- /dev/null +++ b/ui-common/src/components/modals/TrafficStatsModal/TrafficPieChart/TrafficPieChart.module.sass @@ -0,0 +1,5 @@ +@import "../../../../variables.module" + +.entryName + margin-left: 5px + font-family: $text-font-family diff --git a/ui-common/src/components/modals/TrafficStatsModal/TrafficPieChart/TrafficPieChart.tsx b/ui-common/src/components/modals/TrafficStatsModal/TrafficPieChart/TrafficPieChart.tsx index 51a272fd3..2f948a509 100644 --- a/ui-common/src/components/modals/TrafficStatsModal/TrafficPieChart/TrafficPieChart.tsx +++ b/ui-common/src/components/modals/TrafficStatsModal/TrafficPieChart/TrafficPieChart.tsx @@ -2,6 +2,7 @@ import React, { useEffect, useMemo, useState } from "react"; import { Cell, Legend, Pie, PieChart, Tooltip } from "recharts"; import { Utils } from "../../../../helpers/Utils"; import { ALL_PROTOCOLS ,StatsMode as PieChartMode } from "../consts" +import styles from "./TrafficPieChart.module.sass"; const RADIAN = Math.PI / 180; const renderCustomizedLabel = ({ @@ -76,7 +77,7 @@ export const TrafficPieChart: React.FC = ({ pieChartMode, if (selectedProtocol === ALL_PROTOCOLS) { legend = data.map(protocol =>
- + {protocol.name}
) @@ -84,7 +85,7 @@ export const TrafficPieChart: React.FC = ({ pieChartMode, legend = data.find(protocol => protocol.name === selectedProtocol)?.methods.map((method) =>
- + {method.name}
) diff --git a/ui-common/src/components/modals/TrafficStatsModal/TrafficStatsModal.module.sass b/ui-common/src/components/modals/TrafficStatsModal/TrafficStatsModal.module.sass index 4064932f3..080713b78 100644 --- a/ui-common/src/components/modals/TrafficStatsModal/TrafficStatsModal.module.sass +++ b/ui-common/src/components/modals/TrafficStatsModal/TrafficStatsModal.module.sass @@ -1,9 +1,11 @@ +@import "../../../variables.module" + .headlineContainer display: flex .title color: #494677 - font-family: Source Sans Pro,Lucida Grande,Tahoma,sans-serif + font-family: $text-font-family font-size: 28px font-weight: 600 @@ -21,8 +23,13 @@ align-items: center margin-bottom: 4% +.selectTitle + font-family: $text-font-family + margin-right: 15px + .select border: none border-bottom: 1px black solid outline: none width: 100px + font-family: $text-font-family diff --git a/ui-common/src/components/modals/TrafficStatsModal/TrafficStatsModal.tsx b/ui-common/src/components/modals/TrafficStatsModal/TrafficStatsModal.tsx index 28dec2e91..e2bfa573c 100644 --- a/ui-common/src/components/modals/TrafficStatsModal/TrafficStatsModal.tsx +++ b/ui-common/src/components/modals/TrafficStatsModal/TrafficStatsModal.tsx @@ -85,20 +85,20 @@ export const TrafficStatsModal: React.FC = ({ isOpen, on
- -
-
- Breakdown By + Breakdown By
- Protocol + Protocol
+
+ +
diff --git a/ui-common/src/variables.module.scss b/ui-common/src/variables.module.scss index 9a6d8a226..d777bf9e3 100644 --- a/ui-common/src/variables.module.scss +++ b/ui-common/src/variables.module.scss @@ -14,6 +14,8 @@ $content-section-color: #f8f9fc; $blue-gray: #494677; $light-gray: #8F9BB2; +$text-font-family: Source Sans Pro, Lucida Grande, Tahoma, sans-serif; + :export { mainBackgroundColor: $main-background-color; headerBackgroundColor: $header-background-color; @@ -26,4 +28,5 @@ $light-gray: #8F9BB2; blueGray: $blue-gray; lightGray: $light-gray; contentSectionColor: $content-section-color; + textFontFamily: $text-font-family }