dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removing `bower`: migrate `open-sans-fontface` 

Signed-off-by: Pamplemousse <git@xaviermaso.com>
This commit is contained in:
Pamplemousse 2023-01-07 12:52:08 +01:00
parent 9019d92291
commit 1f236f6270
6 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bower.json
View File

@ -18,7 +18,6 @@
"tests" "tests"
], ],
"dependencies": { "dependencies": {
"open-sans-fontface": "^1.4.2",
"bootstrap-tokenfield": "0.12.1", "bootstrap-tokenfield": "0.12.1",
"localforage": "^1.5.2", "localforage": "^1.5.2",
"html2canvas": "^0.4.1", "html2canvas": "^0.4.1",

2
customize.dist/fonts/open-sans.less
View File

@ -1,6 +1,6 @@
/* Open Sans @font-face kit */ /* Open Sans @font-face kit */
@OpenSansPath: "/bower_components/open-sans-fontface/fonts"; @OpenSansPath: "/components/open-sans-fontface/fonts";
/* BEGIN Light */ /* BEGIN Light */
@font-face { @font-face {

10
customize.dist/src/less2/include/loading.less
View File

@ -6,11 +6,11 @@
#cp-loading { #cp-loading {
@font-face { @font-face {
font-family: 'Open Sans'; font-family: 'Open Sans';
src: url('/bower_components/open-sans-fontface/fonts/Regular/OpenSans-Regular.eot'); src: url('/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'), src: url('/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('/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('/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'); url('/components/open-sans-fontface/fonts/Regular/OpenSans-Regular.svg#OpenSansRegular') format('svg');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }

13
package-lock.json generated
View File

@ -43,6 +43,7 @@
"less": "3.7.1", "less": "3.7.1",
"lesshint": "6.3.7", "lesshint": "6.3.7",
"marked": "^1.1.0", "marked": "^1.1.0",
"open-sans-fontface": "^1.4.0",
"rangy": "~1.3.0", "rangy": "~1.3.0",
"require-css": "0.1.10", "require-css": "0.1.10",
"requirejs": "2.3.5", "requirejs": "2.3.5",
@ -3351,6 +3352,12 @@
"wrappy": "1" "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": { "node_modules/optimist": {
"version": "0.6.1", "version": "0.6.1",
"resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
@ -7773,6 +7780,12 @@
"wrappy": "1" "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": { "optimist": {
"version": "0.6.1", "version": "0.6.1",
"resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",

1
package.json
View File

@ -46,6 +46,7 @@
"less": "3.7.1", "less": "3.7.1",
"lesshint": "6.3.7", "lesshint": "6.3.7",
"marked": "^1.1.0", "marked": "^1.1.0",
"open-sans-fontface": "^1.4.0",
"rangy": "~1.3.0", "rangy": "~1.3.0",
"require-css": "0.1.10", "require-css": "0.1.10",
"requirejs": "2.3.5", "requirejs": "2.3.5",

1
scripts/copy-components.js
View File

@ -27,6 +27,7 @@ Fse.mkdirpSync(componentsPath);
"require-css", "require-css",
"bootstrap", "bootstrap",
"nthen", "nthen",
"open-sans-fontface",
].forEach(l => { ].forEach(l => {
const source = Path.join("node_modules", l); const source = Path.join("node_modules", l);
const destination = Path.join(componentsPath, l); const destination = Path.join(componentsPath, l);