From ac5451571c653e90004b7242fc60e47073c02610 Mon Sep 17 00:00:00 2001 From: benweet Date: Mon, 9 Jun 2014 19:34:29 +0100 Subject: [PATCH] Fixed UML diagrams font --- bower.json | 2 +- public/res/libs/sequence-diagram.js | 11 ----------- public/res/main.js | 2 +- public/res/styles/base.less | 2 +- 4 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 public/res/libs/sequence-diagram.js diff --git a/bower.json b/bower.json index 4e652673..fa0aaf82 100644 --- a/bower.json +++ b/bower.json @@ -29,7 +29,7 @@ "jsondiffpatch": "https://github.com/benweet/jsondiffpatch.git#fb9dddf7cd076d8ec89d376c0e9de9223e9888f9", "hammerjs": "~1.0.10", "raphael": "~2.1.2", - "js-sequence-diagrams": "https://github.com/bramp/js-sequence-diagrams.git#1.0.4", + "js-sequence-diagrams": "https://github.com/benweet/js-sequence-diagrams.git#7b157daa2deaf5b46b320673cc2ddabe6f013725", "flowchart": "https://github.com/adrai/flowchart.js.git#~1.2.10" }, "resolutions": { diff --git a/public/res/libs/sequence-diagram.js b/public/res/libs/sequence-diagram.js deleted file mode 100644 index 6b2bea11..00000000 --- a/public/res/libs/sequence-diagram.js +++ /dev/null @@ -1,11 +0,0 @@ -// Hack to make js-sequence-diagram AMD friendly -define([ - 'text!bower-libs/js-sequence-diagrams/build/sequence-diagram-min.js', - 'raphael', - 'underscore' -], function(sequenceDiagramMinJS) { - /*jshint evil: true */ - eval(sequenceDiagramMinJS); - return window.Diagram; -}); - diff --git a/public/res/main.js b/public/res/main.js index 85756704..d6d6e454 100644 --- a/public/res/main.js +++ b/public/res/main.js @@ -61,7 +61,7 @@ requirejs.config({ diff_match_patch_uncompressed: 'bower-libs/google-diff-match-patch-js/diff_match_patch_uncompressed', jsondiffpatch: 'bower-libs/jsondiffpatch/build/bundle', hammerjs: 'bower-libs/hammerjs/hammer', - 'sequence-diagram': 'libs/sequence-diagram', + 'sequence-diagram': 'bower-libs/js-sequence-diagrams/build/sequence-diagram-min', raphael: 'bower-libs/raphael/raphael', 'flow-chart': 'bower-libs/flowchart/release/flowchart.amd-1.2.10.min', flowchart: 'bower-libs/flowchart/release/flowchart-1.2.10.min' diff --git a/public/res/styles/base.less b/public/res/styles/base.less index 16ee0829..0594d437 100644 --- a/public/res/styles/base.less +++ b/public/res/styles/base.less @@ -222,7 +222,7 @@ hr { text-align: center; margin-bottom: @p-margin; text { - font-size: 1em !important; + font-size: 15px !important; font-family: @font-family-sans-serif !important; } [fill="#ffffff"] {