From 12b30def85266478d4cd823b27e0696b885671fd Mon Sep 17 00:00:00 2001
From: Christoph Dornieden <cdor@informatik.uni-kiel.de>
Date: Thu, 23 Jun 2016 18:41:56 +0200
Subject: [PATCH] merge conflict resolved
---
.../style.js | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/app/components/architecture-visualisation-cytoscape/style.js b/app/components/architecture-visualisation-cytoscape/style.js
index 47e32a8..894a842 100644
--- a/app/components/architecture-visualisation-cytoscape/style.js
+++ b/app/components/architecture-visualisation-cytoscape/style.js
@@ -64,18 +64,12 @@ $node > node { /* compounds. "Nodes" in meta model. $ selects the parent node th
color: ${theme.arrowColor};
line-color: ${theme.arrowColor};
target-arrow-color: ${theme.arrowColor};
-<<<<<<< HEAD
- text-background-color: ${theme.arrowLineColor};
- text-outline-color:${theme.arrowLineColor};
- text-background-opacity: 1;
- text-background-shape: roundrectangle;
-=======
+
/*text-background-color: ${theme.arrowLineColor};
text-background-opacity: 1;*/
/*text-background-shape: roundrectangle;*/
text-outline-color: ${theme.arrowColor};
text-outline-width: 1px;
->>>>>>> da62a369c3eb11a12b3b712bdb1628f3f87bf94a
font-size: 12pt;
width: data(workload);
}
@@ -95,17 +89,8 @@ edge {
color: ${theme.arrowLabelColor};
font-weight: bold;
target-arrow-shape: triangle-backcurve;
-<<<<<<< HEAD
- curve-style: bezier;/* supports arrow heads*/
- edge-distances: node-position;
- z-index: 0;
-
-
- width: data(workload);
-
-=======
curve-style: bezier; /* supports arrows */
->>>>>>> da62a369c3eb11a12b3b712bdb1628f3f87bf94a
+
}
:selected {
--
GitLab