From 228b832bedb68212cee8b8c134ad60afc9d1ddaa Mon Sep 17 00:00:00 2001 From: "Bland, Paul" Date: Wed, 22 Aug 2018 10:22:50 -0400 Subject: [PATCH] moved hard-coded fill and stroke colors from svgDraw.js to scss files, and added defaults to all themes --- src/diagrams/sequence/svgDraw.js | 2 +- src/themes/dark/index.scss | 2 ++ src/themes/default/index.scss | 2 ++ src/themes/forest/index.scss | 2 ++ src/themes/neutral/index.scss | 2 ++ src/themes/sequence.scss | 5 +++++ 6 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/diagrams/sequence/svgDraw.js b/src/diagrams/sequence/svgDraw.js index 29dbbafba..998c51a6a 100644 --- a/src/diagrams/sequence/svgDraw.js +++ b/src/diagrams/sequence/svgDraw.js @@ -106,7 +106,7 @@ export const drawActivation = function (elem, bounds, verticalPos) { const g = bounds.anchored rect.x = bounds.startx rect.y = bounds.starty - rect.fill = '#f4f4f4' + rect.class = 'activation' rect.width = bounds.stopx - bounds.startx rect.height = verticalPos - bounds.starty drawRect(g, rect) diff --git a/src/themes/dark/index.scss b/src/themes/dark/index.scss index 529eb3f70..579d871b2 100644 --- a/src/themes/dark/index.scss +++ b/src/themes/dark/index.scss @@ -30,6 +30,8 @@ $labelBoxBorderColor: $actorBorder; $labelTextColor: $mainContrastColor; $noteBorderColor: $border2; $noteBkgColor: #fff5ad; +$activationBorderColor: #666; +$activationBkgColor: #f4f4f4; /* Gantt chart variables */ diff --git a/src/themes/default/index.scss b/src/themes/default/index.scss index e98fc0741..2718eb3ef 100644 --- a/src/themes/default/index.scss +++ b/src/themes/default/index.scss @@ -28,6 +28,8 @@ $labelBoxBorderColor: $actorBorder; $labelTextColor: $actorTextColor; $noteBorderColor: $border2; $noteBkgColor: #fff5ad; +$activationBorderColor: #666; +$activationBkgColor: #f4f4f4; /* Gantt chart variables */ diff --git a/src/themes/forest/index.scss b/src/themes/forest/index.scss index f6e1a1dae..c4a712297 100644 --- a/src/themes/forest/index.scss +++ b/src/themes/forest/index.scss @@ -29,6 +29,8 @@ $labelBoxBorderColor: #326932; $labelTextColor: $actorTextColor; $noteBorderColor: $border2; $noteBkgColor: #fff5ad; +$activationBorderColor: #666; +$activationBkgColor: #f4f4f4; /* Gantt chart variables */ diff --git a/src/themes/neutral/index.scss b/src/themes/neutral/index.scss index f0560142f..ea41b9b8c 100644 --- a/src/themes/neutral/index.scss +++ b/src/themes/neutral/index.scss @@ -33,6 +33,8 @@ $labelBoxBorderColor: $actorBorder; $labelTextColor: white; $noteBorderColor: darken($note, 60%); $noteBkgColor: $note; +$activationBorderColor: #666; +$activationBkgColor: #f4f4f4; /* Gantt chart variables */ diff --git a/src/themes/sequence.scss b/src/themes/sequence.scss index 780e8ecf5..1fc9622c7 100644 --- a/src/themes/sequence.scss +++ b/src/themes/sequence.scss @@ -73,3 +73,8 @@ text.actor { font-family: 'trebuchet ms', verdana, arial; font-size: 14px; } + +.activation { + fill: $activationBkgColor; + stroke: $activationBorderColor; +}