diff --git a/src/diagrams/flowchart/flowRenderer.js b/src/diagrams/flowchart/flowRenderer.js index fde80fc89..7b0b39ecd 100644 --- a/src/diagrams/flowchart/flowRenderer.js +++ b/src/diagrams/flowchart/flowRenderer.js @@ -217,6 +217,7 @@ exports.getClasses = function (text, isDot) { if(typeof(classes.default) === 'undefined') { classes.default = {id:'default'}; classes.default.styles = ['fill:#ffa','stroke:#666','stroke-width:3px']; + classes.default.clusterStyles = ['rx:4px','fill: rgb(255, 255, 222)','rx: 4px','stroke: rgb(170, 170, 51)','stroke-width: 1px']; classes.default.nodeLabelStyles = ['fill:#000','stroke:none','font-weight:300','font-family:"Helvetica Neue",Helvetica,Arial,sans-serf','font-size:14px']; classes.default.edgeLabelStyles = ['fill:#000','stroke:none','font-weight:300','font-family:"Helvetica Neue",Helvetica,Arial,sans-serf','font-size:14px']; } diff --git a/src/diagrams/gantt/ganttDb.js b/src/diagrams/gantt/ganttDb.js index cf21ada3e..0344294ce 100644 --- a/src/diagrams/gantt/ganttDb.js +++ b/src/diagrams/gantt/ganttDb.js @@ -83,7 +83,7 @@ var getStartDate = function(prevTime, dateFormat, str){ }else{ console.log('Invalid date:'+str); console.log('With date format:'+dateFormat.trim()); - console.log('----'); + //console.log('----'); } // Default date - now diff --git a/src/diagrams/gantt/ganttRenderer.js b/src/diagrams/gantt/ganttRenderer.js index 991803bf6..b7806fa9f 100644 --- a/src/diagrams/gantt/ganttRenderer.js +++ b/src/diagrams/gantt/ganttRenderer.js @@ -26,16 +26,18 @@ var w; module.exports.draw = function (text, id) { gantt.yy.clear(); gantt.parse(text); + var elem = document.getElementById(id); w = elem.parentElement.offsetWidth; - console.log('id='+id,' w='+w); - console.log(elem.parentElement); - if (typeof w === 'undefined') { w = 1200; } + if(typeof conf.useWidth !== 'undefined'){ + w = conf.useWidth; + } + var taskArray = gantt.yy.getTasks(); // Set height based on number of tasks @@ -83,6 +85,10 @@ module.exports.draw = function (text, id) { makeGant(taskArray, w, h); + if(typeof conf.useWidth !== 'undefined'){ + elem.setAttribute('width', w); + + } var title = svg.append("text") .text(gantt.yy.getTitle()) diff --git a/src/diagrams/sequenceDiagram/sequenceRenderer.js b/src/diagrams/sequenceDiagram/sequenceRenderer.js index 5a60a63f8..79c3943df 100644 --- a/src/diagrams/sequenceDiagram/sequenceRenderer.js +++ b/src/diagrams/sequenceDiagram/sequenceRenderer.js @@ -189,7 +189,6 @@ var drawMessage = function(elem, startx, stopx, verticalPos, msg){ textWidth = textElem[0][0].getBBox().width; } else{ - console.log(textElem[0][0].getBoundingClientRect()); //textWidth = getBBox(textElem).width; //.getComputedTextLength() textWidth = textElem[0][0].getBoundingClientRect(); //textWidth = textElem[0][0].getComputedTextLength(); diff --git a/src/less/default/flow.less b/src/less/default/flow.less index 82c52463f..9fdab96c7 100644 --- a/src/less/default/flow.less +++ b/src/less/default/flow.less @@ -11,10 +11,10 @@ } .cluster rect{ - fill: @secondBkg; - rx:40; - stroke: @clusterBorder; - stroke-width: 1px; + fill: @secondBkg !important; + rx:4 !important; + stroke: @clusterBorder !important; + stroke-width: 1px !important; } .cluster text { diff --git a/src/less/forest/flow.less b/src/less/forest/flow.less index b42b2c6bb..5574e828a 100644 --- a/src/less/forest/flow.less +++ b/src/less/forest/flow.less @@ -15,10 +15,10 @@ color:#333 } .cluster rect{ - fill: @secondBkg; - rx:4; - stroke: @clusterBorder; - stroke-width: 1px; + fill: @secondBkg !important; + rx:4 !important; + stroke: @clusterBorder !important; + stroke-width: 1px !important; } .cluster text { diff --git a/src/mermaid.js b/src/mermaid.js index 7fea881ed..a8805ea43 100644 --- a/src/mermaid.js +++ b/src/mermaid.js @@ -49,8 +49,13 @@ var init = function () { if(typeof mermaid_config !== 'undefined'){ mermaidAPI.initialize(mermaid_config); + } + if(typeof mermaid.ganttConfig !== 'undefined'){ + mermaidAPI.initialize({gantt:mermaid.ganttConfig}); + } + var insertSvg = function(svgCode){ element.innerHTML = svgCode; }; diff --git a/src/utils.js b/src/utils.js index 29d864a92..85647c3bc 100644 --- a/src/utils.js +++ b/src/utils.js @@ -90,6 +90,9 @@ module.exports.cloneCssStyles = function(svg, classes){ if (classes.default.edgeLabelStyles instanceof Array) { defaultStyles += "#" + svg.id.trim() + ' .edgeLabel text ' + ' { ' + classes[className].edgeLabelStyles.join("; ") + '; }\n'; } + if (classes.default.clusterStyles instanceof Array) { + defaultStyles += "#" + svg.id.trim() + ' .cluster rect ' + ' { ' + classes[className].clusterStyles.join("; ") + '; }\n'; + } } else { if (classes[className].styles instanceof Array) { embeddedStyles += "#" + svg.id.trim() + ' .' + className + ' { ' + classes[className].styles.join("; ") + '; }\n';