#1542 Alignment between themes

src/diagrams/class/styles.js

@@ -38,7 +38,7 @@ g.classGroup line {
 }
 
 .relation {
-  stroke: ${options.nodeBorder};
+  stroke: ${options.lineColor};
   stroke-width: 1;
   fill: none;
 }
@@ -48,14 +48,14 @@ g.classGroup line {
 }
 
 #compositionStart, #compositionEnd, #dependencyStart, #dependencyEnd, #extensionStart, #extensionEnd {
-  fill: ${options.nodeBorder};
-  stroke: ${options.nodeBorder};
+  fill: ${options.lineColor};
+  stroke: ${options.lineColor};
   stroke-width: 1;
 }
 
 #aggregationStart, #aggregationEnd  {
     fill: ${options.nodeBkg};
-  stroke: ${options.nodeBorder};
+  stroke: ${options.lineColor};
   stroke-width: 1;
 }
 `;

src/diagrams/er/styles.js

@@ -1,4 +1,4 @@
-Base theme for cusom themeingconst getStyles = options =>
+const getStyles = options =>
   `
   .entityBox {
     fill: ${options.mainBkg};
@@ -13,6 +13,10 @@ Base theme for cusom themeingconst getStyles = options =>
         opacity: 0.5;
       }
   }
+
+    .relationshipLine {
+      stroke: ${options.lineColor};
+    }
 `;
 
 export default getStyles;

src/diagrams/state/styles.js

@@ -23,12 +23,12 @@ g.stateGroup rect {
 }
 
 g.stateGroup line {
-  stroke: ${options.nodeBorder};
+  stroke: ${options.lineColor};
   stroke-width: 1;
 }
 
 .transition {
-  stroke: ${options.nodeBorder};
+  stroke: ${options.lineColor};
   stroke-width: 1;
   fill: none;
 }
@@ -85,7 +85,7 @@ g.stateGroup line {
   stroke-width: 1px;
 }
 #statediagram-barbEnd {
-  fill: ${options.nodeBorder};
+  fill: ${options.lineColor};
 }
 
 .statediagram-cluster rect {
@@ -114,7 +114,7 @@ g.stateGroup line {
   fill: ${options.background};
 }
 .statediagram-cluster.statediagram-cluster-alt .inner {
-  fill: #e0e0e0;
+  fill: '#e0e0e0';
 }
 
 .statediagram-cluster .inner {
@@ -128,7 +128,7 @@ g.stateGroup line {
 }
 .statediagram-state rect.divider {
   stroke-dasharray: 10,10;
-  fill: #efefef;
+  fill: ${options.altBackground ? options.altBackground : '#efefef'};
 }
 
 .note-edge {
@@ -155,8 +155,8 @@ g.stateGroup line {
 }
 
 #dependencyStart, #dependencyEnd {
-  fill: ${options.nodeBorder};
-  stroke: ${options.nodeBorder};
+  fill: ${options.lineColor};
+  stroke: ${options.lineColor};
   stroke-width: 1;
 }
 `;

src/diagrams/user-journey/styles.js

@@ -19,6 +19,9 @@ const getStyles = options =>
   .label text {
     fill: #333;
   }
+  .label {
+    color: ${options.textColor}
+  }
 
   .face {
     fill: #FFF8DC;

src/diagrams/user-journey/svgDraw.js

@@ -377,10 +377,11 @@ const _drawTextCandidateFunc = (function() {
 
     text
       .append('div')
+      .attr('class', 'label')
       .style('display', 'table-cell')
       .style('text-align', 'center')
       .style('vertical-align', 'middle')
-      .style('color', colour)
+      // .style('color', colour)
       .text(content);
 
     byTspan(content, body, x, y, width, height, textAttrs, conf);