Merge pull request #1472 from chrismoran-bkt/develop

Fixed theme rendering for note text on non-dark themes.

src/themes/dark/index.scss

@@ -31,6 +31,7 @@ $labelTextColor: $mainContrastColor;
 $loopTextColor: $mainContrastColor;
 $noteBorderColor: $border2;
 $noteBkgColor: #fff5ad;
+$noteTextColor: $mainBkg;
 $activationBorderColor: $border1;
 $activationBkgColor: $secondBkg;
 $sequenceNumberColor: white;

src/themes/default/index.scss

@@ -29,6 +29,7 @@ $labelTextColor: $actorTextColor;
 $loopTextColor: $actorTextColor;
 $noteBorderColor: $border2;
 $noteBkgColor: #fff5ad;
+$noteTextColor: $actorTextColor;
 $activationBorderColor: #666;
 $activationBkgColor: #f4f4f4;
 $sequenceNumberColor: white;

src/themes/forest/index.scss

@@ -30,6 +30,7 @@ $labelTextColor: $actorTextColor;
 $loopTextColor: $actorTextColor;
 $noteBorderColor: $border2;
 $noteBkgColor: #fff5ad;
+$noteTextColor: $actorTextColor;
 $activationBorderColor: #666;
 $activationBkgColor: #f4f4f4;
 $sequenceNumberColor: white;

src/themes/neutral/index.scss

@@ -34,6 +34,7 @@ $labelTextColor: $text;
 $loopTextColor: $text;
 $noteBorderColor: darken($note, 60%);
 $noteBkgColor: $note;
+$noteTextColor: $actorTextColor;
 $activationBorderColor: #666;
 $activationBkgColor: #f4f4f4;
 $sequenceNumberColor: white;

src/themes/sequence.scss

@@ -75,8 +75,8 @@ text.actor > tspan {
   fill: $noteBkgColor;
 }
 
-.noteText {
+.noteText, .noteText > tspan {
-  fill: $actorBkg;
+  fill: $noteTextColor;
   stroke: none;
 }
 
@@ -94,14 +94,3 @@ text.actor > tspan {
   fill: $activationBkgColor;
   stroke: $activationBorderColor;
 }
-
-g > rect[class="note"] {
-  stroke: $noteBorderColor;
-  fill: $noteBkgColor;
-}
-
-g > text[class="noteText"] > tspan {
-  stroke: $actorBkg;
-  fill: $actorBkg;
-  stroke-width: 1px;
-}