Set assetsBasePath (DevExpress#47)

marcwittke · Oct 3, 2018 · 02b2d3d · 02b2d3d
1 parent e5ab383
commit 02b2d3d
Show file tree

Hide file tree

Showing 28 changed files with 511 additions and 212 deletions.
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e",
-    "build-themes": "devextreme build && copyfiles -u 4 \"./node_modules/devextreme/dist/css/@(icons|fonts)/*.*\" \"./src/themes/generated/\""
+    "build-themes": "devextreme build"
   },
   "private": true,
   "dependencies": {
@@ -41,7 +41,6 @@
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "~8.9.4",
     "codelyzer": "~4.2.1",
-    "copyfiles": "^2.1.0",
     "devextreme-cli": "latest",
     "jasmine-core": "~2.99.1",
     "jasmine-spec-reporter": "~4.2.1",

diff --git a/src/themes/generated/fonts/Roboto-300.ttf b/src/themes/generated/fonts/Roboto-300.ttf
diff --git a/src/themes/generated/fonts/Roboto-300.woff b/src/themes/generated/fonts/Roboto-300.woff
diff --git a/src/themes/generated/fonts/Roboto-300.woff2 b/src/themes/generated/fonts/Roboto-300.woff2
diff --git a/src/themes/generated/fonts/Roboto-400.ttf b/src/themes/generated/fonts/Roboto-400.ttf
diff --git a/src/themes/generated/fonts/Roboto-400.woff b/src/themes/generated/fonts/Roboto-400.woff
diff --git a/src/themes/generated/fonts/Roboto-400.woff2 b/src/themes/generated/fonts/Roboto-400.woff2
diff --git a/src/themes/generated/fonts/Roboto-500.ttf b/src/themes/generated/fonts/Roboto-500.ttf
diff --git a/src/themes/generated/fonts/Roboto-500.woff b/src/themes/generated/fonts/Roboto-500.woff
diff --git a/src/themes/generated/fonts/Roboto-500.woff2 b/src/themes/generated/fonts/Roboto-500.woff2
diff --git a/src/themes/generated/fonts/Roboto-700.ttf b/src/themes/generated/fonts/Roboto-700.ttf
diff --git a/src/themes/generated/fonts/Roboto-700.woff b/src/themes/generated/fonts/Roboto-700.woff
diff --git a/src/themes/generated/fonts/Roboto-700.woff2 b/src/themes/generated/fonts/Roboto-700.woff2
diff --git a/src/themes/generated/icons/dxicons.ttf b/src/themes/generated/icons/dxicons.ttf
diff --git a/src/themes/generated/icons/dxicons.woff b/src/themes/generated/icons/dxicons.woff
diff --git a/src/themes/generated/icons/dxicons.woff2 b/src/themes/generated/icons/dxicons.woff2
diff --git a/src/themes/generated/icons/dxiconsios.ttf b/src/themes/generated/icons/dxiconsios.ttf
diff --git a/src/themes/generated/icons/dxiconsios.woff b/src/themes/generated/icons/dxiconsios.woff
diff --git a/src/themes/generated/icons/dxiconsios.woff2 b/src/themes/generated/icons/dxiconsios.woff2
diff --git a/src/themes/generated/icons/dxiconsmaterial.ttf b/src/themes/generated/icons/dxiconsmaterial.ttf
diff --git a/src/themes/generated/icons/dxiconsmaterial.woff b/src/themes/generated/icons/dxiconsmaterial.woff
diff --git a/src/themes/generated/icons/dxiconsmaterial.woff2 b/src/themes/generated/icons/dxiconsmaterial.woff2
diff --git a/src/themes/generated/theme.additional.css b/src/themes/generated/theme.additional.css
diff --git a/src/themes/generated/theme.base.css b/src/themes/generated/theme.base.css
diff --git a/src/themes/generated/variables.additional.scss b/src/themes/generated/variables.additional.scss
@@ -1,5 +1,5 @@
-$base-text-color: #fff;
 $base-bg: #363640;
+$base-text-color: #fff;
 $base-border-color: #515159;
 $base-border-radius: 4px;
 $base-accent: #FF5722;
diff --git a/src/themes/generated/variables.base.scss b/src/themes/generated/variables.base.scss
@@ -1,5 +1,5 @@
-$base-text-color: rgba(0, 0, 0, 0.87);
 $base-bg: #fff;
+$base-text-color: rgba(0, 0, 0, 0.87);
 $base-border-color: #e0e0e0;
 $base-border-radius: 4px;
 $base-accent: #FF5722;
diff --git a/src/themes/metadata.additional.json b/src/themes/metadata.additional.json
@@ -5,6 +5,7 @@
     "hue": null,
     "items": [],
     "baseTheme": "material.orange.dark",
+    "assetsBasePath": "../../../node_modules/devextreme/dist/css/",
     "outputColorScheme": "additional",
     "makeSwatch": true,
     "base": true

diff --git a/src/themes/metadata.base.json b/src/themes/metadata.base.json
@@ -5,6 +5,7 @@
     "hue": null,
     "items": [],
     "baseTheme": "material.orange.light",
+    "assetsBasePath": "../../../node_modules/devextreme/dist/css/",
     "outputColorScheme": "base",
     "base": true
 }