ashatora/editor
1
0
Fork 0
mirror of https://github.com/maputnik/editor.git synced 2025-12-25 23:50:02 +00:00
Code Issues Projects Releases Wiki Activity

Simplify font stacks and limit to one default value

Browse Source
This commit is contained in:
Lukas Martinelli
2016-12-30 18:56:16 +01:00
parent 0b99e571c4
commit f2dd785e7b
2 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/inputs/FontInput.jsx
View File

@@ -3,12 +3,7 @@ import SelectInput from './SelectInput'
import input from '../../config/input.js'
//TODO: Query available font stack dynamically
import fontFamilies from '../../config/fontstacks.json'
let fontStacks = []
Object.keys(fontFamilies).forEach(family => {
fontStacks = fontStacks.concat(fontFamilies[family])
})
import fontStacks from '../../config/fontstacks.json'
class FontInput extends React.Component {
static propTypes = {
@@ -18,7 +13,7 @@ class FontInput extends React.Component {
}
get values() {
return this.props.value || this.props.default || []
return this.props.value || this.props.default.slice(1) || []
}
changeFont(idx, newValue) {

14
src/config/fontstacks.json
View File

@@ -1,5 +1,4 @@
{
"Metropolis": [
[
"Metropolis Black Italic",
"Metropolis Black",
"Metropolis Bold Italic",
@@ -17,9 +16,7 @@
"Metropolis Semi Bold Italic",
"Metropolis Semi Bold",
"Metropolis Thin Italic",
"Metropolis Thin"
],
"Open Sans": [
"Metropolis Thin",
"Open Sans Bold Italic",
"Open Sans Bold",
"Open Sans Extra Bold Italic",
@@ -29,13 +26,10 @@
"Open Sans Light",
"Open Sans Regular",
"Open Sans Semibold Italic",
"Open Sans Semibold"
],
"Klokantech Noto Sans": [
"Open Sans Semibold",
"Klokantech Noto Sans Bold",
"Klokantech Noto Sans CJK Bold",
"Klokantech Noto Sans CJK Regular",
"Klokantech Noto Sans Italic",
"Klokantech Noto Sans Regular"
]
}
]