Skip to content

Commit

Permalink
Allow addonOverride for columns-block style
Browse files Browse the repository at this point in the history
  • Loading branch information
razvanMiu committed Apr 15, 2021
1 parent cdbf242 commit 0821bc3
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/ColumnsBlock/ColumnsBlockEdit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 11 additions & 1 deletion src/ColumnsBlock/styles.less → src/less/columns.less
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
@import './globals.less';

@addon: 'volto-addons';
@addontype: 'columnsBlock';
@addonelement: 'columns';

.loadAddonVariables();

@type: 'extra';
@element: 'custom';

Expand Down Expand Up @@ -174,7 +182,7 @@
}

.ui.grid.column-grid {
padding: 1rem;
padding: @columnGridPadding;
margin-top: 0.8rem;
margin-bottom: 0.8rem;
}
Expand Down Expand Up @@ -214,3 +222,5 @@
margin-right: 1.5rem;
vertical-align: middle;
}

.loadAddonOverrides();
1 change: 1 addition & 0 deletions src/less/columns.variables
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@columnGridPadding: 0;
16 changes: 16 additions & 0 deletions src/less/globals.less
Original file line number Diff line number Diff line change
@@ -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';
2 changes: 2 additions & 0 deletions src/less/variables.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@type: extra;
@element: custom;

0 comments on commit 0821bc3

Please sign in to comment.