From d77b5f19de4ba635a5bec43aed9845dbd0073dc0 Mon Sep 17 00:00:00 2001 From: David Polak Date: Fri, 4 Jan 2019 14:03:28 +0100 Subject: [PATCH] Add align-content --- src/editor/config/config.js | 1 + src/style_manager/model/PropertyFactory.js | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/editor/config/config.js b/src/editor/config/config.js index 3dc9f056e..645349c52 100644 --- a/src/editor/config/config.js +++ b/src/editor/config/config.js @@ -220,6 +220,7 @@ module.exports = { 'flex-wrap', 'justify-content', 'align-items', + 'align-content', 'position', 'top', 'right', diff --git a/src/style_manager/model/PropertyFactory.js b/src/style_manager/model/PropertyFactory.js index 73a41ddd6..a159562b8 100644 --- a/src/style_manager/model/PropertyFactory.js +++ b/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' },