diff --git a/build/copy-css.js b/build/copy-css.js index 33183733b..ee9801836 100644 --- a/build/copy-css.js +++ b/build/copy-css.js @@ -1,4 +1,4 @@ -// Copy cdr-fonts and cdr-reset to root folder. +// Copy cdr-fonts, cdr-reset, and cdr-palette to root folder. // Cedar 15 expects these files to be in root. // For 16, it would be helpful to remove this and have all styles in /style. @@ -7,6 +7,6 @@ const fs = require('fs-extra'); const DIST = 'dist'; -['cdr-fonts.css', 'cdr-reset.css'].forEach(file => { +['cdr-fonts.css', 'cdr-reset.css', 'cdr-palette.css'].forEach(file => { fs.copyFileSync(path.join(DIST, '/style', file), path.join(DIST, file)); }) \ No newline at end of file diff --git a/src/components/layout/examples/Layout.vue b/src/components/layout/examples/Layout.vue index 5be57f8f5..885fec28c 100644 --- a/src/components/layout/examples/Layout.vue +++ b/src/components/layout/examples/Layout.vue @@ -17,7 +17,6 @@ const layouts: LayoutExample[] = [ { label: 'Basic columns', props: { - gap: 'one-x', columns: 2, }, children: 2, diff --git a/src/components/surface/CdrSurface.vue b/src/components/surface/CdrSurface.vue index 95ec2a506..c63795ca1 100644 --- a/src/components/surface/CdrSurface.vue +++ b/src/components/surface/CdrSurface.vue @@ -18,19 +18,25 @@ const props = withDefaults(defineProps(), { shadow: 'flat', tag: 'div', withBorder: false, + palette: 'default', }); const style = useCssModule(); const rootProps = computed(() => { const { classes } = getSurfaceProps(props, 'cdr-surface'); - return { class: mapClasses(style, ...classes) || undefined }; + const { palette } = props; // Assuming 'palette' is a prop passed to your component + return { + class: mapClasses(style, ...classes) || undefined, + 'data-palette': palette || undefined, + }; }); +