From eb40152143157e7ee162f647c47616e0b1bc3508 Mon Sep 17 00:00:00 2001 From: David Polak Date: Fri, 4 Jan 2019 18:19:21 +0100 Subject: [PATCH] Add flex-shrink --- src/editor/config/config.js | 3 ++- src/style_manager/model/PropertyFactory.js | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/editor/config/config.js b/src/editor/config/config.js index 320d4ac92..4f5821107 100644 --- a/src/editor/config/config.js +++ b/src/editor/config/config.js @@ -233,7 +233,8 @@ module.exports = { 'align-items', 'align-content', 'order', - 'flex-grow' + 'flex-grow', + 'flex-shrink' ] }, { diff --git a/src/style_manager/model/PropertyFactory.js b/src/style_manager/model/PropertyFactory.js index b2876d82f..9b11f0e88 100644 --- a/src/style_manager/model/PropertyFactory.js +++ b/src/style_manager/model/PropertyFactory.js @@ -135,6 +135,7 @@ module.exports = () => ({ case 'transform-scale-z': case 'order': case 'flex-grow': + case 'flex-shrink': obj.type = 'integer'; break; case 'margin': @@ -227,6 +228,7 @@ module.exports = () => ({ case 'transform-scale-x': case 'transform-scale-y': case 'transform-scale-z': + case 'flex-shrink': obj.defaults = 1; break; case 'box-shadow-blur': @@ -311,6 +313,7 @@ module.exports = () => ({ break; case 'order': case 'flex-grow': + case 'flex-shrink': obj.requiresParent = { display: ['flex'] }; break; }