diff --git a/gulpfile.js b/gulpfile.js index 995c7be8649..48875b73ecc 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -63,21 +63,41 @@ function writeSwatches( cwds, options ) { }); } -function swatchJsonTransformer(json) { - const sassContent = []; - let { groups } = json; +function swatchJsonTransformer( json ) { + const variables = []; - groups.forEach( (group) => { + json.groups.forEach( (group) => { for ( const [ name, meta ] of Object.entries(group.variables) ) { - sassContent.push(`$${name}: ${meta.value};`); + variables.push({ name: name, value: meta.value }); } }); - sassContent.push(''); + const templates = { + modern: () => { + const sassContent = []; - sassContent.push(`@import "all.scss";`); + sassContent.push(`@use "../scss/index.scss" as kendo-theme;`); + sassContent.push(variables.map( (variable) => `kendo-theme.$${variable.name}: ${variable.value};`).join( '\n' )); + sassContent.push(`@include kendo-theme.config();`); + sassContent.push(`@include kendo-theme.styles();`); - return sassContent.join( '\n' ); + return sassContent.join( '\n' ); + }, + legacy: () => { + const sassContent = []; + + sassContent.push(variables.map( (variable) => `$${variable.name}: ${variable.value};`).join( '\n' )); + sassContent.push(`@import "all.scss";`); + + return sassContent.join( '\n' ); + } + }; + + if ( json.api === 'modern' ) { + return templates.modern(); + } + + return templates.legacy(); } // #endregion diff --git a/packages/classic/lib/swatches/classic-green-dark.json b/packages/classic/lib/swatches/classic-green-dark.json index 7aa94ef46bf..1db006b6dad 100644 --- a/packages/classic/lib/swatches/classic-green-dark.json +++ b/packages/classic/lib/swatches/classic-green-dark.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-classic", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#000000", "#131413", diff --git a/packages/classic/lib/swatches/classic-green.json b/packages/classic/lib/swatches/classic-green.json index edbac55def9..b772479c987 100644 --- a/packages/classic/lib/swatches/classic-green.json +++ b/packages/classic/lib/swatches/classic-green.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-classic", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#ffffff", "#f3f4f3", diff --git a/packages/classic/lib/swatches/classic-main-dark.json b/packages/classic/lib/swatches/classic-main-dark.json index 21848eebdf5..7c07a8d3869 100644 --- a/packages/classic/lib/swatches/classic-main-dark.json +++ b/packages/classic/lib/swatches/classic-main-dark.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-classic", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#000000", "#101010", diff --git a/packages/classic/lib/swatches/classic-main.json b/packages/classic/lib/swatches/classic-main.json index 9290d1b366f..12c4316e3e3 100644 --- a/packages/classic/lib/swatches/classic-main.json +++ b/packages/classic/lib/swatches/classic-main.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-classic", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#ffffff", "#f0f0f0", diff --git a/packages/classic/lib/swatches/classic-opal-dark.json b/packages/classic/lib/swatches/classic-opal-dark.json index 7ca328f9935..72f5d1a0af1 100644 --- a/packages/classic/lib/swatches/classic-opal-dark.json +++ b/packages/classic/lib/swatches/classic-opal-dark.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-classic", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#000000", "#1e242d", diff --git a/packages/classic/lib/swatches/classic-opal.json b/packages/classic/lib/swatches/classic-opal.json index 4c80c986a9c..aae8b308151 100644 --- a/packages/classic/lib/swatches/classic-opal.json +++ b/packages/classic/lib/swatches/classic-opal.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-classic", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#ffffff", "#def4fd", diff --git a/packages/classic/lib/swatches/classic-silver-dark.json b/packages/classic/lib/swatches/classic-silver-dark.json index 87e2e6ae4e1..49c52b9d0b7 100644 --- a/packages/classic/lib/swatches/classic-silver-dark.json +++ b/packages/classic/lib/swatches/classic-silver-dark.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-classic", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#000000", "#131314", diff --git a/packages/classic/lib/swatches/classic-silver.json b/packages/classic/lib/swatches/classic-silver.json index 3878c351ff0..68e3cd04736 100644 --- a/packages/classic/lib/swatches/classic-silver.json +++ b/packages/classic/lib/swatches/classic-silver.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-classic", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#ffffff", "#f3f3f4", diff --git a/packages/default/lib/swatches/default-dataviz-v4.json b/packages/default/lib/swatches/default-dataviz-v4.json index 8794bb2f76d..7d91ea14184 100644 --- a/packages/default/lib/swatches/default-dataviz-v4.json +++ b/packages/default/lib/swatches/default-dataviz-v4.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-default", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#ff6358", "#ffd246", diff --git a/packages/default/lib/swatches/default-green.json b/packages/default/lib/swatches/default-green.json index 0b36021abe5..671e3ff18ef 100644 --- a/packages/default/lib/swatches/default-green.json +++ b/packages/default/lib/swatches/default-green.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-default", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#ffffff", "#f5f5f5", diff --git a/packages/default/lib/swatches/default-main-dark.json b/packages/default/lib/swatches/default-main-dark.json index 6f14d0b9fdb..bf44089d747 100644 --- a/packages/default/lib/swatches/default-main-dark.json +++ b/packages/default/lib/swatches/default-main-dark.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-default", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#000000", "#151515", diff --git a/packages/default/lib/swatches/default-main.json b/packages/default/lib/swatches/default-main.json index 393be865b11..80c0e13a499 100644 --- a/packages/default/lib/swatches/default-main.json +++ b/packages/default/lib/swatches/default-main.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-default", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#ffffff", "#f5f5f5", diff --git a/packages/default/lib/swatches/default-nordic.json b/packages/default/lib/swatches/default-nordic.json index cbeaa8712b7..782ba01fc3a 100644 --- a/packages/default/lib/swatches/default-nordic.json +++ b/packages/default/lib/swatches/default-nordic.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-default", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#ffffff", "#50686e", diff --git a/packages/default/lib/swatches/default-ocean-blue.json b/packages/default/lib/swatches/default-ocean-blue.json index 26b10f7516b..1fbc1e85766 100644 --- a/packages/default/lib/swatches/default-ocean-blue.json +++ b/packages/default/lib/swatches/default-ocean-blue.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-default", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#ffffff", "#f5f5f5", diff --git a/packages/default/lib/swatches/default-orange.json b/packages/default/lib/swatches/default-orange.json index bcc4f98e8fb..c2f7013fbad 100644 --- a/packages/default/lib/swatches/default-orange.json +++ b/packages/default/lib/swatches/default-orange.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-default", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#ffffff", "#f5f5f5", diff --git a/packages/default/lib/swatches/default-purple.json b/packages/default/lib/swatches/default-purple.json index 674ca023d04..06818cd0790 100644 --- a/packages/default/lib/swatches/default-purple.json +++ b/packages/default/lib/swatches/default-purple.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-default", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#ffffff", "#f5f5f5", diff --git a/packages/default/lib/swatches/default-turquoise.json b/packages/default/lib/swatches/default-turquoise.json index f8b0e35ff9b..6c5369cb7b0 100644 --- a/packages/default/lib/swatches/default-turquoise.json +++ b/packages/default/lib/swatches/default-turquoise.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-default", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#ffffff", "#f5f5f5", diff --git a/packages/default/lib/swatches/default-urban.json b/packages/default/lib/swatches/default-urban.json index b79ec1644f9..7779f0ee083 100644 --- a/packages/default/lib/swatches/default-urban.json +++ b/packages/default/lib/swatches/default-urban.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-default", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#ffffff", "#e3eef4", diff --git a/packages/fluent/lib/swatches/all.json b/packages/fluent/lib/swatches/all.json new file mode 100644 index 00000000000..484421f43d0 --- /dev/null +++ b/packages/fluent/lib/swatches/all.json @@ -0,0 +1,17 @@ +{ + "$schema": "https://unpkg.com/@progress/kendo-theme-tasks@1.14.0/lib/schemas/kendo-swatch.json", + "name": "All", + "product": "kendo", + "base": "@progress/kendo-theme-fluent", + "version": "5.1.2-dev.7", + "api": "modern", + "previewColors": [ + "#ffffff", + "#f5f5f5", + "#ff6358", + "#d6534a", + "#424242" + ], + "components": [], + "groups": [] +} diff --git a/packages/fluent/lib/swatches/fluent-main.json b/packages/fluent/lib/swatches/fluent-main.json new file mode 100644 index 00000000000..ba6b6a2db60 --- /dev/null +++ b/packages/fluent/lib/swatches/fluent-main.json @@ -0,0 +1,17 @@ +{ + "$schema": "https://unpkg.com/@progress/kendo-theme-tasks@1.14.0/lib/schemas/kendo-swatch.json", + "name": "Fluent Main", + "product": "kendo", + "base": "@progress/kendo-theme-fluent", + "version": "5.1.2-dev.7", + "api": "modern", + "previewColors": [ + "#ffffff", + "#f5f5f5", + "#ff6358", + "#d6534a", + "#424242" + ], + "components": [], + "groups": [] +} diff --git a/packages/material/lib/swatches/material-aqua-dark.json b/packages/material/lib/swatches/material-aqua-dark.json index 2b956fb9628..cecc93a7bfd 100644 --- a/packages/material/lib/swatches/material-aqua-dark.json +++ b/packages/material/lib/swatches/material-aqua-dark.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-material", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#121212", "#212121", diff --git a/packages/material/lib/swatches/material-arctic.json b/packages/material/lib/swatches/material-arctic.json index bcd1f1970f7..d63e4ae4caf 100644 --- a/packages/material/lib/swatches/material-arctic.json +++ b/packages/material/lib/swatches/material-arctic.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-material", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#ffffff", "#e0e0e0", diff --git a/packages/material/lib/swatches/material-burnt-teal.json b/packages/material/lib/swatches/material-burnt-teal.json index e34131298cf..bd54c5f9ddf 100644 --- a/packages/material/lib/swatches/material-burnt-teal.json +++ b/packages/material/lib/swatches/material-burnt-teal.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-material", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#ffffff", "#e0e0e0", diff --git a/packages/material/lib/swatches/material-dataviz-v4.json b/packages/material/lib/swatches/material-dataviz-v4.json index 9c41a220219..528c28f495f 100644 --- a/packages/material/lib/swatches/material-dataviz-v4.json +++ b/packages/material/lib/swatches/material-dataviz-v4.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-material", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#3f51b5", "#2196f3", diff --git a/packages/material/lib/swatches/material-eggplant.json b/packages/material/lib/swatches/material-eggplant.json index b4581638906..5e6f2d175fa 100644 --- a/packages/material/lib/swatches/material-eggplant.json +++ b/packages/material/lib/swatches/material-eggplant.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-material", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#ffffff", "#e0e0e0", diff --git a/packages/material/lib/swatches/material-lime-dark.json b/packages/material/lib/swatches/material-lime-dark.json index 78710c89602..3ed80039940 100644 --- a/packages/material/lib/swatches/material-lime-dark.json +++ b/packages/material/lib/swatches/material-lime-dark.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-material", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#121212", "#212121", diff --git a/packages/material/lib/swatches/material-lime.json b/packages/material/lib/swatches/material-lime.json index 02f8d1c8f71..2c29e95863b 100644 --- a/packages/material/lib/swatches/material-lime.json +++ b/packages/material/lib/swatches/material-lime.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-material", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#ffffff", "#e0e0e0", diff --git a/packages/material/lib/swatches/material-main-dark.json b/packages/material/lib/swatches/material-main-dark.json index 74423e0b32b..421af7673bd 100644 --- a/packages/material/lib/swatches/material-main-dark.json +++ b/packages/material/lib/swatches/material-main-dark.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-material", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#121212", "#212121", diff --git a/packages/material/lib/swatches/material-main.json b/packages/material/lib/swatches/material-main.json index 9ba9f53f7d1..42cac0e7713 100644 --- a/packages/material/lib/swatches/material-main.json +++ b/packages/material/lib/swatches/material-main.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-material", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#ffffff", "#e0e0e0", diff --git a/packages/material/lib/swatches/material-nova.json b/packages/material/lib/swatches/material-nova.json index f5674dc5820..a116b2bf92d 100644 --- a/packages/material/lib/swatches/material-nova.json +++ b/packages/material/lib/swatches/material-nova.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-material", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#ffffff", "#e0e0e0", diff --git a/packages/material/lib/swatches/material-pacific-dark.json b/packages/material/lib/swatches/material-pacific-dark.json index 4a4118643a5..5031a2c9f41 100644 --- a/packages/material/lib/swatches/material-pacific-dark.json +++ b/packages/material/lib/swatches/material-pacific-dark.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-material", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#121212", "#212121", diff --git a/packages/material/lib/swatches/material-pacific.json b/packages/material/lib/swatches/material-pacific.json index 82a6418a7b1..33b61276d57 100644 --- a/packages/material/lib/swatches/material-pacific.json +++ b/packages/material/lib/swatches/material-pacific.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-material", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#ffffff", "#e0e0e0", diff --git a/packages/material/lib/swatches/material-sky-dark.json b/packages/material/lib/swatches/material-sky-dark.json index 6fe78cf4520..8a119595dcd 100644 --- a/packages/material/lib/swatches/material-sky-dark.json +++ b/packages/material/lib/swatches/material-sky-dark.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-material", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#121212", "#212121", diff --git a/packages/material/lib/swatches/material-sky.json b/packages/material/lib/swatches/material-sky.json index 207977ebcc3..335fdb27248 100644 --- a/packages/material/lib/swatches/material-sky.json +++ b/packages/material/lib/swatches/material-sky.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-material", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#ffffff", "#e0e0e0", diff --git a/packages/material/lib/swatches/material-smoke.json b/packages/material/lib/swatches/material-smoke.json index 19f201f23da..7df7eee1840 100644 --- a/packages/material/lib/swatches/material-smoke.json +++ b/packages/material/lib/swatches/material-smoke.json @@ -4,6 +4,7 @@ "product": "kendo", "base": "@progress/kendo-theme-material", "version": "5.1.2-dev.7", + "api": "legacy", "previewColors": [ "#ffffff", "#e0e0e0", diff --git a/sass-swatches.config.js b/sass-swatches.config.js index 3e5472cdcb1..8c1e8deaae5 100644 --- a/sass-swatches.config.js +++ b/sass-swatches.config.js @@ -21,17 +21,9 @@ module.exports = { }, { cwd: 'packages/fluent', - file: 'scss/all.scss', - outFile: 'dist/all.css', - compiler: 'sass-embedded', - api: 'modern' - }, - { - cwd: 'packages/fluent', - file: 'scss/all.scss', - outFile: 'dist/fluent-main.css', - compiler: 'sass-embedded', - api: 'modern' + entry: [ 'dist/!(_|variables)*.scss' ], + api: "modern", + compiler: "sass-embedded" } ] };