Browse Source

Merge pull request #2881 from adriangroch/convert-helvetica-to-sans-serif

pull/2890/head
Artur Arseniev 6 years ago
committed by GitHub
parent
commit
2067ca1756
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/style_manager/model/PropertyFactory.js
  2. 2
      test/specs/style_manager/model/Models.js

2
src/style_manager/model/PropertyFactory.js

@ -548,7 +548,7 @@ export default () => ({
'Comic Sans MS, cursive' + ss, 'Comic Sans MS, cursive' + ss,
'Courier New, Courier, monospace', 'Courier New, Courier, monospace',
'Georgia, serif', 'Georgia, serif',
'Helvetica, serif', 'Helvetica' + ss,
'Impact, Charcoal' + ss, 'Impact, Charcoal' + ss,
'Lucida Sans Unicode, Lucida Grande' + ss, 'Lucida Sans Unicode, Lucida Grande' + ss,
'Tahoma, Geneva' + ss, 'Tahoma, Geneva' + ss,

2
test/specs/style_manager/model/Models.js

@ -664,7 +664,7 @@ describe('PropertyFactory', () => {
{ name: 'Comic Sans MS', value: 'Comic Sans MS, cursive' + ss }, { name: 'Comic Sans MS', value: 'Comic Sans MS, cursive' + ss },
{ name: 'Courier New', value: 'Courier New, Courier' + ms }, { name: 'Courier New', value: 'Courier New, Courier' + ms },
{ name: 'Georgia', value: 'Georgia, serif' }, { name: 'Georgia', value: 'Georgia, serif' },
{ name: 'Helvetica', value: 'Helvetica, serif' }, { name: 'Helvetica', value: 'Helvetica' + ss },
{ name: 'Impact', value: 'Impact, Charcoal' + ss }, { name: 'Impact', value: 'Impact, Charcoal' + ss },
{ {
name: 'Lucida Sans Unicode', name: 'Lucida Sans Unicode',

Loading…
Cancel
Save