wip #6117 @0.25

diff --git a/.idea/deployment.xml b/.idea/deployment.xml
index 6f144a767c79d46a0afd5cd197ab13d864a0e9c9..983f9b2a2392b64b2bc463f01b11026057616ab0 100644 (file)
--- a/.idea/deployment.xml
+++ b/.idea/deployment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="PublishConfigData" autoUpload="Always" serverName="toolbox.fluidbook.com" remoteFilesAllowedToDisappearOnAutoupload="false" confirmBeforeUploading="false" autoUploadExternalChanges="true" showAutoUploadSettingsWarning="false">
+  <component name="PublishConfigData" autoUpload="Always" serverName="fluidbookprocessfarm.alphaville" remoteFilesAllowedToDisappearOnAutoupload="false" confirmBeforeUploading="false" autoUploadExternalChanges="true" showAutoUploadSettingsWarning="false">
     <option name="confirmBeforeUploading" value="false" />
     <serverData>
       <paths name="alphaville.cubedesigners.com">
@@ -132,6 +132,16 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="fluidbookprocessfarm.alphaville">
+        <serverdata>
+          <mappings>
+            <mapping deploy="/vendor/fluidbook/tools" local="$PROJECT_DIR$" web="/" />
+          </mappings>
+          <excludedPaths>
+            <excludedPath local="true" path="$PROJECT_DIR$/vendor" />
+          </excludedPaths>
+        </serverdata>
+      </paths>
       <paths name="hosting.fluidbook.com">
         <serverdata>
           <mappings>

diff --git a/.idea/webServers.xml b/.idea/webServers.xml
new file mode 100644 (file)
index 0000000..1683fb4
--- /dev/null
+++ b/.idea/webServers.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="WebServers">
+    <option name="servers">
+      <webServer id="eec974f5-893f-42d3-b8a2-b7c077eaf427" name="fluidbookprocessfarm.alphaville">
+        <fileTransfer rootFolder="/docker/fluidbook-processfarm/app/" accessType="SFTP" host="alphaville.cubedesigners.com" port="22" sshConfigId="767873cf-e383-4adb-8a5e-77be304283e7" sshConfig="root@alphaville.cubedesigners.com:22 key" keyPair="true">
+          <advancedOptions>
+            <advancedOptions dataProtectionLevel="Private" keepAliveTimeout="0" passiveMode="true" shareSSLContext="true" />
+          </advancedOptions>
+        </fileTransfer>
+      </webServer>
+    </option>
+  </component>
+</project>
\ No newline at end of file

diff --git a/src/Links/ColorLink.php b/src/Links/ColorLink.php
index 0801bc781c023ab5dd424aad670ee34071acd130..09514fd35788eb9c03584bddb163f8b44203e108 100644 (file)
--- a/src/Links/ColorLink.php
+++ b/src/Links/ColorLink.php
@@ -9,13 +9,13 @@ class ColorLink extends ContentLink {
 
     public function getCSS() {
         $res = parent::getCSS();
-        $res .= 'background-color:' . Color::colorToCSS($this->to, 1) . ';';
+        $res .= 'background-color:' . Color::colorToCSS($this->to) . ';';
         return $res;
     }
 
     public function getAdditionnalContent() {
         $res = parent::getAdditionnalContent();
-        $res .= ' data-color="' . Color::colorToCSS($this->to, 1) . '"';
+        $res .= ' data-color="' . Color::colorToCSS($this->to) . '"';
         return $res;
     }
 }