Browse Source

Add align-content

pull/1710/head
David Polak 7 years ago
parent
commit
d77b5f19de
  1. 1
      src/editor/config/config.js
  2. 15
      src/style_manager/model/PropertyFactory.js

1
src/editor/config/config.js

@ -220,6 +220,7 @@ module.exports = {
'flex-wrap',
'justify-content',
'align-items',
'align-content',
'position',
'top',
'right',

15
src/style_manager/model/PropertyFactory.js

@ -76,6 +76,7 @@ module.exports = () => ({
case 'flex-wrap':
case 'justify-content':
case 'align-items':
case 'align-content':
case 'font-family':
case 'font-weight':
case 'border-style':
@ -182,6 +183,9 @@ module.exports = () => ({
case 'align-items':
obj.defaults = 'stretch';
break;
case 'align-content':
obj.defaults = 'stretch';
break;
case 'position':
obj.defaults = 'static';
break;
@ -298,6 +302,7 @@ module.exports = () => ({
case 'flex-wrap':
case 'justify-content':
case 'align-items':
case 'align-content':
obj.requires = { display: ['flex'] };
break;
}
@ -477,6 +482,16 @@ module.exports = () => ({
{ value: 'stretch' }
];
break;
case 'align-content':
obj.list = [
{ value: 'flex-start' },
{ value: 'flex-end' },
{ value: 'center' },
{ value: 'space-between' },
{ value: 'space-around' },
{ value: 'stretch' }
];
break;
case 'position':
obj.list = [
{ value: 'static' },

Loading…
Cancel
Save