diff --git a/client/web/compose/src/components/PageBlocks/Configurator.vue b/client/web/compose/src/components/PageBlocks/Configurator.vue index ca3268dde..d3987e82d 100644 --- a/client/web/compose/src/components/PageBlocks/Configurator.vue +++ b/client/web/compose/src/components/PageBlocks/Configurator.vue @@ -90,6 +90,13 @@ > {{ $t('general.wrap') }} + + + {{ $t('general.border') }} + diff --git a/client/web/compose/src/components/PageBlocks/Wrap/Card.vue b/client/web/compose/src/components/PageBlocks/Wrap/Card.vue index a32765bb6..4de9bfa4d 100644 --- a/client/web/compose/src/components/PageBlocks/Wrap/Card.vue +++ b/client/web/compose/src/components/PageBlocks/Wrap/Card.vue @@ -2,7 +2,7 @@
@@ -35,6 +40,9 @@ export class PageBlock { wrap: { kind: 'card', }, + border: { + enabled: false, + }, } constructor (i?: PageBlockInput) { diff --git a/locale/en/corteza-webapp-compose/block.yaml b/locale/en/corteza-webapp-compose/block.yaml index c285cf7c4..b69326e38 100644 --- a/locale/en/corteza-webapp-compose/block.yaml +++ b/locale/en/corteza-webapp-compose/block.yaml @@ -114,6 +114,7 @@ general: descriptionPlaceholder: Block description headerStyle: Block header style (color) wrap: Display block as a card + border: Show border label: add: Add back: Back diff --git a/server/compose/types/page.go b/server/compose/types/page.go index 584ad0a4d..7e5b1fe9c 100644 --- a/server/compose/types/page.go +++ b/server/compose/types/page.go @@ -71,8 +71,9 @@ type ( } PageBlockStyle struct { - Variants map[string]string `json:"variants,omitempty"` - Wrap map[string]string `json:"wrap,omitempty"` + Variants map[string]string `json:"variants,omitempty"` + Wrap map[string]string `json:"wrap,omitempty"` + Border map[string]interface{} `json:"border,omitempty"` } PageButton struct {