diff --git a/frontend/src/App.module.less b/frontend/src/App.module.less index 98c5a3b..f9380a6 100644 --- a/frontend/src/App.module.less +++ b/frontend/src/App.module.less @@ -69,7 +69,6 @@ } .pageTitle a { - font-family: 'Open Sans Condensed'; font-weight: 600; font-size: 18pt; diff --git a/frontend/src/index.css b/frontend/src/index.css deleted file mode 100644 index bed803d..0000000 --- a/frontend/src/index.css +++ /dev/null @@ -1,11 +0,0 @@ -body { - margin: 0; - font-family: 'Noto Sans', 'Roboto', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Oxygen', 'Ubuntu', 'Cantarell', - 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -code { - font-family: 'Noto Sans Mono', source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace; -} diff --git a/frontend/src/index.js b/frontend/src/index.js index e23cc49..3921d1c 100644 --- a/frontend/src/index.js +++ b/frontend/src/index.js @@ -3,7 +3,7 @@ import {Settings} from 'luxon' import ReactDOM from 'react-dom' import 'fomantic-ui-less/semantic.less' -import './index.css' +import './index.less' import App from './App' import 'maplibre-gl/dist/maplibre-gl.css' diff --git a/frontend/src/index.less b/frontend/src/index.less new file mode 100644 index 0000000..ed78373 --- /dev/null +++ b/frontend/src/index.less @@ -0,0 +1,8 @@ +@import 'styles.less'; + +body { + margin: 0; + font-family: @fontFamilyDefault; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} diff --git a/frontend/src/pages/MapPage/index.tsx b/frontend/src/pages/MapPage/index.tsx index e215077..a10427a 100644 --- a/frontend/src/pages/MapPage/index.tsx +++ b/frontend/src/pages/MapPage/index.tsx @@ -99,7 +99,6 @@ const getEventsTextLayer = () => ({ { "min-fraction-digits": 2, "max-fraction-digits": 2 }, ], "text-allow-overlap": true, - "text-font": ["Open Sans Bold", "Arial Unicode MS Regular"], "text-size": 14, "text-keep-upright": false, "text-anchor": "left", diff --git a/frontend/src/pages/TrackPage/TrackMap.tsx b/frontend/src/pages/TrackPage/TrackMap.tsx index 8668a63..50b8811 100644 --- a/frontend/src/pages/TrackPage/TrackMap.tsx +++ b/frontend/src/pages/TrackPage/TrackMap.tsx @@ -61,7 +61,6 @@ export default function TrackMap({ layout: { 'text-field': ['number-format', ['get', p], {'min-fraction-digits': 2, 'max-fraction-digits': 2}], 'text-allow-overlap': true, - 'text-font': ['Open Sans Bold', 'Arial Unicode MS Regular'], 'text-size': 14, 'text-keep-upright': false, 'text-anchor': a, diff --git a/frontend/src/semantic-ui/site/elements/header.overrides b/frontend/src/semantic-ui/site/elements/header.overrides index b3adb23..ff93a47 100644 --- a/frontend/src/semantic-ui/site/elements/header.overrides +++ b/frontend/src/semantic-ui/site/elements/header.overrides @@ -3,22 +3,19 @@ *******************************/ h1.ui.header { - font-family: "Open Sans Condensed"; line-height: 35pt; font-size: 30pt; color: @obsColorB4; } h2.ui.header { - font-family: "Open Sans"; - font-weight: 300; + font-weight: 400; line-height: 25pt; font-size: 20pt; color: @obsColorG1; } h3.ui.header { - font-family: "Open Sans"; font-weight: normal; line-height: 18pt; font-size: 15pt; @@ -26,7 +23,6 @@ h3.ui.header { } h4.ui.header { - font-family: "Open Sans"; font-weight: bold; line-height: 15pt; font-size: 15pt; diff --git a/frontend/src/semantic-ui/site/elements/list.overrides b/frontend/src/semantic-ui/site/elements/list.overrides index 6f085f9..95bb3f4 100644 --- a/frontend/src/semantic-ui/site/elements/list.overrides +++ b/frontend/src/semantic-ui/site/elements/list.overrides @@ -1,3 +1,12 @@ /******************************* User Variable Overrides *******************************/ + + +.ui.list{ + .item{ + .header{ + margin-bottom: 5px; + } + } +} diff --git a/frontend/src/semantic-ui/site/globals/site.variables b/frontend/src/semantic-ui/site/globals/site.variables index af864b3..dcab9c2 100644 --- a/frontend/src/semantic-ui/site/globals/site.variables +++ b/frontend/src/semantic-ui/site/globals/site.variables @@ -3,8 +3,8 @@ *******************************/ @importGoogleFonts : false; -@fontName : 'Open Sans'; - +@fontName : 'Noto Sans', 'Roboto', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Oxygen', 'Ubuntu', 'Cantarell', + 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif; @obsColorB4: #114594; @obsColorG1: #76520E; @obsColorW: #FFFFFF; diff --git a/frontend/src/semantic-ui/site/views/statistic.overrides b/frontend/src/semantic-ui/site/views/statistic.overrides index 6f085f9..393ef8a 100644 --- a/frontend/src/semantic-ui/site/views/statistic.overrides +++ b/frontend/src/semantic-ui/site/views/statistic.overrides @@ -1,3 +1,7 @@ /******************************* User Variable Overrides *******************************/ + +.ui.statistic .label{ + font-size: 13px; +} diff --git a/frontend/src/styles.less b/frontend/src/styles.less index 1e66c75..7d683cc 100644 --- a/frontend/src/styles.less +++ b/frontend/src/styles.less @@ -9,6 +9,9 @@ @secondaryColor: @obsColorG1; @borderColor: #e0e0e0; +@fontFamilyDefault: 'Noto Sans', 'Roboto', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Oxygen', 'Ubuntu', 'Cantarell', +'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif; + @menuHeight: 50px; @menuHeightMobile: 220px;