chore(project): use external bpmn-font

This is a breaking change for users that may rely on `assets/bpmn-font` being present in the library. BREAKING CHANGE: * use `bpmn-font` package, specifically `bpmn-font/dist` if you need the font previously contained in the assets directory.
2018-01-08 09:24:49 +01:00 · 2018-01-08 09:24:49 +01:00 · da4f321284
parent 1184cbd271
commit da4f321284
10 changed files with 8 additions and 441 deletions
--- a/assets/bpmn-font/css/bpmn-embedded.css
+++ b/assets/bpmn-font/css/bpmn-embedded.css
--- a/assets/bpmn-font/css/bpmn.css
+++ b/assets/bpmn-font/css/bpmn.css
@ -1,162 +0,0 @@
-@font-face {
-  font-family: 'bpmn';
-  src: url('../font/bpmn.eot?70672887');
-  src: url('../font/bpmn.eot?70672887#iefix') format('embedded-opentype'),
-       url('../font/bpmn.woff?70672887') format('woff'),
-       url('../font/bpmn.ttf?70672887') format('truetype'),
-       url('../font/bpmn.svg?70672887#bpmn') format('svg');
-  font-weight: normal;
-  font-style: normal;
-}
-/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */
-/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
-/*
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-  @font-face {
-    font-family: 'bpmn';
-    src: url('../font/bpmn.svg?70672887#bpmn') format('svg');
-  }
-}
-*/
- 
- [class^="bpmn-icon-"]:before, [class*=" bpmn-icon-"]:before {
-  font-family: "bpmn";
-  font-style: normal;
-  font-weight: normal;
-  speak: none;
- 
-  display: inline-block;
-  text-decoration: inherit;
-  width: 1em;
-  /* margin-right: .2em; */
-  text-align: center;
-  /* opacity: .8; */
- 
-  /* For safety - reset parent styles, that can break glyph codes*/
-  font-variant: normal;
-  text-transform: none;
- 
-  /* fix buttons height, for twitter bootstrap */
-  line-height: 1em;
- 
-  /* Animation center compensation - margins should be symmetric */
-  /* remove if not needed */
-  /* margin-left: .2em; */
- 
-  /* you can be more comfortable with increased icons size */
-  /* font-size: 120%; */
- 
-  /* Font smoothing. That was taken from TWBS */
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
- 
-  /* Uncomment for 3D effect */
-  /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
-}
- 
-.bpmn-icon-screw-wrench:before { content: '\e800'; } /* '' */
-.bpmn-icon-trash:before { content: '\e801'; } /* '' */
-.bpmn-icon-conditional-flow:before { content: '\e802'; } /* '' */
-.bpmn-icon-default-flow:before { content: '\e803'; } /* '' */
-.bpmn-icon-gateway-parallel:before { content: '\e804'; } /* '' */
-.bpmn-icon-intermediate-event-catch-cancel:before { content: '\e805'; } /* '' */
-.bpmn-icon-intermediate-event-catch-non-interrupting-message:before { content: '\e806'; } /* '' */
-.bpmn-icon-start-event-compensation:before { content: '\e807'; } /* '' */
-.bpmn-icon-start-event-non-interrupting-parallel-multiple:before { content: '\e808'; } /* '' */
-.bpmn-icon-loop-marker:before { content: '\e809'; } /* '' */
-.bpmn-icon-parallel-mi-marker:before { content: '\e80a'; } /* '' */
-.bpmn-icon-start-event-non-interrupting-signal:before { content: '\e80b'; } /* '' */
-.bpmn-icon-intermediate-event-catch-non-interrupting-timer:before { content: '\e80c'; } /* '' */
-.bpmn-icon-intermediate-event-catch-parallel-multiple:before { content: '\e80d'; } /* '' */
-.bpmn-icon-intermediate-event-catch-compensation:before { content: '\e80e'; } /* '' */
-.bpmn-icon-gateway-xor:before { content: '\e80f'; } /* '' */
-.bpmn-icon-connection:before { content: '\e810'; } /* '' */
-.bpmn-icon-end-event-cancel:before { content: '\e811'; } /* '' */
-.bpmn-icon-intermediate-event-catch-condition:before { content: '\e812'; } /* '' */
-.bpmn-icon-intermediate-event-catch-non-interrupting-parallel-multiple:before { content: '\e813'; } /* '' */
-.bpmn-icon-start-event-condition:before { content: '\e814'; } /* '' */
-.bpmn-icon-start-event-non-interrupting-timer:before { content: '\e815'; } /* '' */
-.bpmn-icon-sequential-mi-marker:before { content: '\e816'; } /* '' */
-.bpmn-icon-user-task:before { content: '\e817'; } /* '' */
-.bpmn-icon-business-rule:before { content: '\e818'; } /* '' */
-.bpmn-icon-sub-process-marker:before { content: '\e819'; } /* '' */
-.bpmn-icon-start-event-parallel-multiple:before { content: '\e81a'; } /* '' */
-.bpmn-icon-start-event-error:before { content: '\e81b'; } /* '' */
-.bpmn-icon-intermediate-event-catch-signal:before { content: '\e81c'; } /* '' */
-.bpmn-icon-intermediate-event-catch-error:before { content: '\e81d'; } /* '' */
-.bpmn-icon-end-event-compensation:before { content: '\e81e'; } /* '' */
-.bpmn-icon-subprocess-collapsed:before { content: '\e81f'; } /* '' */
-.bpmn-icon-subprocess-expanded:before { content: '\e820'; } /* '' */
-.bpmn-icon-task:before { content: '\e821'; } /* '' */
-.bpmn-icon-end-event-error:before { content: '\e822'; } /* '' */
-.bpmn-icon-intermediate-event-catch-escalation:before { content: '\e823'; } /* '' */
-.bpmn-icon-intermediate-event-catch-timer:before { content: '\e824'; } /* '' */
-.bpmn-icon-start-event-escalation:before { content: '\e825'; } /* '' */
-.bpmn-icon-start-event-signal:before { content: '\e826'; } /* '' */
-.bpmn-icon-business-rule-task:before { content: '\e827'; } /* '' */
-.bpmn-icon-manual:before { content: '\e828'; } /* '' */
-.bpmn-icon-receive:before { content: '\e829'; } /* '' */
-.bpmn-icon-call-activity:before { content: '\e82a'; } /* '' */
-.bpmn-icon-start-event-timer:before { content: '\e82b'; } /* '' */
-.bpmn-icon-start-event-message:before { content: '\e82c'; } /* '' */
-.bpmn-icon-intermediate-event-none:before { content: '\e82d'; } /* '' */
-.bpmn-icon-intermediate-event-catch-link:before { content: '\e82e'; } /* '' */
-.bpmn-icon-end-event-escalation:before { content: '\e82f'; } /* '' */
-.bpmn-icon-text-annotation:before { content: '\e830'; } /* '' */
-.bpmn-icon-bpmn-io:before { content: '\e831'; } /* '' */
-.bpmn-icon-gateway-complex:before { content: '\e832'; } /* '' */
-.bpmn-icon-gateway-eventbased:before { content: '\e833'; } /* '' */
-.bpmn-icon-gateway-none:before { content: '\e834'; } /* '' */
-.bpmn-icon-gateway-or:before { content: '\e835'; } /* '' */
-.bpmn-icon-end-event-terminate:before { content: '\e836'; } /* '' */
-.bpmn-icon-end-event-signal:before { content: '\e837'; } /* '' */
-.bpmn-icon-end-event-none:before { content: '\e838'; } /* '' */
-.bpmn-icon-end-event-multiple:before { content: '\e839'; } /* '' */
-.bpmn-icon-end-event-message:before { content: '\e83a'; } /* '' */
-.bpmn-icon-end-event-link:before { content: '\e83b'; } /* '' */
-.bpmn-icon-intermediate-event-catch-message:before { content: '\e83c'; } /* '' */
-.bpmn-icon-intermediate-event-throw-compensation:before { content: '\e83d'; } /* '' */
-.bpmn-icon-start-event-multiple:before { content: '\e83e'; } /* '' */
-.bpmn-icon-script:before { content: '\e83f'; } /* '' */
-.bpmn-icon-manual-task:before { content: '\e840'; } /* '' */
-.bpmn-icon-send:before { content: '\e841'; } /* '' */
-.bpmn-icon-service:before { content: '\e842'; } /* '' */
-.bpmn-icon-receive-task:before { content: '\e843'; } /* '' */
-.bpmn-icon-user:before { content: '\e844'; } /* '' */
-.bpmn-icon-start-event-none:before { content: '\e845'; } /* '' */
-.bpmn-icon-intermediate-event-throw-escalation:before { content: '\e846'; } /* '' */
-.bpmn-icon-intermediate-event-catch-multiple:before { content: '\e847'; } /* '' */
-.bpmn-icon-intermediate-event-catch-non-interrupting-escalation:before { content: '\e848'; } /* '' */
-.bpmn-icon-intermediate-event-throw-link:before { content: '\e849'; } /* '' */
-.bpmn-icon-start-event-non-interrupting-condition:before { content: '\e84a'; } /* '' */
-.bpmn-icon-data-object:before { content: '\e84b'; } /* '' */
-.bpmn-icon-script-task:before { content: '\e84c'; } /* '' */
-.bpmn-icon-send-task:before { content: '\e84d'; } /* '' */
-.bpmn-icon-data-store:before { content: '\e84e'; } /* '' */
-.bpmn-icon-start-event-non-interrupting-escalation:before { content: '\e84f'; } /* '' */
-.bpmn-icon-intermediate-event-throw-message:before { content: '\e850'; } /* '' */
-.bpmn-icon-intermediate-event-catch-non-interrupting-multiple:before { content: '\e851'; } /* '' */
-.bpmn-icon-intermediate-event-catch-non-interrupting-signal:before { content: '\e852'; } /* '' */
-.bpmn-icon-intermediate-event-throw-multiple:before { content: '\e853'; } /* '' */
-.bpmn-icon-start-event-non-interrupting-message:before { content: '\e854'; } /* '' */
-.bpmn-icon-ad-hoc-marker:before { content: '\e855'; } /* '' */
-.bpmn-icon-service-task:before { content: '\e856'; } /* '' */
-.bpmn-icon-task-none:before { content: '\e857'; } /* '' */
-.bpmn-icon-compensation-marker:before { content: '\e858'; } /* '' */
-.bpmn-icon-start-event-non-interrupting-multiple:before { content: '\e859'; } /* '' */
-.bpmn-icon-intermediate-event-throw-signal:before { content: '\e85a'; } /* '' */
-.bpmn-icon-intermediate-event-catch-non-interrupting-condition:before { content: '\e85b'; } /* '' */
-.bpmn-icon-participant:before { content: '\e85c'; } /* '' */
-.bpmn-icon-event-subprocess-expanded:before { content: '\e85d'; } /* '' */
-.bpmn-icon-lane-insert-below:before { content: '\e85e'; } /* '' */
-.bpmn-icon-space-tool:before { content: '\e85f'; } /* '' */
-.bpmn-icon-connection-multi:before { content: '\e860'; } /* '' */
-.bpmn-icon-lane:before { content: '\e861'; } /* '' */
-.bpmn-icon-lasso-tool:before { content: '\e862'; } /* '' */
-.bpmn-icon-lane-insert-above:before { content: '\e863'; } /* '' */
-.bpmn-icon-lane-divide-three:before { content: '\e864'; } /* '' */
-.bpmn-icon-lane-divide-two:before { content: '\e865'; } /* '' */
-.bpmn-icon-data-input:before { content: '\e866'; } /* '' */
-.bpmn-icon-data-output:before { content: '\e867'; } /* '' */
-.bpmn-icon-hand-tool:before { content: '\e868'; } /* '' */
-.bpmn-icon-transaction:before { content: '\e8c4'; } /* '' */
--- a/assets/bpmn-font/font/bpmn.eot
+++ b/assets/bpmn-font/font/bpmn.eot
--- a/assets/bpmn-font/font/bpmn.svg
+++ b/assets/bpmn-font/font/bpmn.svg
--- a/assets/bpmn-font/font/bpmn.ttf
+++ b/assets/bpmn-font/font/bpmn.ttf
--- a/assets/bpmn-font/font/bpmn.woff
+++ b/assets/bpmn-font/font/bpmn.woff
--- a/package-lock.json
+++ b/package-lock.json
@ -542,6 +542,11 @@
        }
      }
    },
+    "bpmn-font": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/bpmn-font/-/bpmn-font-0.8.0.tgz",
+      "integrity": "sha512-j8u5k7EcGkmg7WkPgObxyvMEccr0qyiCuvXGnM5G2Q+kza119vVq3gblt0Rro/UDjl7i3VmfG3ojeZ04VHeVFg=="
+    },
    "bpmn-moddle": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/bpmn-moddle/-/bpmn-moddle-2.1.0.tgz",
--- a/package.json
+++ b/package.json
@ -75,6 +75,7 @@
    "watchify": "^3.7.0"
  },
  "dependencies": {
+    "bpmn-font": "^0.8.0",
    "bpmn-moddle": "^2.1.0",
    "diagram-js": "^0.28.0",
    "diagram-js-direct-editing": "^0.22.0",
--- a/tasks/build-distro.js
+++ b/tasks/build-distro.js
@ -24,7 +24,7 @@ console.log('mkdir -p ' + dest);
 mkdirp(dest);

 console.log(`copy bpmn-font to ${dest}/bpmn-font`);
-cp('assets/bpmn-font/*', dest + '/assets/bpmn-font');
+cp(resolve('bpmn-font', '/dist/{font,css}/**'), dest + '/assets/bpmn-font');

 console.log(`copy diagram-js.css to ${dest}`);
 cp(resolve('diagram-js', '/assets/**'), dest + '/assets');
--- a/test/TestHelper.js
+++ b/test/TestHelper.js
@ -4,7 +4,7 @@ var TestHelper = module.exports = require('./helper');

 TestHelper.insertCSS('diagram-js.css', require('diagram-js/assets/diagram-js.css'));

-TestHelper.insertCSS('bpmn-embedded.css', require('../assets/bpmn-font/css/bpmn-embedded.css'));
+TestHelper.insertCSS('bpmn-embedded.css', require('bpmn-font/dist/css/bpmn-embedded.css'));

 TestHelper.insertCSS('diagram-js-testing.css',
  'body .test-container { height: auto }' +