diff --git a/bower.json b/bower.json index fb203dfbc..8be9f3ba8 100644 --- a/bower.json +++ b/bower.json @@ -18,7 +18,6 @@ "tests" ], "dependencies": { - "open-sans-fontface": "^1.4.2", "bootstrap-tokenfield": "0.12.1", "localforage": "^1.5.2", "html2canvas": "^0.4.1", diff --git a/customize.dist/fonts/open-sans.less b/customize.dist/fonts/open-sans.less index 7a1bcbb90..9e25c3017 100644 --- a/customize.dist/fonts/open-sans.less +++ b/customize.dist/fonts/open-sans.less @@ -1,6 +1,6 @@ /* Open Sans @font-face kit */ -@OpenSansPath: "/bower_components/open-sans-fontface/fonts"; +@OpenSansPath: "/components/open-sans-fontface/fonts"; /* BEGIN Light */ @font-face { diff --git a/customize.dist/src/less2/include/loading.less b/customize.dist/src/less2/include/loading.less index 899b75cd2..2906e358f 100644 --- a/customize.dist/src/less2/include/loading.less +++ b/customize.dist/src/less2/include/loading.less @@ -6,11 +6,11 @@ #cp-loading { @font-face { font-family: 'Open Sans'; - src: url('/bower_components/open-sans-fontface/fonts/Regular/OpenSans-Regular.eot'); - src: url('/bower_components/open-sans-fontface/fonts/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'), - url('/bower_components/open-sans-fontface/fonts/Regular/OpenSans-Regular.woff') format('woff'), - url('/bower_components/open-sans-fontface/fonts/Regular/OpenSans-Regular.ttf') format('truetype'), - url('/bower_components/open-sans-fontface/fonts/Regular/OpenSans-Regular.svg#OpenSansRegular') format('svg'); + src: url('/components/open-sans-fontface/fonts/Regular/OpenSans-Regular.eot'); + src: url('/components/open-sans-fontface/fonts/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'), + url('/components/open-sans-fontface/fonts/Regular/OpenSans-Regular.woff') format('woff'), + url('/components/open-sans-fontface/fonts/Regular/OpenSans-Regular.ttf') format('truetype'), + url('/components/open-sans-fontface/fonts/Regular/OpenSans-Regular.svg#OpenSansRegular') format('svg'); font-weight: normal; font-style: normal; } diff --git a/package-lock.json b/package-lock.json index a1ae43977..17669e40c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -43,6 +43,7 @@ "less": "3.7.1", "lesshint": "6.3.7", "marked": "^1.1.0", + "open-sans-fontface": "^1.4.0", "rangy": "~1.3.0", "require-css": "0.1.10", "requirejs": "2.3.5", @@ -3351,6 +3352,12 @@ "wrappy": "1" } }, + "node_modules/open-sans-fontface": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/open-sans-fontface/-/open-sans-fontface-1.4.0.tgz", + "integrity": "sha512-d1VXrt1qPScsZnDHbZTOf1SmUnanr3KQgQM6+ye6KoFgrLo8a8mkX/J/ZJ2+w7vf0sCC02lRia5SAiaz0JPEog==", + "dev": true + }, "node_modules/optimist": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", @@ -7773,6 +7780,12 @@ "wrappy": "1" } }, + "open-sans-fontface": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/open-sans-fontface/-/open-sans-fontface-1.4.0.tgz", + "integrity": "sha512-d1VXrt1qPScsZnDHbZTOf1SmUnanr3KQgQM6+ye6KoFgrLo8a8mkX/J/ZJ2+w7vf0sCC02lRia5SAiaz0JPEog==", + "dev": true + }, "optimist": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", diff --git a/package.json b/package.json index 970f237c4..9bfcb7c9d 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "less": "3.7.1", "lesshint": "6.3.7", "marked": "^1.1.0", + "open-sans-fontface": "^1.4.0", "rangy": "~1.3.0", "require-css": "0.1.10", "requirejs": "2.3.5", diff --git a/scripts/copy-components.js b/scripts/copy-components.js index 6a2df9574..19b4f6d99 100644 --- a/scripts/copy-components.js +++ b/scripts/copy-components.js @@ -27,6 +27,7 @@ Fse.mkdirpSync(componentsPath); "require-css", "bootstrap", "nthen", + "open-sans-fontface", ].forEach(l => { const source = Path.join("node_modules", l); const destination = Path.join(componentsPath, l);