Fix/default font family (#347)

* remove 'Open Sans' references

* set default font-family

(use the font-family list that was set in index.css)

* small style tweaks to compensate effect of new base font-family

---------

Co-authored-by: yyxcv <yxcv@github.com>
This commit is contained in:
yyxcv 2023-06-22 21:40:24 +02:00 committed by GitHub
parent 5b91449749
commit d29c68432d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 28 additions and 22 deletions

View file

@ -69,7 +69,6 @@
} }
.pageTitle a { .pageTitle a {
font-family: 'Open Sans Condensed';
font-weight: 600; font-weight: 600;
font-size: 18pt; font-size: 18pt;

View file

@ -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;
}

View file

@ -3,7 +3,7 @@ import {Settings} from 'luxon'
import ReactDOM from 'react-dom' import ReactDOM from 'react-dom'
import 'fomantic-ui-less/semantic.less' import 'fomantic-ui-less/semantic.less'
import './index.css' import './index.less'
import App from './App' import App from './App'
import 'maplibre-gl/dist/maplibre-gl.css' import 'maplibre-gl/dist/maplibre-gl.css'

8
frontend/src/index.less Normal file
View file

@ -0,0 +1,8 @@
@import 'styles.less';
body {
margin: 0;
font-family: @fontFamilyDefault;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}

View file

@ -99,7 +99,6 @@ const getEventsTextLayer = () => ({
{ "min-fraction-digits": 2, "max-fraction-digits": 2 }, { "min-fraction-digits": 2, "max-fraction-digits": 2 },
], ],
"text-allow-overlap": true, "text-allow-overlap": true,
"text-font": ["Open Sans Bold", "Arial Unicode MS Regular"],
"text-size": 14, "text-size": 14,
"text-keep-upright": false, "text-keep-upright": false,
"text-anchor": "left", "text-anchor": "left",

View file

@ -61,7 +61,6 @@ export default function TrackMap({
layout: { layout: {
'text-field': ['number-format', ['get', p], {'min-fraction-digits': 2, 'max-fraction-digits': 2}], 'text-field': ['number-format', ['get', p], {'min-fraction-digits': 2, 'max-fraction-digits': 2}],
'text-allow-overlap': true, 'text-allow-overlap': true,
'text-font': ['Open Sans Bold', 'Arial Unicode MS Regular'],
'text-size': 14, 'text-size': 14,
'text-keep-upright': false, 'text-keep-upright': false,
'text-anchor': a, 'text-anchor': a,

View file

@ -3,22 +3,19 @@
*******************************/ *******************************/
h1.ui.header { h1.ui.header {
font-family: "Open Sans Condensed";
line-height: 35pt; line-height: 35pt;
font-size: 30pt; font-size: 30pt;
color: @obsColorB4; color: @obsColorB4;
} }
h2.ui.header { h2.ui.header {
font-family: "Open Sans"; font-weight: 400;
font-weight: 300;
line-height: 25pt; line-height: 25pt;
font-size: 20pt; font-size: 20pt;
color: @obsColorG1; color: @obsColorG1;
} }
h3.ui.header { h3.ui.header {
font-family: "Open Sans";
font-weight: normal; font-weight: normal;
line-height: 18pt; line-height: 18pt;
font-size: 15pt; font-size: 15pt;
@ -26,7 +23,6 @@ h3.ui.header {
} }
h4.ui.header { h4.ui.header {
font-family: "Open Sans";
font-weight: bold; font-weight: bold;
line-height: 15pt; line-height: 15pt;
font-size: 15pt; font-size: 15pt;

View file

@ -1,3 +1,12 @@
/******************************* /*******************************
User Variable Overrides User Variable Overrides
*******************************/ *******************************/
.ui.list{
.item{
.header{
margin-bottom: 5px;
}
}
}

View file

@ -3,8 +3,8 @@
*******************************/ *******************************/
@importGoogleFonts : false; @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; @obsColorB4: #114594;
@obsColorG1: #76520E; @obsColorG1: #76520E;
@obsColorW: #FFFFFF; @obsColorW: #FFFFFF;

View file

@ -1,3 +1,7 @@
/******************************* /*******************************
User Variable Overrides User Variable Overrides
*******************************/ *******************************/
.ui.statistic .label{
font-size: 13px;
}

View file

@ -9,6 +9,9 @@
@secondaryColor: @obsColorG1; @secondaryColor: @obsColorG1;
@borderColor: #e0e0e0; @borderColor: #e0e0e0;
@fontFamilyDefault: 'Noto Sans', 'Roboto', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Oxygen', 'Ubuntu', 'Cantarell',
'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
@menuHeight: 50px; @menuHeight: 50px;
@menuHeightMobile: 220px; @menuHeightMobile: 220px;