#1884

diff --git a/fluidbook/tools/fwstk/.idea/workspace.xml b/fluidbook/tools/fwstk/.idea/workspace.xml
index c5ba69b28196ba4956fea96d645182c0e4e6de18..e551890a3fe77b4233c49faf1fa67e720def7cb9 100644 (file)
--- a/fluidbook/tools/fwstk/.idea/workspace.xml
+++ b/fluidbook/tools/fwstk/.idea/workspace.xml
@@ -6,26 +6,8 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" readonly="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="wait #1866 @6">
-      <change beforePath="" afterPath="$PROJECT_DIR$/.idea/libraries/commons_lang3_3_7.xml" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/.idea/php.xml" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/lib/commons-lang3-3.7.jar" />
-      <change beforePath="" afterPath="$PROJECT_DIR$/out/artifacts/fwstk_jar/commons-lang3-3.7.jar" />
-      <change beforePath="$PROJECT_DIR$/.idea/artifacts/fwstk_jar.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/fwstk_jar.xml" />
+    <list default="true" readonly="true" id="f146bc67-2578-4de3-9db2-94d2d43e9e83" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change beforePath="$PROJECT_DIR$/MANIFEST.MF" afterPath="$PROJECT_DIR$/MANIFEST.MF" />
-      <change beforePath="$PROJECT_DIR$/fwstk.iml" afterPath="$PROJECT_DIR$/fwstk.iml" />
-      <change beforePath="$PROJECT_DIR$/out/artifacts/fwstk_jar/fwstk.jar" afterPath="$PROJECT_DIR$/out/artifacts/fwstk_jar/fwstk.jar" />
-      <change beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/Main.java" />
-      <change beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/TextsThread.java" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/TextsThread.java" />
-      <change beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Group.java" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Group.java" />
-      <change beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Letter.java" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Letter.java" />
-      <change beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Line.java" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Line.java" />
-      <change beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Page.java" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Page.java" />
-      <change beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Separator.java" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Separator.java" />
-      <change beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Space.java" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Space.java" />
-      <change beforePath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Word.java" afterPath="$PROJECT_DIR$/src/com/fluidbook/fwstk/layout/Word.java" />
-      <change beforePath="$PROJECT_DIR$/src/cube/util/StringUtil.java" afterPath="$PROJECT_DIR$/src/cube/util/StringUtil.java" />
     </list>
     <ignored path="fwstk.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -72,7 +54,7 @@
         <entry file="file://$PROJECT_DIR$/.idea/artifacts/fwstk_jar.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="187">
-              <caret line="11" column="68" lean-forward="true" selection-start-line="11" selection-start-column="68" selection-end-line="11" selection-end-column="68" />
+              <caret line="11" column="68" lean-forward="false" selection-start-line="11" selection-start-column="68" selection-end-line="11" selection-end-column="68" />
               <folding />
             </state>
           </provider>
@@ -1217,7 +1199,7 @@
       <workItem from="1504086902394" duration="65000" />
       <workItem from="1506413845063" duration="663000" />
       <workItem from="1515419571657" duration="12314000" />
-      <workItem from="1515494590332" duration="6369000" />
+      <workItem from="1515494590332" duration="6979000" />
     </task>
     <task id="LOCAL-00001" summary="wip #1111 @0.5">
       <created>1487172253077</created>
@@ -1261,11 +1243,18 @@
       <option name="project" value="LOCAL" />
       <updated>1504020479819</updated>
     </task>
-    <option name="localTasksCounter" value="7" />
+    <task id="LOCAL-00007" summary="wait #1866 @6">
+      <created>1515508995835</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1515508995835</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="73815000" />
+    <option name="totallyTimeSpent" value="74425000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -1289,7 +1278,7 @@
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32934782" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32934782" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32934782" sideWeight="0.47867805" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32934782" sideWeight="0.47867805" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32934782" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32995737" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -1335,7 +1324,8 @@
     <MESSAGE value="Bug des textes de certaines pages non surlignées | #811 @2" />
     <MESSAGE value="#811" />
     <MESSAGE value="fix #1629 @3" />
-    <option name="LAST_COMMIT_MESSAGE" value="fix #1629 @3" />
+    <MESSAGE value="wait #1866 @6" />
+    <option name="LAST_COMMIT_MESSAGE" value="wait #1866 @6" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1609,8 +1599,8 @@
         <state relative-caret-position="197">
           <caret line="147" column="19" lean-forward="false" selection-start-line="147" selection-start-column="19" selection-end-line="147" selection-end-column="19" />
           <folding>
-            <element signature="e#5748#5749#0" expanded="true" />
-            <element signature="e#5784#5785#0" expanded="true" />
+            <element signature="e#5748#5749#0" expanded="false" />
+            <element signature="e#5784#5785#0" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1692,7 +1682,7 @@
     <entry file="file://$PROJECT_DIR$/.idea/artifacts/fwstk_jar.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="187">
-          <caret line="11" column="68" lean-forward="true" selection-start-line="11" selection-start-column="68" selection-end-line="11" selection-end-column="68" />
+          <caret line="11" column="68" lean-forward="false" selection-start-line="11" selection-start-column="68" selection-end-line="11" selection-end-column="68" />
           <folding />
         </state>
       </provider>

diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index 7a29a7b02ff0bca64fa20be629369bd57e38c7dc..07df54000774c9a05c304ef84a3cbf88b24a8130 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -1437,6 +1437,7 @@ class wsHTML5Compiler {
                $lessVariables['menu-select-background'] = wsHTML5::colorToCSS($this->theme->parametres->subSelectColor);
                $lessVariables['menu-select-text'] = wsHTML5::colorToCSS($this->theme->parametres->subTextSelectColor);
                $lessVariables['icon-color'] = wsHTML5::colorToCSS($this->theme->parametres->couleurI);
+               $lessVariables['menu-overlay'] = wsHTML5::colorToCSS($this->theme->parametres->popupVideoOverlay);
 
                // Archives
                if ($this->book->parametres->externalArchivesBack) {