From c1d252afe0edcc801d12eeab0136b4937ece3fb5 Mon Sep 17 00:00:00 2001
From: Jonathan Newnham <jnnnnn@gmail.com>
Date: Tue, 14 May 2019 11:23:37 +1000
Subject: [PATCH] fix dark theme loop labels not visible

* fix loop label text forced to black, ignoring styles
* fix styles that were being ignored
---
 src/diagrams/sequence/svgDraw.js | 2 +-
 src/themes/dark/index.scss       | 3 ++-
 src/themes/default/index.scss    | 1 +
 src/themes/forest/index.scss     | 1 +
 src/themes/neutral/index.scss    | 3 ++-
 src/themes/sequence.scss         | 2 +-
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/diagrams/sequence/svgDraw.js b/src/diagrams/sequence/svgDraw.js
index 4f0e6bd9db..0e79c536f5 100644
--- a/src/diagrams/sequence/svgDraw.js
+++ b/src/diagrams/sequence/svgDraw.js
@@ -216,7 +216,7 @@ export const getTextObj = function () {
   const txt = {
     x: 0,
     y: 0,
-    'fill': 'black',
+    'fill': undefined,
     'text-anchor': 'start',
     style: '#666',
     width: 100,
diff --git a/src/themes/dark/index.scss b/src/themes/dark/index.scss
index 579d871b2f..b97c829cef 100644
--- a/src/themes/dark/index.scss
+++ b/src/themes/dark/index.scss
@@ -27,7 +27,8 @@ $signalColor: $mainContrastColor;
 $signalTextColor: $mainContrastColor;
 $labelBoxBkgColor: $actorBkg;
 $labelBoxBorderColor: $actorBorder;
-$labelTextColor: $mainContrastColor;
+$labelTextColor: $darkTextColor;
+$loopTextColor: $mainContrastColor;
 $noteBorderColor: $border2;
 $noteBkgColor: #fff5ad;
 $activationBorderColor: #666;
diff --git a/src/themes/default/index.scss b/src/themes/default/index.scss
index 2718eb3efe..288d46faf6 100644
--- a/src/themes/default/index.scss
+++ b/src/themes/default/index.scss
@@ -26,6 +26,7 @@ $signalTextColor: #333;
 $labelBoxBkgColor: $actorBkg;
 $labelBoxBorderColor: $actorBorder;
 $labelTextColor: $actorTextColor;
+$loopTextColor: $actorTextColor;
 $noteBorderColor: $border2;
 $noteBkgColor: #fff5ad;
 $activationBorderColor: #666;
diff --git a/src/themes/forest/index.scss b/src/themes/forest/index.scss
index c4a7122971..572f3f8a2c 100644
--- a/src/themes/forest/index.scss
+++ b/src/themes/forest/index.scss
@@ -27,6 +27,7 @@ $signalTextColor: #333;
 $labelBoxBkgColor: $actorBkg;
 $labelBoxBorderColor: #326932;
 $labelTextColor: $actorTextColor;
+$loopTextColor: $actorTextColor;
 $noteBorderColor: $border2;
 $noteBkgColor: #fff5ad;
 $activationBorderColor: #666;
diff --git a/src/themes/neutral/index.scss b/src/themes/neutral/index.scss
index ea41b9b8c2..ede197a9be 100644
--- a/src/themes/neutral/index.scss
+++ b/src/themes/neutral/index.scss
@@ -30,7 +30,8 @@ $signalColor: $text;
 $signalTextColor: $text;
 $labelBoxBkgColor: $actorBkg;
 $labelBoxBorderColor: $actorBorder;
-$labelTextColor: white;
+$labelTextColor: $text;
+$loopTextColor: $text;
 $noteBorderColor: darken($note, 60%);
 $noteBkgColor: $note;
 $activationBorderColor: #666;
diff --git a/src/themes/sequence.scss b/src/themes/sequence.scss
index c45a4af4f8..183627fc17 100644
--- a/src/themes/sequence.scss
+++ b/src/themes/sequence.scss
@@ -49,7 +49,7 @@ text.actor {
 }
 
 .loopText {
-  fill: $labelTextColor;
+  fill: $loopTextColor;
   stroke: none;
 }