mirrors
/
mermaid
mirror of https://github.com/mermaid-js/mermaid.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into issue416_link_style_fill_none

This commit is contained in:
Knut Sveidqvist 2017-01-09 08:02:08 +01:00 committed by GitHub
parent 8c6cfebc1c 7ff87fdac9
commit 8596eb6091
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/content/flowchart.md
View File

@ -345,6 +345,7 @@ should have a different look.
a class definition looks like the example below:
```
classDef className fill:#f9f,stroke:#333,stroke-width:4px;
```
@ -396,7 +397,7 @@ If a class is named default it will be assigned to all classes without specific
## Basic support for fontawesome
It is possible to add icons from fontawesome. In order to do so, you need to add the fontwesome as described in the instructions at
It is possible to add icons from fontawesome. In order to do so, you need to add the fontawesome as described in the instructions at
[the fontawesome web site](https://fortawesome.github.io/Font-Awesome/).
The icons are acessed via the syntax fa:#icon class name#.

2
src/utils.js
View File

@ -112,7 +112,7 @@ var cloneCssStyles = function(svg, classes){
}
} else {
if (classes[className].styles instanceof Array) {
embeddedStyles += '#' + svg.id.trim() + ' .' + className + '>rect, .' + className + '>polygon, .' + className + '>ellipse { ' + classes[className].styles.join('; ') + '; }\n';
embeddedStyles += '#' + svg.id.trim() + ' .' + className + '>rect, .' + className + '>polygon, .' + className + '>circle, .' + className + '>ellipse { ' + classes[className].styles.join('; ') + '; }\n';
}
}
}

5
src/utils.spec.js
View File

@ -196,11 +196,10 @@ describe('when cloning CSS ', function () {
expect(stylesToArray(svg)).toEqual(['#mermaid-01 .node>rect { stroke:#ffffff; stroke-width:1.5px; }',
'.node { stroke: #eeeeee;}',
'.node-square { stroke: #bbbbbb;}',
'#mermaid-01 .node-square>rect, .node-square>polygon, .node-square>ellipse { fill:#eeeeee; stroke:#aaaaaa; }',
'#mermaid-01 .node-circle>rect, .node-circle>polygon, .node-circle>ellipse { fill:#444444; stroke:#111111; }'
'#mermaid-01 .node-square>rect, .node-square>polygon, .node-square>circle, .node-square>ellipse { fill:#eeeeee; stroke:#aaaaaa; }',
'#mermaid-01 .node-circle>rect, .node-circle>polygon, .node-circle>circle, .node-circle>ellipse { fill:#444444; stroke:#111111; }'
]);
});
});
describe('when finding substring in array ', function () {
it('should return the array index that contains the substring', function () {