From 0821bc3e4ee144433e1d4b0608b4d67e3c5158bc Mon Sep 17 00:00:00 2001 From: razvanMiu Date: Thu, 15 Apr 2021 15:27:14 +0300 Subject: [PATCH] Allow addonOverride for columns-block style --- src/ColumnsBlock/ColumnsBlockEdit.jsx | 2 +- .../styles.less => less/columns.less} | 12 +++++++++++- src/less/columns.variables | 1 + src/less/globals.less | 16 ++++++++++++++++ src/less/variables.less | 2 ++ 5 files changed, 31 insertions(+), 2 deletions(-) rename src/{ColumnsBlock/styles.less => less/columns.less} (95%) create mode 100644 src/less/columns.variables create mode 100644 src/less/globals.less create mode 100644 src/less/variables.less diff --git a/src/ColumnsBlock/ColumnsBlockEdit.jsx b/src/ColumnsBlock/ColumnsBlockEdit.jsx index 60f212d..b5d0918 100644 --- a/src/ColumnsBlock/ColumnsBlockEdit.jsx +++ b/src/ColumnsBlock/ColumnsBlockEdit.jsx @@ -31,7 +31,7 @@ import { makeStyleSchema, getStyle } from '@eeacms/volto-columns-block/Styles'; import tuneSVG from '@plone/volto/icons/column.svg'; import upSVG from '@plone/volto/icons/up.svg'; -import './styles.less'; +import '@eeacms/volto-columns-block/less/columns.less'; /* * not pretty, there's a lot of render props passing, to please React diff --git a/src/ColumnsBlock/styles.less b/src/less/columns.less similarity index 95% rename from src/ColumnsBlock/styles.less rename to src/less/columns.less index 5448ef2..f772479 100644 --- a/src/ColumnsBlock/styles.less +++ b/src/less/columns.less @@ -1,3 +1,11 @@ + @import './globals.less'; + +@addon: 'volto-addons'; +@addontype: 'columnsBlock'; +@addonelement: 'columns'; + +.loadAddonVariables(); + @type: 'extra'; @element: 'custom'; @@ -174,7 +182,7 @@ } .ui.grid.column-grid { - padding: 1rem; + padding: @columnGridPadding; margin-top: 0.8rem; margin-bottom: 0.8rem; } @@ -214,3 +222,5 @@ margin-right: 1.5rem; vertical-align: middle; } + +.loadAddonOverrides(); \ No newline at end of file diff --git a/src/less/columns.variables b/src/less/columns.variables new file mode 100644 index 0000000..5f9132e --- /dev/null +++ b/src/less/columns.variables @@ -0,0 +1 @@ +@columnGridPadding: 0; \ No newline at end of file diff --git a/src/less/globals.less b/src/less/globals.less new file mode 100644 index 0000000..220e7ff --- /dev/null +++ b/src/less/globals.less @@ -0,0 +1,16 @@ +@import (multiple, reference, optional) '../../theme.config'; + +/* Enables customization of addons */ +.loadAddonOverrides() { + @import (optional) + '@{siteFolder}/../addons/@{addon}/@{addontype}s/@{addonelement}.overrides'; +} + +/* Helper to load variables */ +.loadAddonVariables() { + @import (optional) '@{addonelement}.variables'; + @import (optional) + '@{siteFolder}/../addons/@{addon}/@{addontype}s/@{addonelement}.variables'; +} + +@import './variables.less'; \ No newline at end of file diff --git a/src/less/variables.less b/src/less/variables.less new file mode 100644 index 0000000..ce773d9 --- /dev/null +++ b/src/less/variables.less @@ -0,0 +1,2 @@ +@type: extra; +@element: custom; \ No newline at end of file