wip #7650 @0.25

diff --git a/src/Links/ColorLink.php b/src/Links/ColorLink.php
index 09514fd35788eb9c03584bddb163f8b44203e108..0b9bec93b188dbf58ba9626a398d0c91e7a28ba9 100644 (file)
--- a/src/Links/ColorLink.php
+++ b/src/Links/ColorLink.php
@@ -4,16 +4,29 @@ namespace Fluidbook\Tools\Links;
 
 use Cubist\Util\Graphics\Color;
 
-class ColorLink extends ContentLink {
+class ColorLink extends ContentLink
+{
     protected $role = '';
 
-    public function getCSS() {
+    public function getCSS()
+    {
         $res = parent::getCSS();
         $res .= 'background-color:' . Color::colorToCSS($this->to) . ';';
         return $res;
     }
 
-    public function getAdditionnalContent() {
+    public function getExtraCSS()
+    {
+        $res = parent::getExtraCSS();
+        $res .= '#l_' . $this->id . '.stroke{';
+        $res .= 'background-color:transparent;';
+        $res .= 'border:4px solid ' . Color::colorToCSS($this->to) . ';';
+        $res .= '}';
+        return $res;
+    }
+
+    public function getAdditionnalContent()
+    {
         $res = parent::getAdditionnalContent();
         $res .= ' data-color="' . Color::colorToCSS($this->to) . '"';
         return $res;

diff --git a/src/Links/Link.php b/src/Links/Link.php
index 101e5c6d6ef7a3b4be32f23aff1b4928aa7609b5..e7173437d54e3056e9820d963017fdf38c4b470f 100644 (file)
--- a/src/Links/Link.php
+++ b/src/Links/Link.php
@@ -850,6 +850,7 @@ class Link
         $css .= $this->getCSSClipPath();
         $css .= $this->getCSS();
         $css .= '}';
+        $css.=$this->getExtraCSS();
         if ($this->cursor) {
             $css .= '#l_' . $this->id . ' a{cursor:' . $this->cursor . ' !important;}';
         }
@@ -896,6 +897,10 @@ class Link
         return '';
     }
 
+    public function getExtraCSS(){
+        return '';
+    }
+
     public function getCSS()
     {
         return '';

diff --git a/src/Links/NormalLink.php b/src/Links/NormalLink.php
index d01807bb0b70e66d4230693d478a2601a95365aa..ad222714684d4c8ab23b1db1077c7c17160ea6b7 100644 (file)
--- a/src/Links/NormalLink.php
+++ b/src/Links/NormalLink.php
@@ -19,7 +19,7 @@ class NormalLink extends Link
             $attrs .= ' data-animation="' . $this->getAnimationType() . '"';
             $attrs .= ' data-display-area="' . $this->display_area . '" ';
         } else {
-            $attrs .= ' data-display-area="none" ';
+            $attrs .= ' data-display-area="none" data-display-area-related=" ' . $this->display_area . '" ';
         }
 
         if (count($class)) {