(no commit message)

diff --git a/fluidbook/icones/1/mobile/help-fingers.svg b/fluidbook/icones/1/mobile/help-fingers.svg
index ae43ddb39561ca484fdeddc3b6aeceb4f5cc8d52..f45e6d2fe6b59706d746606e189cc1056c69d3dc 100644 (file)
--- a/fluidbook/icones/1/mobile/help-fingers.svg
+++ b/fluidbook/icones/1/mobile/help-fingers.svg
@@ -1,39 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\r
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
         width="400px" height="200px" viewBox="0 0 400 200" enable-background="new 0 0 400 200" xml:space="preserve">\r
+<path fill="#FFFFFF" d="M325.007,380.926c-6.234,3.42-17.771-15.209-24.419-15.673c-6.647-0.462-12.627,1.673-11.301,5.287\r
+       c1.328,3.614,8.041,6.632,12.646,13.757c4.607,7.125,8.96,17.877,13.788,23.558c4.826,5.681,7.769,7.103,10.452,12.148\r
+       c2.686,5.044,3.487,19.679,3.487,19.679s8.721,10.81,19.221,10.084c10.499-0.727,17.6-8.491,17.6-8.491s-1.919-14.349,0.599-26.077\r
+       c2.52-11.729,9.348-31.298,8.117-34.542s-2.151-2.216-3.605-4.017c-1.455-1.801-2.467-6.491-3.686-8.153\r
+       c-1.219-1.663-5.957-1.628-7.083-2.921c-1.126-1.297-3.726-7.551-7.257-7.432c-3.533,0.119-3.95,0.355-4.511-0.291\r
+       c-0.56-0.646-1.09-3.015-1.293-5.337c-0.204-2.322-2.585-10.019-3.636-14.103c-1.051-4.083-1.574-13.285-4.98-13.953\r
+       c-4.793-0.941-6.391,2.834-6.146,4.551c0.244,1.721,2.436,15.6,2.025,23.225S333.848,376.075,325.007,380.926z"/>\r
+<path fill="#FFFFFF" d="M510.75,419.371c8.194,1.449,10.623,1.621,16.727,3.484c6.102,1.863,23.625,18.063,23.625,18.063\r
+       s15.418,1.648,23.134-7.213c7.716-8.863,7.19-20.598,7.19-20.598s-12.842-9.813-20.113-21.059\r
+       c-7.271-11.25-17.329-32.089-20.861-33.678c-3.532-1.591-3.447-0.051-6.018-0.326c-2.57-0.272-7.072-3.176-9.346-3.526\r
+       c-2.275-0.351-5.988,3.418-7.898,3.286c-1.912-0.135-8.9-3.02-11.596-0.139c-2.695,2.884-2.838,3.399-3.79,3.332\r
+       c-0.952-0.068-3.241-1.52-5.234-3.192c-1.995-1.672-9.95-5.869-14.003-8.263c-4.054-2.394-11.73-9.246-14.947-7.084\r
+       c-4.527,3.041-2.809,7.282-1.26,8.445c1.551,1.166,14.237,10.393,19.934,16.736c5.695,6.343,8.416,9.215,15.665,21.538\r
+       c1.447,2.46,1.034,5.093,0.311,4.659s-6.545-3.814-7.124-4.828c-0.579-1.013-2.172-7.092-3.039-8.538\r
+       c-0.868-1.446-4.341-6.513-9.84-5.934c-5.5,0.579-2.027,4.487-1.014,7.236c1.014,2.75,3.038,17.366,5.644,19.826\r
+       s10.999,8.394,13.169,10.854C502.236,414.915,505.105,418.373,510.75,419.371z"/>\r
+<circle fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" cx="337.004" cy="328.412" r="11.687"/>\r
+<circle fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" cx="469.823" cy="347.279" r="13.047"/>\r
+<circle opacity="0.5" fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" cx="469.822" cy="347.28" r="21.289"/>\r
+<path fill="#FFFFFF" d="M359.093,309.676l1.417,11.041c0,1.909-1.543,3.453-3.453,3.457c-1.908-0.003-2.721-1.063-3.457-3.457\r
+       l-2.059-6.842l-6.844-2.059c-2.367-0.525-3.452-1.545-3.455-3.453c0.002-1.91,1.548-3.456,3.455-3.455l10.923,1.4\r
+       c0,0,1.662,0.123,2.512,0.973C358.98,308.131,359.093,309.676,359.093,309.676z"/>\r
+<path opacity="0.5" fill="#FFFFFF" d="M369.646,299.123l1.417,11.042c0,1.909-1.544,3.452-3.454,3.456\r
+       c-1.907-0.002-2.72-1.063-3.456-3.457l-2.059-6.842l-6.844-2.059c-2.367-0.525-3.453-1.545-3.455-3.453\r
+       c0.001-1.909,1.548-3.455,3.455-3.455l10.922,1.4c0,0,1.663,0.123,2.512,0.973C369.533,297.578,369.646,299.123,369.646,299.123z"/>\r
+<circle fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" cx="295.333" cy="370.084" r="11.687"/>\r
+<path fill="#FFFFFF" d="M273.244,388.822l-1.417-11.043c-0.001-1.908,1.544-3.452,3.453-3.455c1.907,0.002,2.721,1.063,3.457,3.456\r
+       l2.058,6.843l6.844,2.058c2.367,0.526,3.453,1.545,3.455,3.454c-0.001,1.908-1.547,3.455-3.455,3.455l-10.922-1.4\r
+       c0,0-1.662-0.125-2.512-0.974S273.244,388.822,273.244,388.822z"/>\r
+<path opacity="0.5" fill="#FFFFFF" d="M262.691,399.374l-1.416-11.042c-0.002-1.908,1.543-3.453,3.453-3.456\r
+       c1.907,0.003,2.72,1.063,3.457,3.457l2.058,6.842l6.843,2.058c2.368,0.526,3.453,1.545,3.455,3.454c0,1.909-1.547,3.456-3.455,3.455\r
+       l-10.922-1.4c0,0-1.662-0.124-2.512-0.974C262.804,400.919,262.691,399.374,262.691,399.374z"/>\r
 <path fill="#FFFFFF" d="M103.007,108.689c-6.234,3.42-17.77-15.209-24.418-15.673c-6.648-0.462-12.627,1.673-11.301,5.287\r
-       c1.328,3.614,8.041,6.632,12.647,13.757c4.607,7.125,8.959,17.877,13.788,23.558c4.826,5.681,7.769,7.103,10.453,12.147\r
-       c2.686,5.045,3.487,19.68,3.487,19.68s8.721,10.81,19.221,10.084c10.5-0.727,17.6-8.491,17.6-8.491s-1.919-14.349,0.599-26.077\r
-       c2.519-11.729,9.347-31.298,8.117-34.542s-2.151-2.216-3.605-4.017c-1.455-1.801-2.467-6.491-3.686-8.153\r
+       c1.328,3.614,8.041,6.632,12.647,13.757c4.607,7.125,8.959,17.877,13.788,23.558c4.826,5.681,7.769,7.103,10.453,12.148\r
+       c2.686,5.044,3.487,19.679,3.487,19.679s8.721,10.81,19.221,10.084c10.5-0.727,17.6-8.491,17.6-8.491s-1.919-14.349,0.599-26.077\r
+       c2.519-11.729,9.347-31.298,8.117-34.542c-1.23-3.244-2.151-2.216-3.605-4.017c-1.455-1.801-2.467-6.491-3.686-8.153\r
        c-1.219-1.663-5.957-1.627-7.083-2.921c-1.126-1.296-3.725-7.55-7.257-7.432c-3.533,0.12-3.95,0.356-4.511-0.291\r
        c-0.559-0.646-1.09-3.015-1.293-5.337c-0.205-2.322-2.585-10.019-3.636-14.103c-1.051-4.083-1.574-13.285-4.98-13.953\r
        c-4.793-0.941-6.391,2.833-6.147,4.551c0.244,1.72,2.436,15.599,2.026,23.225C112.615,87.613,111.848,103.839,103.007,108.689z"/>\r
-<path fill="#FFFFFF" d="M288.75,147.135c8.193,1.449,10.623,1.621,16.727,3.484c6.103,1.863,23.625,18.063,23.625,18.063\r
-       s15.418,1.648,23.135-7.213c7.716-8.863,7.189-20.598,7.189-20.598s-12.842-9.813-20.113-21.059\r
-       c-7.271-11.25-17.328-32.089-20.86-33.679c-3.532-1.59-3.447-0.05-6.019-0.325c-2.57-0.273-7.072-3.176-9.346-3.527\r
-       c-2.275-0.351-5.988,3.418-7.898,3.286c-1.912-0.134-8.899-3.02-11.596-0.139c-2.695,2.884-2.838,3.399-3.79,3.332\r
-       c-0.952-0.069-3.241-1.52-5.233-3.192c-1.995-1.672-9.95-5.869-14.004-8.263c-4.053-2.393-11.729-9.245-14.946-7.083\r
-       c-4.527,3.041-2.81,7.282-1.261,8.445c1.552,1.165,14.238,10.392,19.935,16.735c5.694,6.343,8.416,9.215,15.665,21.539\r
-       c1.447,2.461,1.034,5.094,0.311,4.66c-0.723-0.435-6.545-3.814-7.123-4.828c-0.58-1.014-2.172-7.092-3.039-8.539\r
-       c-0.869-1.445-4.342-6.512-9.84-5.934c-5.5,0.579-2.027,4.487-1.015,7.236c1.015,2.75,3.038,17.365,5.644,19.826\r
-       c2.606,2.46,11,8.394,13.17,10.854C280.236,142.68,283.105,146.137,288.75,147.135z"/>\r
+<path fill="#FFFFFF" d="M288.75,147.135c8.194,1.449,10.623,1.621,16.727,3.484c6.102,1.863,23.625,18.063,23.625,18.063\r
+       s15.418,1.648,23.134-7.213c7.716-8.863,7.19-20.598,7.19-20.598s-12.842-9.813-20.113-21.059\r
+       c-7.271-11.25-17.329-32.089-20.861-33.678c-3.532-1.59-3.447-0.05-6.018-0.325c-2.57-0.273-7.072-3.176-9.346-3.527\r
+       c-2.275-0.351-5.988,3.418-7.898,3.286c-1.912-0.134-8.9-3.02-11.596-0.139c-2.695,2.884-2.838,3.399-3.79,3.332\r
+       c-0.952-0.069-3.241-1.52-5.234-3.192c-1.995-1.672-9.95-5.869-14.003-8.263c-4.054-2.393-11.73-9.245-14.947-7.083\r
+       c-4.527,3.041-2.809,7.282-1.26,8.445c1.551,1.165,14.237,10.392,19.934,16.735c5.695,6.343,8.416,9.215,15.665,21.539\r
+       c1.447,2.46,1.034,5.093,0.311,4.659s-6.545-3.814-7.124-4.828c-0.579-1.013-2.172-7.092-3.039-8.538\r
+       c-0.868-1.446-4.341-6.513-9.84-5.934c-5.5,0.579-2.027,4.487-1.014,7.236c1.014,2.75,3.038,17.366,5.644,19.826\r
+       s10.999,8.394,13.169,10.854C280.236,142.679,283.105,146.137,288.75,147.135z"/>\r
 <circle fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" cx="115.004" cy="56.176" r="11.687"/>\r
 <circle fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" cx="247.823" cy="75.043" r="13.047"/>\r
-<circle opacity="0.5" fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" enable-background="new    " cx="247.822" cy="75.044" r="21.289"/>\r
+<circle opacity="0.5" fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" cx="247.822" cy="75.044" r="21.289"/>\r
 <path fill="#FFFFFF" d="M137.093,37.439l1.417,11.042c0,1.909-1.543,3.453-3.454,3.456c-1.908-0.002-2.72-1.063-3.457-3.457\r
        l-2.058-6.842l-6.844-2.058c-2.368-0.526-3.453-1.545-3.455-3.454c0.001-1.909,1.547-3.456,3.455-3.455l10.922,1.4\r
        c0,0,1.662,0.124,2.512,0.973C136.981,35.894,137.093,37.439,137.093,37.439z"/>\r
-<path opacity="0.5" fill="#FFFFFF" enable-background="new    " d="M147.646,26.887l1.417,11.042c0,1.909-1.543,3.453-3.454,3.456\r
+<path opacity="0.5" fill="#FFFFFF" d="M147.646,26.887l1.417,11.042c0,1.909-1.543,3.453-3.454,3.456\r
        c-1.907-0.002-2.72-1.063-3.457-3.457l-2.058-6.842l-6.844-2.058c-2.367-0.526-3.453-1.545-3.455-3.454\r
        c0.001-1.909,1.548-3.456,3.455-3.455l10.922,1.4c0,0,1.663,0.124,2.512,0.973C147.533,25.342,147.646,26.887,147.646,26.887z"/>\r
 <circle fill="none" stroke="#FFFFFF" stroke-width="3" stroke-miterlimit="10" cx="73.333" cy="97.848" r="11.686"/>\r
 <path fill="#FFFFFF" d="M51.244,116.586l-1.417-11.043c-0.001-1.908,1.543-3.452,3.453-3.455c1.908,0.002,2.721,1.063,3.457,3.456\r
-       l2.058,6.843l6.844,2.059c2.367,0.525,3.453,1.545,3.455,3.453c-0.001,1.908-1.548,3.455-3.455,3.455l-10.922-1.399\r
-       c0,0-1.663-0.125-2.512-0.974C51.356,118.131,51.244,116.586,51.244,116.586z"/>\r
-<path opacity="0.5" fill="#FFFFFF" enable-background="new    " d="M40.691,127.139l-1.417-11.043\r
-       c-0.001-1.908,1.543-3.453,3.453-3.455c1.908,0.002,2.72,1.063,3.457,3.457l2.058,6.842l6.843,2.058\r
-       c2.368,0.526,3.453,1.545,3.455,3.454c-0.001,1.908-1.547,3.456-3.455,3.455l-10.922-1.4c0,0-1.663-0.124-2.512-0.974\r
-       C40.804,128.684,40.691,127.139,40.691,127.139z"/>\r
+       l2.058,6.843l6.844,2.058c2.367,0.526,3.453,1.545,3.455,3.454c-0.001,1.908-1.548,3.455-3.455,3.455l-10.922-1.4\r
+       c0,0-1.663-0.125-2.512-0.974S51.244,116.586,51.244,116.586z"/>\r
+<path opacity="0.5" fill="#FFFFFF" d="M40.691,127.138l-1.417-11.042c-0.001-1.908,1.543-3.453,3.453-3.456\r
+       c1.908,0.003,2.72,1.063,3.457,3.457l2.058,6.842l6.843,2.058c2.368,0.526,3.453,1.545,3.455,3.454\r
+       c-0.001,1.909-1.547,3.456-3.455,3.455l-10.922-1.4c0,0-1.663-0.124-2.512-0.974C40.804,128.683,40.691,127.138,40.691,127.138z"/>\r
 </svg>\r

diff --git a/fluidbook/icones/1/nav-bookmark.png b/fluidbook/icones/1/nav-bookmark.png
index 92430030895e6dd8b563f5aed6dec55ef2a424b7..871f0558e6f06c0ee1c6bcae26b6dfc466f52d99 100644 (file)
Binary files a/fluidbook/icones/1/nav-bookmark.png and b/fluidbook/icones/1/nav-bookmark.png differ

diff --git a/fluidbook/icones/2/mobile/nav-bookmark.svg b/fluidbook/icones/2/mobile/nav-bookmark.svg
index 0ff3bd47da9ceb9141bc204b6548da975453a34b..fdd257a7c281898466d20f057d78cf3c43d93751 100644 (file)
--- a/fluidbook/icones/2/mobile/nav-bookmark.svg
+++ b/fluidbook/icones/2/mobile/nav-bookmark.svg
@@ -2,7 +2,14 @@
 <!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
 <svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
-        width="11px" height="20px" viewBox="0 0 11 20" enable-background="new 0 0 11 20" xml:space="preserve">\r
-<path fill-rule="evenodd" clip-rule="evenodd" fill="$colorize" d="M5.542,0.993c0.624,0,4.468,2.532,4.468,5.199V18.09c0,1.105-0.896,0.974-2,0.974\r
-       c0,0-1.201-5.28-2.493-5.28c-1.2,0-2.498,5.28-2.498,5.28c-1.104,0-2,0.132-2-0.974V6.192C1.019,3.525,4.845,0.993,5.542,0.993z"/>\r
+        width="21px" height="20px" viewBox="0 0 21 20" enable-background="new 0 0 21 20" xml:space="preserve">\r
+<path fill="$colorize" d="M17.921,1h-7.769C9.921,1,9.699,1.082,9.535,1.246L0.995,9.78c-0.25,0.25-0.325,0.49-0.189,0.816\r
+       C0.941,10.923,1.259,11,1.612,11h6.799l0.001,6.975c0,0.354,0.214,0.739,0.541,0.874c0.107,0.045,0.221,0.1,0.333,0.1\r
+       c0.228,0,0.452-0.073,0.619-0.241l8.739-8.672C18.806,9.872,19,9.658,19,9.427V1.853C19,1.371,18.403,1,17.921,1z M16.612,9.017\r
+       c-0.103,0.205-0.326,0.32-0.553,0.286l-2.577-0.394l-1.156,2.252c-0.104,0.204-0.329,0.317-0.556,0.28\r
+       c-0.111-0.018-0.211-0.07-0.288-0.146c-0.078-0.077-0.133-0.18-0.15-0.295l-0.384-2.478L8.441,8.14\r
+       C8.214,8.105,8.035,7.928,7.999,7.701C7.961,7.475,8.074,7.25,8.279,7.145l2.274-1.168l-0.394-2.532\r
+       c-0.035-0.226,0.074-0.453,0.278-0.557c0.203-0.104,0.415-0.074,0.604,0.087v0l1.819,1.808l2.246-1.139\r
+       c0.203-0.104,0.448-0.063,0.61,0.098c0.001,0,0.002,0.001,0.002,0.002c0.164,0.162,0.205,0.409,0.1,0.613l-1.142,2.226l1.835,1.82\r
+       C16.676,8.565,16.716,8.813,16.612,9.017z"/>\r
 </svg>\r

diff --git a/fluidbook/icones/2/mobile/nav-email.svg b/fluidbook/icones/2/mobile/nav-email.svg
new file mode 100644 (file)
index 0000000..03b44dc
--- /dev/null
+++ b/fluidbook/icones/2/mobile/nav-email.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
+        width="21px" height="20px" viewBox="0 0 21 20" enable-background="new 0 0 21 20" xml:space="preserve">\r
+<g>\r
+       <path fill="$colorize" d="M11.028,1.479L10.403,1.06L9.779,1.479L1.024,7.579v9.198c0,1.272,0.726,2.306,2.001,2.306H17.78\r
+               c1.274,0,2.209-1.033,2.209-2.306V7.579L11.028,1.479z M2.832,9.101l6.431,3.842L2.832,16.7V9.101z M5.362,17.058l5.042-3.421\r
+               l5.041,3.421H5.362z M18.147,16.7l-6.604-3.758l6.604-3.839V16.7z"/>\r
+</g>\r
+</svg>\r

diff --git a/fluidbook/icones/2/mobile/nav-twitter.svg b/fluidbook/icones/2/mobile/nav-twitter.svg
index 97bcabe54066bbd7e1718db090241a7a4cfddcc3..6ba481de55d868a17caf20755a4d44627c982621 100644 (file)
--- a/fluidbook/icones/2/mobile/nav-twitter.svg
+++ b/fluidbook/icones/2/mobile/nav-twitter.svg
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
-<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
-        width="20px" height="20px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">\r
-<path fill="$colorize" d="M19,3.055C19,1.92,18.08,1,16.944,1H3.056C1.92,1,1,1.92,1,3.055v13.89C1,18.08,1.92,19,3.056,19h13.889\r
-       C18.08,19,19,18.08,19,16.945V3.055z M14.871,10.326c-1.059,4.3-8.175,6.125-11.448,1.66c1.254,1.197,3.438,1.304,4.822-0.13\r
-       c-0.812,0.119-1.403-0.678-0.405-1.108c-0.897,0.098-1.396-0.379-1.6-0.785c0.21-0.22,0.443-0.323,0.891-0.352\r
-       C6.148,9.379,5.786,8.898,5.675,8.315C5.947,8.25,6.288,8.194,6.474,8.219c-0.859-0.45-1.158-1.126-1.111-1.636\r
-       c1.537,0.571,2.517,1.03,3.335,1.469c0.292,0.156,0.618,0.437,0.985,0.793c0.467-1.237,1.045-2.513,2.035-3.146\r
-       c-0.017,0.144-0.094,0.277-0.195,0.386c0.281-0.255,0.645-0.431,1.016-0.481c-0.043,0.278-0.442,0.436-0.685,0.525\r
-       c0.184-0.057,1.157-0.491,1.262-0.243c0.127,0.28-0.672,0.411-0.806,0.459c-0.103,0.034-0.203,0.072-0.302,0.112\r
-       c1.233-0.124,2.411,0.895,2.755,2.159c0.024,0.092,0.049,0.193,0.071,0.298c0.452,0.169,1.269-0.007,1.531-0.17\r
-       C16.176,9.198,15.681,9.53,14.95,9.59c0.352,0.146,1.016,0.228,1.473,0.15C16.134,10.051,15.668,10.332,14.871,10.326z"/>\r
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="20px"\r
+        height="20px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">\r
+<g>\r
+       <path fill="$colorize" d="M16.811,0.935H2.921c-1.13,0-2.055,0.925-2.055,2.055v13.893c0,1.131,0.925,2.055,2.055,2.055h13.89\r
+               c1.131,0,2.056-0.924,2.056-2.055V2.99C18.866,1.859,17.941,0.935,16.811,0.935z M15.277,7.293\r
+               c0.006,0.117,0.009,0.234,0.009,0.352c0,3.599-2.739,7.749-7.748,7.749c-1.538,0-2.97-0.451-4.175-1.224\r
+               c0.213,0.025,0.43,0.038,0.649,0.038c1.276,0,2.45-0.436,3.382-1.166c-1.191-0.021-2.198-0.809-2.544-1.892\r
+               c0.167,0.033,0.337,0.049,0.512,0.049c0.249,0,0.489-0.032,0.718-0.095c-1.246-0.25-2.185-1.351-2.185-2.671\r
+               c0-0.011,0-0.022,0-0.034C4.264,8.604,4.684,8.727,5.13,8.74C4.399,8.252,3.918,7.418,3.918,6.474c0-0.5,0.134-0.967,0.369-1.37\r
+               C5.63,6.752,7.637,7.836,9.9,7.95C9.854,7.751,9.83,7.543,9.83,7.33c0-1.504,1.22-2.723,2.723-2.723\r
+               c0.784,0,1.491,0.331,1.988,0.859c0.62-0.122,1.202-0.348,1.729-0.661c-0.204,0.636-0.636,1.17-1.197,1.507\r
+               c0.551-0.066,1.075-0.212,1.563-0.429C16.271,6.429,15.811,6.909,15.277,7.293z"/>\r
+</g>\r
 </svg>\r

diff --git a/fluidbook/icones/3/mobile/nav-bookmark.svg b/fluidbook/icones/3/mobile/nav-bookmark.svg
index 0ff3bd47da9ceb9141bc204b6548da975453a34b..fdd257a7c281898466d20f057d78cf3c43d93751 100644 (file)
--- a/fluidbook/icones/3/mobile/nav-bookmark.svg
+++ b/fluidbook/icones/3/mobile/nav-bookmark.svg
@@ -2,7 +2,14 @@
 <!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
 <svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
-        width="11px" height="20px" viewBox="0 0 11 20" enable-background="new 0 0 11 20" xml:space="preserve">\r
-<path fill-rule="evenodd" clip-rule="evenodd" fill="$colorize" d="M5.542,0.993c0.624,0,4.468,2.532,4.468,5.199V18.09c0,1.105-0.896,0.974-2,0.974\r
-       c0,0-1.201-5.28-2.493-5.28c-1.2,0-2.498,5.28-2.498,5.28c-1.104,0-2,0.132-2-0.974V6.192C1.019,3.525,4.845,0.993,5.542,0.993z"/>\r
+        width="21px" height="20px" viewBox="0 0 21 20" enable-background="new 0 0 21 20" xml:space="preserve">\r
+<path fill="$colorize" d="M17.921,1h-7.769C9.921,1,9.699,1.082,9.535,1.246L0.995,9.78c-0.25,0.25-0.325,0.49-0.189,0.816\r
+       C0.941,10.923,1.259,11,1.612,11h6.799l0.001,6.975c0,0.354,0.214,0.739,0.541,0.874c0.107,0.045,0.221,0.1,0.333,0.1\r
+       c0.228,0,0.452-0.073,0.619-0.241l8.739-8.672C18.806,9.872,19,9.658,19,9.427V1.853C19,1.371,18.403,1,17.921,1z M16.612,9.017\r
+       c-0.103,0.205-0.326,0.32-0.553,0.286l-2.577-0.394l-1.156,2.252c-0.104,0.204-0.329,0.317-0.556,0.28\r
+       c-0.111-0.018-0.211-0.07-0.288-0.146c-0.078-0.077-0.133-0.18-0.15-0.295l-0.384-2.478L8.441,8.14\r
+       C8.214,8.105,8.035,7.928,7.999,7.701C7.961,7.475,8.074,7.25,8.279,7.145l2.274-1.168l-0.394-2.532\r
+       c-0.035-0.226,0.074-0.453,0.278-0.557c0.203-0.104,0.415-0.074,0.604,0.087v0l1.819,1.808l2.246-1.139\r
+       c0.203-0.104,0.448-0.063,0.61,0.098c0.001,0,0.002,0.001,0.002,0.002c0.164,0.162,0.205,0.409,0.1,0.613l-1.142,2.226l1.835,1.82\r
+       C16.676,8.565,16.716,8.813,16.612,9.017z"/>\r
 </svg>\r

diff --git a/fluidbook/icones/3/mobile/nav-email.svg b/fluidbook/icones/3/mobile/nav-email.svg
new file mode 100644 (file)
index 0000000..03b44dc
--- /dev/null
+++ b/fluidbook/icones/3/mobile/nav-email.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
+        width="21px" height="20px" viewBox="0 0 21 20" enable-background="new 0 0 21 20" xml:space="preserve">\r
+<g>\r
+       <path fill="$colorize" d="M11.028,1.479L10.403,1.06L9.779,1.479L1.024,7.579v9.198c0,1.272,0.726,2.306,2.001,2.306H17.78\r
+               c1.274,0,2.209-1.033,2.209-2.306V7.579L11.028,1.479z M2.832,9.101l6.431,3.842L2.832,16.7V9.101z M5.362,17.058l5.042-3.421\r
+               l5.041,3.421H5.362z M18.147,16.7l-6.604-3.758l6.604-3.839V16.7z"/>\r
+</g>\r
+</svg>\r

diff --git a/fluidbook/icones/3/mobile/nav-twitter.svg b/fluidbook/icones/3/mobile/nav-twitter.svg
index 97bcabe54066bbd7e1718db090241a7a4cfddcc3..6ba481de55d868a17caf20755a4d44627c982621 100644 (file)
--- a/fluidbook/icones/3/mobile/nav-twitter.svg
+++ b/fluidbook/icones/3/mobile/nav-twitter.svg
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
-<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
-        width="20px" height="20px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">\r
-<path fill="$colorize" d="M19,3.055C19,1.92,18.08,1,16.944,1H3.056C1.92,1,1,1.92,1,3.055v13.89C1,18.08,1.92,19,3.056,19h13.889\r
-       C18.08,19,19,18.08,19,16.945V3.055z M14.871,10.326c-1.059,4.3-8.175,6.125-11.448,1.66c1.254,1.197,3.438,1.304,4.822-0.13\r
-       c-0.812,0.119-1.403-0.678-0.405-1.108c-0.897,0.098-1.396-0.379-1.6-0.785c0.21-0.22,0.443-0.323,0.891-0.352\r
-       C6.148,9.379,5.786,8.898,5.675,8.315C5.947,8.25,6.288,8.194,6.474,8.219c-0.859-0.45-1.158-1.126-1.111-1.636\r
-       c1.537,0.571,2.517,1.03,3.335,1.469c0.292,0.156,0.618,0.437,0.985,0.793c0.467-1.237,1.045-2.513,2.035-3.146\r
-       c-0.017,0.144-0.094,0.277-0.195,0.386c0.281-0.255,0.645-0.431,1.016-0.481c-0.043,0.278-0.442,0.436-0.685,0.525\r
-       c0.184-0.057,1.157-0.491,1.262-0.243c0.127,0.28-0.672,0.411-0.806,0.459c-0.103,0.034-0.203,0.072-0.302,0.112\r
-       c1.233-0.124,2.411,0.895,2.755,2.159c0.024,0.092,0.049,0.193,0.071,0.298c0.452,0.169,1.269-0.007,1.531-0.17\r
-       C16.176,9.198,15.681,9.53,14.95,9.59c0.352,0.146,1.016,0.228,1.473,0.15C16.134,10.051,15.668,10.332,14.871,10.326z"/>\r
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="20px"\r
+        height="20px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">\r
+<g>\r
+       <path fill="$colorize" d="M16.811,0.935H2.921c-1.13,0-2.055,0.925-2.055,2.055v13.893c0,1.131,0.925,2.055,2.055,2.055h13.89\r
+               c1.131,0,2.056-0.924,2.056-2.055V2.99C18.866,1.859,17.941,0.935,16.811,0.935z M15.277,7.293\r
+               c0.006,0.117,0.009,0.234,0.009,0.352c0,3.599-2.739,7.749-7.748,7.749c-1.538,0-2.97-0.451-4.175-1.224\r
+               c0.213,0.025,0.43,0.038,0.649,0.038c1.276,0,2.45-0.436,3.382-1.166c-1.191-0.021-2.198-0.809-2.544-1.892\r
+               c0.167,0.033,0.337,0.049,0.512,0.049c0.249,0,0.489-0.032,0.718-0.095c-1.246-0.25-2.185-1.351-2.185-2.671\r
+               c0-0.011,0-0.022,0-0.034C4.264,8.604,4.684,8.727,5.13,8.74C4.399,8.252,3.918,7.418,3.918,6.474c0-0.5,0.134-0.967,0.369-1.37\r
+               C5.63,6.752,7.637,7.836,9.9,7.95C9.854,7.751,9.83,7.543,9.83,7.33c0-1.504,1.22-2.723,2.723-2.723\r
+               c0.784,0,1.491,0.331,1.988,0.859c0.62-0.122,1.202-0.348,1.729-0.661c-0.204,0.636-0.636,1.17-1.197,1.507\r
+               c0.551-0.066,1.075-0.212,1.563-0.429C16.271,6.429,15.811,6.909,15.277,7.293z"/>\r
+</g>\r
 </svg>\r

diff --git a/fluidbook/icones/3/nav-bookmark.png b/fluidbook/icones/3/nav-bookmark.png
index 111b08bfb972fcf2d1b6c849ee2d9894f2c0ef1d..871f0558e6f06c0ee1c6bcae26b6dfc466f52d99 100644 (file)
Binary files a/fluidbook/icones/3/nav-bookmark.png and b/fluidbook/icones/3/nav-bookmark.png differ

diff --git a/fluidbook/icones/3/nav-email.png b/fluidbook/icones/3/nav-email.png
new file mode 100644 (file)
index 0000000..9aad181
Binary files /dev/null and b/fluidbook/icones/3/nav-email.png differ

diff --git a/fluidbook/icones/3/nav-facebook.png b/fluidbook/icones/3/nav-facebook.png
new file mode 100644 (file)
index 0000000..7dcb713
Binary files /dev/null and b/fluidbook/icones/3/nav-facebook.png differ

diff --git a/fluidbook/icones/3/nav-twitter.png b/fluidbook/icones/3/nav-twitter.png
new file mode 100644 (file)
index 0000000..a4ad9ad
Binary files /dev/null and b/fluidbook/icones/3/nav-twitter.png differ

diff --git a/fluidbook/icones/4/mobile/nav-bookmark.svg b/fluidbook/icones/4/mobile/nav-bookmark.svg
index 0ff3bd47da9ceb9141bc204b6548da975453a34b..fdd257a7c281898466d20f057d78cf3c43d93751 100644 (file)
--- a/fluidbook/icones/4/mobile/nav-bookmark.svg
+++ b/fluidbook/icones/4/mobile/nav-bookmark.svg
@@ -2,7 +2,14 @@
 <!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
 <svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
-        width="11px" height="20px" viewBox="0 0 11 20" enable-background="new 0 0 11 20" xml:space="preserve">\r
-<path fill-rule="evenodd" clip-rule="evenodd" fill="$colorize" d="M5.542,0.993c0.624,0,4.468,2.532,4.468,5.199V18.09c0,1.105-0.896,0.974-2,0.974\r
-       c0,0-1.201-5.28-2.493-5.28c-1.2,0-2.498,5.28-2.498,5.28c-1.104,0-2,0.132-2-0.974V6.192C1.019,3.525,4.845,0.993,5.542,0.993z"/>\r
+        width="21px" height="20px" viewBox="0 0 21 20" enable-background="new 0 0 21 20" xml:space="preserve">\r
+<path fill="$colorize" d="M17.921,1h-7.769C9.921,1,9.699,1.082,9.535,1.246L0.995,9.78c-0.25,0.25-0.325,0.49-0.189,0.816\r
+       C0.941,10.923,1.259,11,1.612,11h6.799l0.001,6.975c0,0.354,0.214,0.739,0.541,0.874c0.107,0.045,0.221,0.1,0.333,0.1\r
+       c0.228,0,0.452-0.073,0.619-0.241l8.739-8.672C18.806,9.872,19,9.658,19,9.427V1.853C19,1.371,18.403,1,17.921,1z M16.612,9.017\r
+       c-0.103,0.205-0.326,0.32-0.553,0.286l-2.577-0.394l-1.156,2.252c-0.104,0.204-0.329,0.317-0.556,0.28\r
+       c-0.111-0.018-0.211-0.07-0.288-0.146c-0.078-0.077-0.133-0.18-0.15-0.295l-0.384-2.478L8.441,8.14\r
+       C8.214,8.105,8.035,7.928,7.999,7.701C7.961,7.475,8.074,7.25,8.279,7.145l2.274-1.168l-0.394-2.532\r
+       c-0.035-0.226,0.074-0.453,0.278-0.557c0.203-0.104,0.415-0.074,0.604,0.087v0l1.819,1.808l2.246-1.139\r
+       c0.203-0.104,0.448-0.063,0.61,0.098c0.001,0,0.002,0.001,0.002,0.002c0.164,0.162,0.205,0.409,0.1,0.613l-1.142,2.226l1.835,1.82\r
+       C16.676,8.565,16.716,8.813,16.612,9.017z"/>\r
 </svg>\r

diff --git a/fluidbook/icones/4/mobile/nav-email.svg b/fluidbook/icones/4/mobile/nav-email.svg
new file mode 100644 (file)
index 0000000..03b44dc
--- /dev/null
+++ b/fluidbook/icones/4/mobile/nav-email.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
+        width="21px" height="20px" viewBox="0 0 21 20" enable-background="new 0 0 21 20" xml:space="preserve">\r
+<g>\r
+       <path fill="$colorize" d="M11.028,1.479L10.403,1.06L9.779,1.479L1.024,7.579v9.198c0,1.272,0.726,2.306,2.001,2.306H17.78\r
+               c1.274,0,2.209-1.033,2.209-2.306V7.579L11.028,1.479z M2.832,9.101l6.431,3.842L2.832,16.7V9.101z M5.362,17.058l5.042-3.421\r
+               l5.041,3.421H5.362z M18.147,16.7l-6.604-3.758l6.604-3.839V16.7z"/>\r
+</g>\r
+</svg>\r

diff --git a/fluidbook/icones/4/mobile/nav-twitter.svg b/fluidbook/icones/4/mobile/nav-twitter.svg
index 97bcabe54066bbd7e1718db090241a7a4cfddcc3..6ba481de55d868a17caf20755a4d44627c982621 100644 (file)
--- a/fluidbook/icones/4/mobile/nav-twitter.svg
+++ b/fluidbook/icones/4/mobile/nav-twitter.svg
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
-<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
-        width="20px" height="20px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">\r
-<path fill="$colorize" d="M19,3.055C19,1.92,18.08,1,16.944,1H3.056C1.92,1,1,1.92,1,3.055v13.89C1,18.08,1.92,19,3.056,19h13.889\r
-       C18.08,19,19,18.08,19,16.945V3.055z M14.871,10.326c-1.059,4.3-8.175,6.125-11.448,1.66c1.254,1.197,3.438,1.304,4.822-0.13\r
-       c-0.812,0.119-1.403-0.678-0.405-1.108c-0.897,0.098-1.396-0.379-1.6-0.785c0.21-0.22,0.443-0.323,0.891-0.352\r
-       C6.148,9.379,5.786,8.898,5.675,8.315C5.947,8.25,6.288,8.194,6.474,8.219c-0.859-0.45-1.158-1.126-1.111-1.636\r
-       c1.537,0.571,2.517,1.03,3.335,1.469c0.292,0.156,0.618,0.437,0.985,0.793c0.467-1.237,1.045-2.513,2.035-3.146\r
-       c-0.017,0.144-0.094,0.277-0.195,0.386c0.281-0.255,0.645-0.431,1.016-0.481c-0.043,0.278-0.442,0.436-0.685,0.525\r
-       c0.184-0.057,1.157-0.491,1.262-0.243c0.127,0.28-0.672,0.411-0.806,0.459c-0.103,0.034-0.203,0.072-0.302,0.112\r
-       c1.233-0.124,2.411,0.895,2.755,2.159c0.024,0.092,0.049,0.193,0.071,0.298c0.452,0.169,1.269-0.007,1.531-0.17\r
-       C16.176,9.198,15.681,9.53,14.95,9.59c0.352,0.146,1.016,0.228,1.473,0.15C16.134,10.051,15.668,10.332,14.871,10.326z"/>\r
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="20px"\r
+        height="20px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">\r
+<g>\r
+       <path fill="$colorize" d="M16.811,0.935H2.921c-1.13,0-2.055,0.925-2.055,2.055v13.893c0,1.131,0.925,2.055,2.055,2.055h13.89\r
+               c1.131,0,2.056-0.924,2.056-2.055V2.99C18.866,1.859,17.941,0.935,16.811,0.935z M15.277,7.293\r
+               c0.006,0.117,0.009,0.234,0.009,0.352c0,3.599-2.739,7.749-7.748,7.749c-1.538,0-2.97-0.451-4.175-1.224\r
+               c0.213,0.025,0.43,0.038,0.649,0.038c1.276,0,2.45-0.436,3.382-1.166c-1.191-0.021-2.198-0.809-2.544-1.892\r
+               c0.167,0.033,0.337,0.049,0.512,0.049c0.249,0,0.489-0.032,0.718-0.095c-1.246-0.25-2.185-1.351-2.185-2.671\r
+               c0-0.011,0-0.022,0-0.034C4.264,8.604,4.684,8.727,5.13,8.74C4.399,8.252,3.918,7.418,3.918,6.474c0-0.5,0.134-0.967,0.369-1.37\r
+               C5.63,6.752,7.637,7.836,9.9,7.95C9.854,7.751,9.83,7.543,9.83,7.33c0-1.504,1.22-2.723,2.723-2.723\r
+               c0.784,0,1.491,0.331,1.988,0.859c0.62-0.122,1.202-0.348,1.729-0.661c-0.204,0.636-0.636,1.17-1.197,1.507\r
+               c0.551-0.066,1.075-0.212,1.563-0.429C16.271,6.429,15.811,6.909,15.277,7.293z"/>\r
+</g>\r
 </svg>\r

diff --git a/fluidbook/icones/4/nav-bookmark.png b/fluidbook/icones/4/nav-bookmark.png
index 111b08bfb972fcf2d1b6c849ee2d9894f2c0ef1d..871f0558e6f06c0ee1c6bcae26b6dfc466f52d99 100644 (file)
Binary files a/fluidbook/icones/4/nav-bookmark.png and b/fluidbook/icones/4/nav-bookmark.png differ

diff --git a/fluidbook/icones/4/nav-email.png b/fluidbook/icones/4/nav-email.png
new file mode 100644 (file)
index 0000000..9aad181
Binary files /dev/null and b/fluidbook/icones/4/nav-email.png differ

diff --git a/fluidbook/icones/4/nav-facebook.png b/fluidbook/icones/4/nav-facebook.png
new file mode 100644 (file)
index 0000000..7dcb713
Binary files /dev/null and b/fluidbook/icones/4/nav-facebook.png differ

diff --git a/fluidbook/icones/4/nav-twitter.png b/fluidbook/icones/4/nav-twitter.png
new file mode 100644 (file)
index 0000000..a4ad9ad
Binary files /dev/null and b/fluidbook/icones/4/nav-twitter.png differ

diff --git a/fluidbook/icones/5/mobile/nav-bookmark.svg b/fluidbook/icones/5/mobile/nav-bookmark.svg
index 0ff3bd47da9ceb9141bc204b6548da975453a34b..fdd257a7c281898466d20f057d78cf3c43d93751 100644 (file)
--- a/fluidbook/icones/5/mobile/nav-bookmark.svg
+++ b/fluidbook/icones/5/mobile/nav-bookmark.svg
@@ -2,7 +2,14 @@
 <!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
 <svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
-        width="11px" height="20px" viewBox="0 0 11 20" enable-background="new 0 0 11 20" xml:space="preserve">\r
-<path fill-rule="evenodd" clip-rule="evenodd" fill="$colorize" d="M5.542,0.993c0.624,0,4.468,2.532,4.468,5.199V18.09c0,1.105-0.896,0.974-2,0.974\r
-       c0,0-1.201-5.28-2.493-5.28c-1.2,0-2.498,5.28-2.498,5.28c-1.104,0-2,0.132-2-0.974V6.192C1.019,3.525,4.845,0.993,5.542,0.993z"/>\r
+        width="21px" height="20px" viewBox="0 0 21 20" enable-background="new 0 0 21 20" xml:space="preserve">\r
+<path fill="$colorize" d="M17.921,1h-7.769C9.921,1,9.699,1.082,9.535,1.246L0.995,9.78c-0.25,0.25-0.325,0.49-0.189,0.816\r
+       C0.941,10.923,1.259,11,1.612,11h6.799l0.001,6.975c0,0.354,0.214,0.739,0.541,0.874c0.107,0.045,0.221,0.1,0.333,0.1\r
+       c0.228,0,0.452-0.073,0.619-0.241l8.739-8.672C18.806,9.872,19,9.658,19,9.427V1.853C19,1.371,18.403,1,17.921,1z M16.612,9.017\r
+       c-0.103,0.205-0.326,0.32-0.553,0.286l-2.577-0.394l-1.156,2.252c-0.104,0.204-0.329,0.317-0.556,0.28\r
+       c-0.111-0.018-0.211-0.07-0.288-0.146c-0.078-0.077-0.133-0.18-0.15-0.295l-0.384-2.478L8.441,8.14\r
+       C8.214,8.105,8.035,7.928,7.999,7.701C7.961,7.475,8.074,7.25,8.279,7.145l2.274-1.168l-0.394-2.532\r
+       c-0.035-0.226,0.074-0.453,0.278-0.557c0.203-0.104,0.415-0.074,0.604,0.087v0l1.819,1.808l2.246-1.139\r
+       c0.203-0.104,0.448-0.063,0.61,0.098c0.001,0,0.002,0.001,0.002,0.002c0.164,0.162,0.205,0.409,0.1,0.613l-1.142,2.226l1.835,1.82\r
+       C16.676,8.565,16.716,8.813,16.612,9.017z"/>\r
 </svg>\r

diff --git a/fluidbook/icones/5/mobile/nav-email.svg b/fluidbook/icones/5/mobile/nav-email.svg
new file mode 100644 (file)
index 0000000..03b44dc
--- /dev/null
+++ b/fluidbook/icones/5/mobile/nav-email.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
+        width="21px" height="20px" viewBox="0 0 21 20" enable-background="new 0 0 21 20" xml:space="preserve">\r
+<g>\r
+       <path fill="$colorize" d="M11.028,1.479L10.403,1.06L9.779,1.479L1.024,7.579v9.198c0,1.272,0.726,2.306,2.001,2.306H17.78\r
+               c1.274,0,2.209-1.033,2.209-2.306V7.579L11.028,1.479z M2.832,9.101l6.431,3.842L2.832,16.7V9.101z M5.362,17.058l5.042-3.421\r
+               l5.041,3.421H5.362z M18.147,16.7l-6.604-3.758l6.604-3.839V16.7z"/>\r
+</g>\r
+</svg>\r

diff --git a/fluidbook/icones/5/mobile/nav-twitter.svg b/fluidbook/icones/5/mobile/nav-twitter.svg
index 97bcabe54066bbd7e1718db090241a7a4cfddcc3..6ba481de55d868a17caf20755a4d44627c982621 100644 (file)
--- a/fluidbook/icones/5/mobile/nav-twitter.svg
+++ b/fluidbook/icones/5/mobile/nav-twitter.svg
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
-<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
-        width="20px" height="20px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">\r
-<path fill="$colorize" d="M19,3.055C19,1.92,18.08,1,16.944,1H3.056C1.92,1,1,1.92,1,3.055v13.89C1,18.08,1.92,19,3.056,19h13.889\r
-       C18.08,19,19,18.08,19,16.945V3.055z M14.871,10.326c-1.059,4.3-8.175,6.125-11.448,1.66c1.254,1.197,3.438,1.304,4.822-0.13\r
-       c-0.812,0.119-1.403-0.678-0.405-1.108c-0.897,0.098-1.396-0.379-1.6-0.785c0.21-0.22,0.443-0.323,0.891-0.352\r
-       C6.148,9.379,5.786,8.898,5.675,8.315C5.947,8.25,6.288,8.194,6.474,8.219c-0.859-0.45-1.158-1.126-1.111-1.636\r
-       c1.537,0.571,2.517,1.03,3.335,1.469c0.292,0.156,0.618,0.437,0.985,0.793c0.467-1.237,1.045-2.513,2.035-3.146\r
-       c-0.017,0.144-0.094,0.277-0.195,0.386c0.281-0.255,0.645-0.431,1.016-0.481c-0.043,0.278-0.442,0.436-0.685,0.525\r
-       c0.184-0.057,1.157-0.491,1.262-0.243c0.127,0.28-0.672,0.411-0.806,0.459c-0.103,0.034-0.203,0.072-0.302,0.112\r
-       c1.233-0.124,2.411,0.895,2.755,2.159c0.024,0.092,0.049,0.193,0.071,0.298c0.452,0.169,1.269-0.007,1.531-0.17\r
-       C16.176,9.198,15.681,9.53,14.95,9.59c0.352,0.146,1.016,0.228,1.473,0.15C16.134,10.051,15.668,10.332,14.871,10.326z"/>\r
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="20px"\r
+        height="20px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">\r
+<g>\r
+       <path fill="$colorize" d="M16.811,0.935H2.921c-1.13,0-2.055,0.925-2.055,2.055v13.893c0,1.131,0.925,2.055,2.055,2.055h13.89\r
+               c1.131,0,2.056-0.924,2.056-2.055V2.99C18.866,1.859,17.941,0.935,16.811,0.935z M15.277,7.293\r
+               c0.006,0.117,0.009,0.234,0.009,0.352c0,3.599-2.739,7.749-7.748,7.749c-1.538,0-2.97-0.451-4.175-1.224\r
+               c0.213,0.025,0.43,0.038,0.649,0.038c1.276,0,2.45-0.436,3.382-1.166c-1.191-0.021-2.198-0.809-2.544-1.892\r
+               c0.167,0.033,0.337,0.049,0.512,0.049c0.249,0,0.489-0.032,0.718-0.095c-1.246-0.25-2.185-1.351-2.185-2.671\r
+               c0-0.011,0-0.022,0-0.034C4.264,8.604,4.684,8.727,5.13,8.74C4.399,8.252,3.918,7.418,3.918,6.474c0-0.5,0.134-0.967,0.369-1.37\r
+               C5.63,6.752,7.637,7.836,9.9,7.95C9.854,7.751,9.83,7.543,9.83,7.33c0-1.504,1.22-2.723,2.723-2.723\r
+               c0.784,0,1.491,0.331,1.988,0.859c0.62-0.122,1.202-0.348,1.729-0.661c-0.204,0.636-0.636,1.17-1.197,1.507\r
+               c0.551-0.066,1.075-0.212,1.563-0.429C16.271,6.429,15.811,6.909,15.277,7.293z"/>\r
+</g>\r
 </svg>\r

diff --git a/fluidbook/icones/5/nav-bookmark.png b/fluidbook/icones/5/nav-bookmark.png
index 9b2a206e3e16b31023357a77cde30d197e5a06c1..871f0558e6f06c0ee1c6bcae26b6dfc466f52d99 100644 (file)
Binary files a/fluidbook/icones/5/nav-bookmark.png and b/fluidbook/icones/5/nav-bookmark.png differ

diff --git a/fluidbook/icones/5/nav-email.png b/fluidbook/icones/5/nav-email.png
new file mode 100644 (file)
index 0000000..9aad181
Binary files /dev/null and b/fluidbook/icones/5/nav-email.png differ

diff --git a/fluidbook/icones/5/nav-facebook.png b/fluidbook/icones/5/nav-facebook.png
new file mode 100644 (file)
index 0000000..7dcb713
Binary files /dev/null and b/fluidbook/icones/5/nav-facebook.png differ

diff --git a/fluidbook/icones/5/nav-twitter.png b/fluidbook/icones/5/nav-twitter.png
new file mode 100644 (file)
index 0000000..a4ad9ad
Binary files /dev/null and b/fluidbook/icones/5/nav-twitter.png differ

diff --git a/fluidbook/icones/6/mobile/nav-bookmark.svg b/fluidbook/icones/6/mobile/nav-bookmark.svg
index 0ff3bd47da9ceb9141bc204b6548da975453a34b..fdd257a7c281898466d20f057d78cf3c43d93751 100644 (file)
--- a/fluidbook/icones/6/mobile/nav-bookmark.svg
+++ b/fluidbook/icones/6/mobile/nav-bookmark.svg
@@ -2,7 +2,14 @@
 <!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
 <svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
-        width="11px" height="20px" viewBox="0 0 11 20" enable-background="new 0 0 11 20" xml:space="preserve">\r
-<path fill-rule="evenodd" clip-rule="evenodd" fill="$colorize" d="M5.542,0.993c0.624,0,4.468,2.532,4.468,5.199V18.09c0,1.105-0.896,0.974-2,0.974\r
-       c0,0-1.201-5.28-2.493-5.28c-1.2,0-2.498,5.28-2.498,5.28c-1.104,0-2,0.132-2-0.974V6.192C1.019,3.525,4.845,0.993,5.542,0.993z"/>\r
+        width="21px" height="20px" viewBox="0 0 21 20" enable-background="new 0 0 21 20" xml:space="preserve">\r
+<path fill="$colorize" d="M17.921,1h-7.769C9.921,1,9.699,1.082,9.535,1.246L0.995,9.78c-0.25,0.25-0.325,0.49-0.189,0.816\r
+       C0.941,10.923,1.259,11,1.612,11h6.799l0.001,6.975c0,0.354,0.214,0.739,0.541,0.874c0.107,0.045,0.221,0.1,0.333,0.1\r
+       c0.228,0,0.452-0.073,0.619-0.241l8.739-8.672C18.806,9.872,19,9.658,19,9.427V1.853C19,1.371,18.403,1,17.921,1z M16.612,9.017\r
+       c-0.103,0.205-0.326,0.32-0.553,0.286l-2.577-0.394l-1.156,2.252c-0.104,0.204-0.329,0.317-0.556,0.28\r
+       c-0.111-0.018-0.211-0.07-0.288-0.146c-0.078-0.077-0.133-0.18-0.15-0.295l-0.384-2.478L8.441,8.14\r
+       C8.214,8.105,8.035,7.928,7.999,7.701C7.961,7.475,8.074,7.25,8.279,7.145l2.274-1.168l-0.394-2.532\r
+       c-0.035-0.226,0.074-0.453,0.278-0.557c0.203-0.104,0.415-0.074,0.604,0.087v0l1.819,1.808l2.246-1.139\r
+       c0.203-0.104,0.448-0.063,0.61,0.098c0.001,0,0.002,0.001,0.002,0.002c0.164,0.162,0.205,0.409,0.1,0.613l-1.142,2.226l1.835,1.82\r
+       C16.676,8.565,16.716,8.813,16.612,9.017z"/>\r
 </svg>\r

diff --git a/fluidbook/icones/6/mobile/nav-email.svg b/fluidbook/icones/6/mobile/nav-email.svg
new file mode 100644 (file)
index 0000000..03b44dc
--- /dev/null
+++ b/fluidbook/icones/6/mobile/nav-email.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
+        width="21px" height="20px" viewBox="0 0 21 20" enable-background="new 0 0 21 20" xml:space="preserve">\r
+<g>\r
+       <path fill="$colorize" d="M11.028,1.479L10.403,1.06L9.779,1.479L1.024,7.579v9.198c0,1.272,0.726,2.306,2.001,2.306H17.78\r
+               c1.274,0,2.209-1.033,2.209-2.306V7.579L11.028,1.479z M2.832,9.101l6.431,3.842L2.832,16.7V9.101z M5.362,17.058l5.042-3.421\r
+               l5.041,3.421H5.362z M18.147,16.7l-6.604-3.758l6.604-3.839V16.7z"/>\r
+</g>\r
+</svg>\r

diff --git a/fluidbook/icones/6/mobile/nav-twitter.svg b/fluidbook/icones/6/mobile/nav-twitter.svg
index 97bcabe54066bbd7e1718db090241a7a4cfddcc3..6ba481de55d868a17caf20755a4d44627c982621 100644 (file)
--- a/fluidbook/icones/6/mobile/nav-twitter.svg
+++ b/fluidbook/icones/6/mobile/nav-twitter.svg
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
-<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
-        width="20px" height="20px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">\r
-<path fill="$colorize" d="M19,3.055C19,1.92,18.08,1,16.944,1H3.056C1.92,1,1,1.92,1,3.055v13.89C1,18.08,1.92,19,3.056,19h13.889\r
-       C18.08,19,19,18.08,19,16.945V3.055z M14.871,10.326c-1.059,4.3-8.175,6.125-11.448,1.66c1.254,1.197,3.438,1.304,4.822-0.13\r
-       c-0.812,0.119-1.403-0.678-0.405-1.108c-0.897,0.098-1.396-0.379-1.6-0.785c0.21-0.22,0.443-0.323,0.891-0.352\r
-       C6.148,9.379,5.786,8.898,5.675,8.315C5.947,8.25,6.288,8.194,6.474,8.219c-0.859-0.45-1.158-1.126-1.111-1.636\r
-       c1.537,0.571,2.517,1.03,3.335,1.469c0.292,0.156,0.618,0.437,0.985,0.793c0.467-1.237,1.045-2.513,2.035-3.146\r
-       c-0.017,0.144-0.094,0.277-0.195,0.386c0.281-0.255,0.645-0.431,1.016-0.481c-0.043,0.278-0.442,0.436-0.685,0.525\r
-       c0.184-0.057,1.157-0.491,1.262-0.243c0.127,0.28-0.672,0.411-0.806,0.459c-0.103,0.034-0.203,0.072-0.302,0.112\r
-       c1.233-0.124,2.411,0.895,2.755,2.159c0.024,0.092,0.049,0.193,0.071,0.298c0.452,0.169,1.269-0.007,1.531-0.17\r
-       C16.176,9.198,15.681,9.53,14.95,9.59c0.352,0.146,1.016,0.228,1.473,0.15C16.134,10.051,15.668,10.332,14.871,10.326z"/>\r
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="20px"\r
+        height="20px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">\r
+<g>\r
+       <path fill="$colorize" d="M16.811,0.935H2.921c-1.13,0-2.055,0.925-2.055,2.055v13.893c0,1.131,0.925,2.055,2.055,2.055h13.89\r
+               c1.131,0,2.056-0.924,2.056-2.055V2.99C18.866,1.859,17.941,0.935,16.811,0.935z M15.277,7.293\r
+               c0.006,0.117,0.009,0.234,0.009,0.352c0,3.599-2.739,7.749-7.748,7.749c-1.538,0-2.97-0.451-4.175-1.224\r
+               c0.213,0.025,0.43,0.038,0.649,0.038c1.276,0,2.45-0.436,3.382-1.166c-1.191-0.021-2.198-0.809-2.544-1.892\r
+               c0.167,0.033,0.337,0.049,0.512,0.049c0.249,0,0.489-0.032,0.718-0.095c-1.246-0.25-2.185-1.351-2.185-2.671\r
+               c0-0.011,0-0.022,0-0.034C4.264,8.604,4.684,8.727,5.13,8.74C4.399,8.252,3.918,7.418,3.918,6.474c0-0.5,0.134-0.967,0.369-1.37\r
+               C5.63,6.752,7.637,7.836,9.9,7.95C9.854,7.751,9.83,7.543,9.83,7.33c0-1.504,1.22-2.723,2.723-2.723\r
+               c0.784,0,1.491,0.331,1.988,0.859c0.62-0.122,1.202-0.348,1.729-0.661c-0.204,0.636-0.636,1.17-1.197,1.507\r
+               c0.551-0.066,1.075-0.212,1.563-0.429C16.271,6.429,15.811,6.909,15.277,7.293z"/>\r
+</g>\r
 </svg>\r

diff --git a/fluidbook/icones/6/nav-bookmark.png b/fluidbook/icones/6/nav-bookmark.png
index 111b08bfb972fcf2d1b6c849ee2d9894f2c0ef1d..871f0558e6f06c0ee1c6bcae26b6dfc466f52d99 100644 (file)
Binary files a/fluidbook/icones/6/nav-bookmark.png and b/fluidbook/icones/6/nav-bookmark.png differ

diff --git a/fluidbook/icones/6/nav-email.png b/fluidbook/icones/6/nav-email.png
new file mode 100644 (file)
index 0000000..9aad181
Binary files /dev/null and b/fluidbook/icones/6/nav-email.png differ

diff --git a/fluidbook/icones/6/nav-facebook.png b/fluidbook/icones/6/nav-facebook.png
new file mode 100644 (file)
index 0000000..7dcb713
Binary files /dev/null and b/fluidbook/icones/6/nav-facebook.png differ

diff --git a/fluidbook/icones/6/nav-twitter.png b/fluidbook/icones/6/nav-twitter.png
new file mode 100644 (file)
index 0000000..a4ad9ad
Binary files /dev/null and b/fluidbook/icones/6/nav-twitter.png differ

diff --git a/fluidbook/icones/7/mobile/nav-bookmark.svg b/fluidbook/icones/7/mobile/nav-bookmark.svg
index 0ff3bd47da9ceb9141bc204b6548da975453a34b..fdd257a7c281898466d20f057d78cf3c43d93751 100644 (file)
--- a/fluidbook/icones/7/mobile/nav-bookmark.svg
+++ b/fluidbook/icones/7/mobile/nav-bookmark.svg
@@ -2,7 +2,14 @@
 <!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
 <svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
-        width="11px" height="20px" viewBox="0 0 11 20" enable-background="new 0 0 11 20" xml:space="preserve">\r
-<path fill-rule="evenodd" clip-rule="evenodd" fill="$colorize" d="M5.542,0.993c0.624,0,4.468,2.532,4.468,5.199V18.09c0,1.105-0.896,0.974-2,0.974\r
-       c0,0-1.201-5.28-2.493-5.28c-1.2,0-2.498,5.28-2.498,5.28c-1.104,0-2,0.132-2-0.974V6.192C1.019,3.525,4.845,0.993,5.542,0.993z"/>\r
+        width="21px" height="20px" viewBox="0 0 21 20" enable-background="new 0 0 21 20" xml:space="preserve">\r
+<path fill="$colorize" d="M17.921,1h-7.769C9.921,1,9.699,1.082,9.535,1.246L0.995,9.78c-0.25,0.25-0.325,0.49-0.189,0.816\r
+       C0.941,10.923,1.259,11,1.612,11h6.799l0.001,6.975c0,0.354,0.214,0.739,0.541,0.874c0.107,0.045,0.221,0.1,0.333,0.1\r
+       c0.228,0,0.452-0.073,0.619-0.241l8.739-8.672C18.806,9.872,19,9.658,19,9.427V1.853C19,1.371,18.403,1,17.921,1z M16.612,9.017\r
+       c-0.103,0.205-0.326,0.32-0.553,0.286l-2.577-0.394l-1.156,2.252c-0.104,0.204-0.329,0.317-0.556,0.28\r
+       c-0.111-0.018-0.211-0.07-0.288-0.146c-0.078-0.077-0.133-0.18-0.15-0.295l-0.384-2.478L8.441,8.14\r
+       C8.214,8.105,8.035,7.928,7.999,7.701C7.961,7.475,8.074,7.25,8.279,7.145l2.274-1.168l-0.394-2.532\r
+       c-0.035-0.226,0.074-0.453,0.278-0.557c0.203-0.104,0.415-0.074,0.604,0.087v0l1.819,1.808l2.246-1.139\r
+       c0.203-0.104,0.448-0.063,0.61,0.098c0.001,0,0.002,0.001,0.002,0.002c0.164,0.162,0.205,0.409,0.1,0.613l-1.142,2.226l1.835,1.82\r
+       C16.676,8.565,16.716,8.813,16.612,9.017z"/>\r
 </svg>\r

diff --git a/fluidbook/icones/7/mobile/nav-email.svg b/fluidbook/icones/7/mobile/nav-email.svg
new file mode 100644 (file)
index 0000000..03b44dc
--- /dev/null
+++ b/fluidbook/icones/7/mobile/nav-email.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
+        width="21px" height="20px" viewBox="0 0 21 20" enable-background="new 0 0 21 20" xml:space="preserve">\r
+<g>\r
+       <path fill="$colorize" d="M11.028,1.479L10.403,1.06L9.779,1.479L1.024,7.579v9.198c0,1.272,0.726,2.306,2.001,2.306H17.78\r
+               c1.274,0,2.209-1.033,2.209-2.306V7.579L11.028,1.479z M2.832,9.101l6.431,3.842L2.832,16.7V9.101z M5.362,17.058l5.042-3.421\r
+               l5.041,3.421H5.362z M18.147,16.7l-6.604-3.758l6.604-3.839V16.7z"/>\r
+</g>\r
+</svg>\r

diff --git a/fluidbook/icones/7/mobile/nav-twitter.svg b/fluidbook/icones/7/mobile/nav-twitter.svg
index 97bcabe54066bbd7e1718db090241a7a4cfddcc3..6ba481de55d868a17caf20755a4d44627c982621 100644 (file)
--- a/fluidbook/icones/7/mobile/nav-twitter.svg
+++ b/fluidbook/icones/7/mobile/nav-twitter.svg
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
-<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
-        width="20px" height="20px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">\r
-<path fill="$colorize" d="M19,3.055C19,1.92,18.08,1,16.944,1H3.056C1.92,1,1,1.92,1,3.055v13.89C1,18.08,1.92,19,3.056,19h13.889\r
-       C18.08,19,19,18.08,19,16.945V3.055z M14.871,10.326c-1.059,4.3-8.175,6.125-11.448,1.66c1.254,1.197,3.438,1.304,4.822-0.13\r
-       c-0.812,0.119-1.403-0.678-0.405-1.108c-0.897,0.098-1.396-0.379-1.6-0.785c0.21-0.22,0.443-0.323,0.891-0.352\r
-       C6.148,9.379,5.786,8.898,5.675,8.315C5.947,8.25,6.288,8.194,6.474,8.219c-0.859-0.45-1.158-1.126-1.111-1.636\r
-       c1.537,0.571,2.517,1.03,3.335,1.469c0.292,0.156,0.618,0.437,0.985,0.793c0.467-1.237,1.045-2.513,2.035-3.146\r
-       c-0.017,0.144-0.094,0.277-0.195,0.386c0.281-0.255,0.645-0.431,1.016-0.481c-0.043,0.278-0.442,0.436-0.685,0.525\r
-       c0.184-0.057,1.157-0.491,1.262-0.243c0.127,0.28-0.672,0.411-0.806,0.459c-0.103,0.034-0.203,0.072-0.302,0.112\r
-       c1.233-0.124,2.411,0.895,2.755,2.159c0.024,0.092,0.049,0.193,0.071,0.298c0.452,0.169,1.269-0.007,1.531-0.17\r
-       C16.176,9.198,15.681,9.53,14.95,9.59c0.352,0.146,1.016,0.228,1.473,0.15C16.134,10.051,15.668,10.332,14.871,10.326z"/>\r
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="20px"\r
+        height="20px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">\r
+<g>\r
+       <path fill="$colorize" d="M16.811,0.935H2.921c-1.13,0-2.055,0.925-2.055,2.055v13.893c0,1.131,0.925,2.055,2.055,2.055h13.89\r
+               c1.131,0,2.056-0.924,2.056-2.055V2.99C18.866,1.859,17.941,0.935,16.811,0.935z M15.277,7.293\r
+               c0.006,0.117,0.009,0.234,0.009,0.352c0,3.599-2.739,7.749-7.748,7.749c-1.538,0-2.97-0.451-4.175-1.224\r
+               c0.213,0.025,0.43,0.038,0.649,0.038c1.276,0,2.45-0.436,3.382-1.166c-1.191-0.021-2.198-0.809-2.544-1.892\r
+               c0.167,0.033,0.337,0.049,0.512,0.049c0.249,0,0.489-0.032,0.718-0.095c-1.246-0.25-2.185-1.351-2.185-2.671\r
+               c0-0.011,0-0.022,0-0.034C4.264,8.604,4.684,8.727,5.13,8.74C4.399,8.252,3.918,7.418,3.918,6.474c0-0.5,0.134-0.967,0.369-1.37\r
+               C5.63,6.752,7.637,7.836,9.9,7.95C9.854,7.751,9.83,7.543,9.83,7.33c0-1.504,1.22-2.723,2.723-2.723\r
+               c0.784,0,1.491,0.331,1.988,0.859c0.62-0.122,1.202-0.348,1.729-0.661c-0.204,0.636-0.636,1.17-1.197,1.507\r
+               c0.551-0.066,1.075-0.212,1.563-0.429C16.271,6.429,15.811,6.909,15.277,7.293z"/>\r
+</g>\r
 </svg>\r

diff --git a/fluidbook/icones/7/nav-email.png b/fluidbook/icones/7/nav-email.png
new file mode 100644 (file)
index 0000000..9aad181
Binary files /dev/null and b/fluidbook/icones/7/nav-email.png differ

diff --git a/fluidbook/icones/7/nav-facebook.png b/fluidbook/icones/7/nav-facebook.png
new file mode 100644 (file)
index 0000000..7dcb713
Binary files /dev/null and b/fluidbook/icones/7/nav-facebook.png differ

diff --git a/fluidbook/icones/7/nav-twitter.png b/fluidbook/icones/7/nav-twitter.png
new file mode 100644 (file)
index 0000000..a4ad9ad
Binary files /dev/null and b/fluidbook/icones/7/nav-twitter.png differ

diff --git a/fluidbook/icones/8/mobile/nav-bookmark.svg b/fluidbook/icones/8/mobile/nav-bookmark.svg
index 0ff3bd47da9ceb9141bc204b6548da975453a34b..fdd257a7c281898466d20f057d78cf3c43d93751 100644 (file)
--- a/fluidbook/icones/8/mobile/nav-bookmark.svg
+++ b/fluidbook/icones/8/mobile/nav-bookmark.svg
@@ -2,7 +2,14 @@
 <!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
 <svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
-        width="11px" height="20px" viewBox="0 0 11 20" enable-background="new 0 0 11 20" xml:space="preserve">\r
-<path fill-rule="evenodd" clip-rule="evenodd" fill="$colorize" d="M5.542,0.993c0.624,0,4.468,2.532,4.468,5.199V18.09c0,1.105-0.896,0.974-2,0.974\r
-       c0,0-1.201-5.28-2.493-5.28c-1.2,0-2.498,5.28-2.498,5.28c-1.104,0-2,0.132-2-0.974V6.192C1.019,3.525,4.845,0.993,5.542,0.993z"/>\r
+        width="21px" height="20px" viewBox="0 0 21 20" enable-background="new 0 0 21 20" xml:space="preserve">\r
+<path fill="$colorize" d="M17.921,1h-7.769C9.921,1,9.699,1.082,9.535,1.246L0.995,9.78c-0.25,0.25-0.325,0.49-0.189,0.816\r
+       C0.941,10.923,1.259,11,1.612,11h6.799l0.001,6.975c0,0.354,0.214,0.739,0.541,0.874c0.107,0.045,0.221,0.1,0.333,0.1\r
+       c0.228,0,0.452-0.073,0.619-0.241l8.739-8.672C18.806,9.872,19,9.658,19,9.427V1.853C19,1.371,18.403,1,17.921,1z M16.612,9.017\r
+       c-0.103,0.205-0.326,0.32-0.553,0.286l-2.577-0.394l-1.156,2.252c-0.104,0.204-0.329,0.317-0.556,0.28\r
+       c-0.111-0.018-0.211-0.07-0.288-0.146c-0.078-0.077-0.133-0.18-0.15-0.295l-0.384-2.478L8.441,8.14\r
+       C8.214,8.105,8.035,7.928,7.999,7.701C7.961,7.475,8.074,7.25,8.279,7.145l2.274-1.168l-0.394-2.532\r
+       c-0.035-0.226,0.074-0.453,0.278-0.557c0.203-0.104,0.415-0.074,0.604,0.087v0l1.819,1.808l2.246-1.139\r
+       c0.203-0.104,0.448-0.063,0.61,0.098c0.001,0,0.002,0.001,0.002,0.002c0.164,0.162,0.205,0.409,0.1,0.613l-1.142,2.226l1.835,1.82\r
+       C16.676,8.565,16.716,8.813,16.612,9.017z"/>\r
 </svg>\r

diff --git a/fluidbook/icones/8/mobile/nav-email.svg b/fluidbook/icones/8/mobile/nav-email.svg
new file mode 100644 (file)
index 0000000..03b44dc
--- /dev/null
+++ b/fluidbook/icones/8/mobile/nav-email.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
+        width="21px" height="20px" viewBox="0 0 21 20" enable-background="new 0 0 21 20" xml:space="preserve">\r
+<g>\r
+       <path fill="$colorize" d="M11.028,1.479L10.403,1.06L9.779,1.479L1.024,7.579v9.198c0,1.272,0.726,2.306,2.001,2.306H17.78\r
+               c1.274,0,2.209-1.033,2.209-2.306V7.579L11.028,1.479z M2.832,9.101l6.431,3.842L2.832,16.7V9.101z M5.362,17.058l5.042-3.421\r
+               l5.041,3.421H5.362z M18.147,16.7l-6.604-3.758l6.604-3.839V16.7z"/>\r
+</g>\r
+</svg>\r

diff --git a/fluidbook/icones/8/mobile/nav-twitter.svg b/fluidbook/icones/8/mobile/nav-twitter.svg
index 97bcabe54066bbd7e1718db090241a7a4cfddcc3..6ba481de55d868a17caf20755a4d44627c982621 100644 (file)
--- a/fluidbook/icones/8/mobile/nav-twitter.svg
+++ b/fluidbook/icones/8/mobile/nav-twitter.svg
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
-<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
-        width="20px" height="20px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">\r
-<path fill="$colorize" d="M19,3.055C19,1.92,18.08,1,16.944,1H3.056C1.92,1,1,1.92,1,3.055v13.89C1,18.08,1.92,19,3.056,19h13.889\r
-       C18.08,19,19,18.08,19,16.945V3.055z M14.871,10.326c-1.059,4.3-8.175,6.125-11.448,1.66c1.254,1.197,3.438,1.304,4.822-0.13\r
-       c-0.812,0.119-1.403-0.678-0.405-1.108c-0.897,0.098-1.396-0.379-1.6-0.785c0.21-0.22,0.443-0.323,0.891-0.352\r
-       C6.148,9.379,5.786,8.898,5.675,8.315C5.947,8.25,6.288,8.194,6.474,8.219c-0.859-0.45-1.158-1.126-1.111-1.636\r
-       c1.537,0.571,2.517,1.03,3.335,1.469c0.292,0.156,0.618,0.437,0.985,0.793c0.467-1.237,1.045-2.513,2.035-3.146\r
-       c-0.017,0.144-0.094,0.277-0.195,0.386c0.281-0.255,0.645-0.431,1.016-0.481c-0.043,0.278-0.442,0.436-0.685,0.525\r
-       c0.184-0.057,1.157-0.491,1.262-0.243c0.127,0.28-0.672,0.411-0.806,0.459c-0.103,0.034-0.203,0.072-0.302,0.112\r
-       c1.233-0.124,2.411,0.895,2.755,2.159c0.024,0.092,0.049,0.193,0.071,0.298c0.452,0.169,1.269-0.007,1.531-0.17\r
-       C16.176,9.198,15.681,9.53,14.95,9.59c0.352,0.146,1.016,0.228,1.473,0.15C16.134,10.051,15.668,10.332,14.871,10.326z"/>\r
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="20px"\r
+        height="20px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">\r
+<g>\r
+       <path fill="$colorize" d="M16.811,0.935H2.921c-1.13,0-2.055,0.925-2.055,2.055v13.893c0,1.131,0.925,2.055,2.055,2.055h13.89\r
+               c1.131,0,2.056-0.924,2.056-2.055V2.99C18.866,1.859,17.941,0.935,16.811,0.935z M15.277,7.293\r
+               c0.006,0.117,0.009,0.234,0.009,0.352c0,3.599-2.739,7.749-7.748,7.749c-1.538,0-2.97-0.451-4.175-1.224\r
+               c0.213,0.025,0.43,0.038,0.649,0.038c1.276,0,2.45-0.436,3.382-1.166c-1.191-0.021-2.198-0.809-2.544-1.892\r
+               c0.167,0.033,0.337,0.049,0.512,0.049c0.249,0,0.489-0.032,0.718-0.095c-1.246-0.25-2.185-1.351-2.185-2.671\r
+               c0-0.011,0-0.022,0-0.034C4.264,8.604,4.684,8.727,5.13,8.74C4.399,8.252,3.918,7.418,3.918,6.474c0-0.5,0.134-0.967,0.369-1.37\r
+               C5.63,6.752,7.637,7.836,9.9,7.95C9.854,7.751,9.83,7.543,9.83,7.33c0-1.504,1.22-2.723,2.723-2.723\r
+               c0.784,0,1.491,0.331,1.988,0.859c0.62-0.122,1.202-0.348,1.729-0.661c-0.204,0.636-0.636,1.17-1.197,1.507\r
+               c0.551-0.066,1.075-0.212,1.563-0.429C16.271,6.429,15.811,6.909,15.277,7.293z"/>\r
+</g>\r
 </svg>\r

diff --git a/fluidbook/icones/8/nav-bookmark.png b/fluidbook/icones/8/nav-bookmark.png
index 111b08bfb972fcf2d1b6c849ee2d9894f2c0ef1d..871f0558e6f06c0ee1c6bcae26b6dfc466f52d99 100644 (file)
Binary files a/fluidbook/icones/8/nav-bookmark.png and b/fluidbook/icones/8/nav-bookmark.png differ

diff --git a/fluidbook/icones/8/nav-email.png b/fluidbook/icones/8/nav-email.png
new file mode 100644 (file)
index 0000000..9aad181
Binary files /dev/null and b/fluidbook/icones/8/nav-email.png differ

diff --git a/fluidbook/icones/8/nav-facebook.png b/fluidbook/icones/8/nav-facebook.png
new file mode 100644 (file)
index 0000000..7dcb713
Binary files /dev/null and b/fluidbook/icones/8/nav-facebook.png differ

diff --git a/fluidbook/icones/8/nav-twitter.png b/fluidbook/icones/8/nav-twitter.png
new file mode 100644 (file)
index 0000000..a4ad9ad
Binary files /dev/null and b/fluidbook/icones/8/nav-twitter.png differ

diff --git a/fluidbook/icones/9/mobile/nav-bookmark.svg b/fluidbook/icones/9/mobile/nav-bookmark.svg
index 0ff3bd47da9ceb9141bc204b6548da975453a34b..fdd257a7c281898466d20f057d78cf3c43d93751 100644 (file)
--- a/fluidbook/icones/9/mobile/nav-bookmark.svg
+++ b/fluidbook/icones/9/mobile/nav-bookmark.svg
@@ -2,7 +2,14 @@
 <!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
 <svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
-        width="11px" height="20px" viewBox="0 0 11 20" enable-background="new 0 0 11 20" xml:space="preserve">\r
-<path fill-rule="evenodd" clip-rule="evenodd" fill="$colorize" d="M5.542,0.993c0.624,0,4.468,2.532,4.468,5.199V18.09c0,1.105-0.896,0.974-2,0.974\r
-       c0,0-1.201-5.28-2.493-5.28c-1.2,0-2.498,5.28-2.498,5.28c-1.104,0-2,0.132-2-0.974V6.192C1.019,3.525,4.845,0.993,5.542,0.993z"/>\r
+        width="21px" height="20px" viewBox="0 0 21 20" enable-background="new 0 0 21 20" xml:space="preserve">\r
+<path fill="$colorize" d="M17.921,1h-7.769C9.921,1,9.699,1.082,9.535,1.246L0.995,9.78c-0.25,0.25-0.325,0.49-0.189,0.816\r
+       C0.941,10.923,1.259,11,1.612,11h6.799l0.001,6.975c0,0.354,0.214,0.739,0.541,0.874c0.107,0.045,0.221,0.1,0.333,0.1\r
+       c0.228,0,0.452-0.073,0.619-0.241l8.739-8.672C18.806,9.872,19,9.658,19,9.427V1.853C19,1.371,18.403,1,17.921,1z M16.612,9.017\r
+       c-0.103,0.205-0.326,0.32-0.553,0.286l-2.577-0.394l-1.156,2.252c-0.104,0.204-0.329,0.317-0.556,0.28\r
+       c-0.111-0.018-0.211-0.07-0.288-0.146c-0.078-0.077-0.133-0.18-0.15-0.295l-0.384-2.478L8.441,8.14\r
+       C8.214,8.105,8.035,7.928,7.999,7.701C7.961,7.475,8.074,7.25,8.279,7.145l2.274-1.168l-0.394-2.532\r
+       c-0.035-0.226,0.074-0.453,0.278-0.557c0.203-0.104,0.415-0.074,0.604,0.087v0l1.819,1.808l2.246-1.139\r
+       c0.203-0.104,0.448-0.063,0.61,0.098c0.001,0,0.002,0.001,0.002,0.002c0.164,0.162,0.205,0.409,0.1,0.613l-1.142,2.226l1.835,1.82\r
+       C16.676,8.565,16.716,8.813,16.612,9.017z"/>\r
 </svg>\r

diff --git a/fluidbook/icones/9/mobile/nav-email.svg b/fluidbook/icones/9/mobile/nav-email.svg
new file mode 100644 (file)
index 0000000..03b44dc
--- /dev/null
+++ b/fluidbook/icones/9/mobile/nav-email.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
+        width="21px" height="20px" viewBox="0 0 21 20" enable-background="new 0 0 21 20" xml:space="preserve">\r
+<g>\r
+       <path fill="$colorize" d="M11.028,1.479L10.403,1.06L9.779,1.479L1.024,7.579v9.198c0,1.272,0.726,2.306,2.001,2.306H17.78\r
+               c1.274,0,2.209-1.033,2.209-2.306V7.579L11.028,1.479z M2.832,9.101l6.431,3.842L2.832,16.7V9.101z M5.362,17.058l5.042-3.421\r
+               l5.041,3.421H5.362z M18.147,16.7l-6.604-3.758l6.604-3.839V16.7z"/>\r
+</g>\r
+</svg>\r

diff --git a/fluidbook/icones/9/mobile/nav-twitter.svg b/fluidbook/icones/9/mobile/nav-twitter.svg
index 97bcabe54066bbd7e1718db090241a7a4cfddcc3..6ba481de55d868a17caf20755a4d44627c982621 100644 (file)
--- a/fluidbook/icones/9/mobile/nav-twitter.svg
+++ b/fluidbook/icones/9/mobile/nav-twitter.svg
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->\r
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">\r
-<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"\r
-        width="20px" height="20px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">\r
-<path fill="$colorize" d="M19,3.055C19,1.92,18.08,1,16.944,1H3.056C1.92,1,1,1.92,1,3.055v13.89C1,18.08,1.92,19,3.056,19h13.889\r
-       C18.08,19,19,18.08,19,16.945V3.055z M14.871,10.326c-1.059,4.3-8.175,6.125-11.448,1.66c1.254,1.197,3.438,1.304,4.822-0.13\r
-       c-0.812,0.119-1.403-0.678-0.405-1.108c-0.897,0.098-1.396-0.379-1.6-0.785c0.21-0.22,0.443-0.323,0.891-0.352\r
-       C6.148,9.379,5.786,8.898,5.675,8.315C5.947,8.25,6.288,8.194,6.474,8.219c-0.859-0.45-1.158-1.126-1.111-1.636\r
-       c1.537,0.571,2.517,1.03,3.335,1.469c0.292,0.156,0.618,0.437,0.985,0.793c0.467-1.237,1.045-2.513,2.035-3.146\r
-       c-0.017,0.144-0.094,0.277-0.195,0.386c0.281-0.255,0.645-0.431,1.016-0.481c-0.043,0.278-0.442,0.436-0.685,0.525\r
-       c0.184-0.057,1.157-0.491,1.262-0.243c0.127,0.28-0.672,0.411-0.806,0.459c-0.103,0.034-0.203,0.072-0.302,0.112\r
-       c1.233-0.124,2.411,0.895,2.755,2.159c0.024,0.092,0.049,0.193,0.071,0.298c0.452,0.169,1.269-0.007,1.531-0.17\r
-       C16.176,9.198,15.681,9.53,14.95,9.59c0.352,0.146,1.016,0.228,1.473,0.15C16.134,10.051,15.668,10.332,14.871,10.326z"/>\r
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="20px"\r
+        height="20px" viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">\r
+<g>\r
+       <path fill="$colorize" d="M16.811,0.935H2.921c-1.13,0-2.055,0.925-2.055,2.055v13.893c0,1.131,0.925,2.055,2.055,2.055h13.89\r
+               c1.131,0,2.056-0.924,2.056-2.055V2.99C18.866,1.859,17.941,0.935,16.811,0.935z M15.277,7.293\r
+               c0.006,0.117,0.009,0.234,0.009,0.352c0,3.599-2.739,7.749-7.748,7.749c-1.538,0-2.97-0.451-4.175-1.224\r
+               c0.213,0.025,0.43,0.038,0.649,0.038c1.276,0,2.45-0.436,3.382-1.166c-1.191-0.021-2.198-0.809-2.544-1.892\r
+               c0.167,0.033,0.337,0.049,0.512,0.049c0.249,0,0.489-0.032,0.718-0.095c-1.246-0.25-2.185-1.351-2.185-2.671\r
+               c0-0.011,0-0.022,0-0.034C4.264,8.604,4.684,8.727,5.13,8.74C4.399,8.252,3.918,7.418,3.918,6.474c0-0.5,0.134-0.967,0.369-1.37\r
+               C5.63,6.752,7.637,7.836,9.9,7.95C9.854,7.751,9.83,7.543,9.83,7.33c0-1.504,1.22-2.723,2.723-2.723\r
+               c0.784,0,1.491,0.331,1.988,0.859c0.62-0.122,1.202-0.348,1.729-0.661c-0.204,0.636-0.636,1.17-1.197,1.507\r
+               c0.551-0.066,1.075-0.212,1.563-0.429C16.271,6.429,15.811,6.909,15.277,7.293z"/>\r
+</g>\r
 </svg>\r

diff --git a/fluidbook/icones/9/nav-bookmark.png b/fluidbook/icones/9/nav-bookmark.png
index 111b08bfb972fcf2d1b6c849ee2d9894f2c0ef1d..871f0558e6f06c0ee1c6bcae26b6dfc466f52d99 100644 (file)
Binary files a/fluidbook/icones/9/nav-bookmark.png and b/fluidbook/icones/9/nav-bookmark.png differ

diff --git a/fluidbook/icones/9/nav-email.png b/fluidbook/icones/9/nav-email.png
new file mode 100644 (file)
index 0000000..9aad181
Binary files /dev/null and b/fluidbook/icones/9/nav-email.png differ

diff --git a/fluidbook/icones/9/nav-facebook.png b/fluidbook/icones/9/nav-facebook.png
new file mode 100644 (file)
index 0000000..7dcb713
Binary files /dev/null and b/fluidbook/icones/9/nav-facebook.png differ

diff --git a/fluidbook/icones/9/nav-twitter.png b/fluidbook/icones/9/nav-twitter.png
new file mode 100644 (file)
index 0000000..a4ad9ad
Binary files /dev/null and b/fluidbook/icones/9/nav-twitter.png differ

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index fed98616336c95d77b713b2cc66bdf95fc9319df..662bf63b79015f442cf179bda0f6f2723699461e 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -44,39 +44,67 @@ class wsServices extends cubeFlashGateway {
                        return;\r
                }\r
 \r
-               $bookmarks = json_decode(base64_decode($this->args['bookmarks']));\r
+               $bookmarks = json_decode(base64_decode($this->args['bookmarks']), true);\r
                $files = array();\r
                foreach ($bookmarks as $b) {\r
-                       $file = $this->getPDFComplex($this->args['book_id'], $b['page'] . '-' . $b['page'] + $b['nb']);\r
+                       $file = $this->getPDFComplex($this->args['id'], $b['page'] . '-' . $b['page'] + $b['nb']);\r
                        $files[] = array('name' => $b['name'], 'file' => $file['file']);\r
                }\r
 \r
-               $limit = 5 * 1024 * 1024;\r
+               $limit = 5 * 1024 * 1024 * 0.8;\r
                $groups = array();\r
                $group = array();\r
-               $groupsize=array();\r
+               $groupsize = 0;\r
                foreach ($files as $f) {\r
-                       $group[]=$f;\r
-                       $groupsize+=filesize($f['file']);\r
-                       \r
-                       if($groupsize>$limit){\r
-                               \r
+                       $size = filesize($f['file']);\r
+\r
+                       if ($groupsize + $size > $limit) {\r
+                               if (count($group)) {\r
+                                       $groups[] = $group;\r
+                                       $group = array();\r
+                                       $groupsize = 0;\r
+                               }\r
+\r
+                               $group[] = $f;\r
+                               $groupsize = $size;\r
+\r
+                               if ($groupsize > $limit) {\r
+                                       $groups[] = $group;\r
+                                       $group = array();\r
+                                       $groupsize = 0;\r
+                               }\r
+                       } else {\r
+                               $group[] = $f;\r
+                               $groupsize+=$size;\r
                        }\r
                }\r
 \r
+               if (count($group)) {\r
+                       $groups[] = $group;\r
+               }\r
 \r
 \r
+               $total = count($groups);\r
+               foreach ($groups as $i => $g) {\r
+                       $s = '';\r
+                       if ($total > 0) {\r
+                               $s = ' (' . ($i + 1) . '/' . $total . ')';\r
+                       }\r
 \r
-               // Send the email\r
-               $mail = new cubeMail();\r
-               $mail->returnPath = 'postmaster@fluidbook.com';\r
-               $mail->acknowledge = isset($this->args['askAcknowledge']) && $this->args['askAcknowledge'];\r
-               $mail->charset = 'UTF-8';\r
-               $mail->to = $this->args['email'];\r
-               $mail->from = $this->args['fromname'] . '<' . $this->args['fromemail'] . '>';\r
-               $mail->subject = $this->args['subject'];\r
-               $mail->body = $this->args['body'];\r
-               $this->xml->addChild('ok', $mail->send() ? '1' : '0');\r
+                       // Send the email\r
+                       $mail = new cubeMail();\r
+                       $mail->returnPath = 'postmaster@fluidbook.com';\r
+                       $mail->acknowledge = isset($this->args['askAcknowledge']) && $this->args['askAcknowledge'];\r
+                       $mail->charset = 'UTF-8';\r
+                       $mail->to = $this->args['email'];\r
+                       $mail->from = $this->args['fromname'] . '<' . $this->args['fromemail'] . '>';\r
+                       $mail->subject = $this->args['subject'] . $s;\r
+                       $mail->body = $this->args['body'];\r
+                       foreach ($g as $f) {\r
+                               $mail->addFile($f['name'] . '.pdf', $f['file']);\r
+                       }\r
+                       $this->xml->addChild('ok', $mail->send() ? '1' : '0');\r
+               }\r
        }\r
 \r
        protected function shortenURL($url, $id) {\r