Added the open source logo as a character (uppercase letter O) to the font.

Increased the version number in the CSS to prevent caching/refresh issues.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@4930 a333f486-631f-4898-b8df-5754b55c2be0

css/font-combodo/combodo.sfd

@@ -21,7 +21,7 @@ OS2Version: 0
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1463745065
-ModificationTime: 1505226311
+ModificationTime: 1506001058
 OS2TypoAscent: 0
 OS2TypoAOffset: 1
 OS2TypoDescent: 0
@@ -35,7 +35,6 @@ HheadAscent: 0
 HheadAOffset: 1
 HheadDescent: 0
 HheadDOffset: 1
-OS2Vendor: 'PfEd'
 MarkAttachClasses: 1
 DEI: 91125
 Encoding: ISO8859-1
@@ -47,7 +46,7 @@ FitToEm: 0
 WinInfo: 0 31 10
 BeginPrivate: 0
 EndPrivate
-BeginChars: 256 10
+BeginChars: 256 11
 
 StartChar: zero
 Encoding: 48 48 0
@@ -815,58 +814,58 @@ StartChar: F
 Encoding: 70 70 9
 Width: 1024
 VWidth: 0
-HStem: -36.1033 86.8755<437.955 591.193> 87 38.8873<470.027 570.5> 162.662 41.3384<517.914 556.039> 240.753 41.694<518.555 577.701> 317.182 42.8413<482.813 613.091> 392 102<654.807 741.193> 528 39<697.004 734.996>
-VStem: 177.33 176.243<193.178 324.666> 387 49.9722<156.73 272.373> 468.976 87.0743<171.971 203.974> 588.39 46.5555<139.223 231.693> 668.55 67.8912<122.946 266.217> 697 38<528.004 566.995> 750 85.251<426.532 559.5>
+HStem: -36 87<438.038 591.036> 87 39<470.027 570.5> 163 41<517.914 555.989> 241 41<519.089 577.135> 317 43<482.813 612.995> 394 100<654.807 741.193> 528 39<697.004 734.996>
+VStem: 177 177<195.689 296.938> 387 50<156.758 272.234> 469 87<171.273 203.985> 588 47<139.283 231.811> 669 67<122.953 266.087> 697 38<528.004 566.995> 750 85<426.5 559.5>
 LayerCount: 3
 Fore
 SplineSet
 502 742 m 0xfff4
  522 742 553 738 599 727 c 0
  780 684 822 509 833 462 c 0
- 834.514 455.532 835.251 449.519 835.251 443.958 c 0
- 835.251 409.105 806.294 392 758 392 c 0
- 720.667 392 677.556 393.778 623.926 393.778 c 0
- 597.111 393.778 567.667 393.333 535 392 c 0
+ 835 456 835 450 835 444 c 0
+ 835 409 806 392 758 392 c 0
+ 721 392 678 394 624 394 c 0
+ 597 394 568 393 535 392 c 0
  437 388 368 325 355 235 c 0
- 354.037 228.333 353.573 221.665 353.573 215.033 c 0
- 353.573 132.137 426.001 54.7037 501 51 c 0
- 504.087 50.8476 507.156 50.7721 510.205 50.7721 c 0
- 587.18 50.7721 651.572 98.8579 666 171 c 0
- 667.724 179.622 668.55 188.138 668.55 196.465 c 0
- 668.55 260.572 619.608 313.46 555 317 c 0
- 552.774 317.122 550.576 317.182 548.404 317.182 c 0
- 478.888 317.182 436.972 256.455 436.972 218.084 c 0
- 436.972 183.832 462.927 126.981 512 126 c 0
- 514.156 125.924 516.244 125.887 518.266 125.887 c 0
- 569.68 125.887 578.303 149.832 586 171 c 0
- 587.574 175.948 588.39 181.452 588.39 187.137 c 0
- 588.39 206.731 578.703 228.474 557 237 c 0
- 550.193 239.674 544.509 240.753 539.776 240.753 c 0
- 525.038 240.753 519.514 230.298 518 225 c 0
+ 354 228 354 222 354 215 c 0
+ 354 132 426 55 501 51 c 0
+ 504 51 507 51 510 51 c 0
+ 587 51 652 99 666 171 c 0
+ 668 180 669 188 669 196 c 0
+ 669 260 620 313 555 317 c 0
+ 553 317 550 317 548 317 c 0
+ 478 317 437 256 437 218 c 0
+ 437 184 463 127 512 126 c 0
+ 514 126 516 126 518 126 c 0
+ 569 126 578 150 586 171 c 0
+ 588 176 588 181 588 187 c 0
+ 588 207 579 228 557 237 c 0
+ 550 240 545 241 540 241 c 0
+ 525 241 520 230 518 225 c 0
  516 216 524 204 532 204 c 0
- 542.626 204 556.051 202.134 556.051 183.078 c 0
- 556.051 165.778 540.156 162.662 524.591 162.662 c 0
- 521.25 162.662 517.986 162.813 515 163 c 0
- 499.253 163.984 468.976 177.561 468.976 217.076 c 0
- 468.976 246.799 496.867 282.447 542.995 282.447 c 0
- 545.923 282.447 548.925 282.301 552 282 c 0
- 611.133 276.624 634.945 243.153 634.945 202.443 c 0
- 634.945 197.716 634.624 192.89 634 188 c 0
+ 543 204 556 202 556 183 c 0
+ 556 166 541 163 525 163 c 0
+ 522 163 518 163 515 163 c 0
+ 499 164 469 177 469 217 c 0
+ 469 247 497 282 543 282 c 0
+ 546 282 549 282 552 282 c 0
+ 611 277 635 243 635 202 c 0
+ 635 197 635 193 634 188 c 0
  628 141 598 87 508 87 c 0
  418 87 387 162 387 218 c 0
  387 274 430 358 561 360 c 0
- 562.005 360.015 563.006 360.023 564.003 360.023 c 0
- 677.198 360.023 736.441 261.596 736.441 181.834 c 0
- 736.441 170.759 735.299 160.043 733 150 c 0
- 716.294 74.3313 683.171 -36.1033 494.124 -36.1033 c 0
- 490.798 -36.1033 487.423 -36.0692 484 -36 c 0
- 279.554 -32.1786 177.33 169.7 177.33 321.128 c 0
- 177.33 328.204 177.554 335.17 178 342 c 0
+ 562 360 563 360 564 360 c 0
+ 677 360 736 262 736 182 c 0
+ 736 171 735 160 733 150 c 0
+ 716 74 683 -36 494 -36 c 0
+ 491 -36 487 -36 484 -36 c 0
+ 280 -32 177 170 177 321 c 0
+ 177 328 178 335 178 342 c 0
  188 495 246 549 298 600 c 0
- 387.796 686.99 479.342 676.863 479.342 695.65 c 0
- 479.342 696.948 478.905 698.384 478 700 c 0
- 473.305 708.537 468.974 717.439 468.974 724.838 c 0
- 468.974 734.773 476.782 742 502 742 c 0xfff4
+ 388 687 479 677 479 696 c 0
+ 479 697 479 698 478 700 c 0
+ 473 709 469 718 469 725 c 0
+ 469 735 477 742 502 742 c 0xfff4
 698 597 m 0
  669 597 646 574 646 545 c 0
  646 516 669 494 698 494 c 0
@@ -878,6 +877,70 @@ SplineSet
  735 534 729 528 716 528 c 0
  703 528 697 534 697 547 c 0xffec
 EndSplineSet
+Validated: 1
+EndChar
+
+StartChar: O
+Encoding: 79 79 10
+Width: 1024
+VWidth: 0
+HStem: 1.59961 8<801.97 829.007> 20 35.2002<801.975 810.774 823.574 824.837> 33.5996 5.60059<810.774 817.806> 48.7998 6.40039<810.774 818.736> 61.5996 8.7998<801.043 829.91> 434.399 245.601<441.712 567.228>
+VStem: 780.375 8.7998<21.8033 49.6942> 801.975 8.7998<20 33.5996 39.2002 48.7998> 819.574 8.80078<40.0451 47.9513> 841.175 8.7998<21.5374 50.3356>
+LayerCount: 3
+Fore
+SplineSet
+504.375 680 m 0x8fc0
+ 672.375 680 816.375 560 846.774 395.2 c 0
+ 877.175 230.399 785.975 67.2002 629.175 7.2002 c 0
+ 621.975 4.7998 613.975 8 611.574 15.2002 c 2
+ 533.175 218.399 l 2
+ 530.774 225.6 533.975 234.399 541.175 236.8 c 0
+ 587.574 254.399 613.975 301.6 605.175 350.399 c 0
+ 596.375 399.2 553.975 434.399 504.375 434.399 c 0
+ 454.774 434.399 413.175 399.2 404.375 350.399 c 0
+ 395.574 301.6 421.175 254.399 467.574 236.8 c 0
+ 474.774 234.399 477.975 225.6 475.574 218.399 c 2
+ 397.975 15.2002 l 2
+ 395.574 8 386.774 4.7998 379.574 7.2002 c 0
+ 222.774 67.2002 131.574 230.399 161.975 395.2 c 0
+ 192.375 560 336.375 680 504.375 680 c 0x8fc0
+815.574 70.3994 m 0
+ 834.774 70.3994 849.975 55.2002 849.975 36 c 0
+ 849.975 16.7998 834.774 1.59961 815.574 1.59961 c 0
+ 796.375 1.59961 780.375 16.7998 780.375 36 c 0
+ 780.375 55.2002 796.375 70.3994 815.574 70.3994 c 0
+815.574 61.5996 m 0
+ 801.175 61.5996 789.175 50.3994 789.175 36 c 0
+ 789.175 21.5996 801.175 9.59961 815.574 9.59961 c 0
+ 829.975 9.59961 841.175 21.5996 841.175 36 c 0
+ 841.175 50.3994 829.975 61.5996 815.574 61.5996 c 0
+814.774 39.2002 m 2xbfc0
+ 816.375 39.2002 817.975 40 818.774 40.7998 c 0
+ 819.574 41.5996 819.574 42.3994 819.574 44 c 0
+ 819.574 45.5996 819.574 46.3994 818.774 47.2002 c 0
+ 817.975 48 816.375 48.7998 814.774 48.7998 c 2
+ 810.774 48.7998 l 1
+ 810.774 39.2002 l 1
+ 814.774 39.2002 l 2xbfc0
+810.774 33.5996 m 1
+ 810.774 20 l 1
+ 801.975 20 l 1
+ 801.975 55.2002 l 1xcfc0
+ 815.574 55.2002 l 2x9fc0
+ 820.375 55.2002 822.774 54.3994 825.175 52.7998 c 0
+ 827.574 51.2002 828.375 48.7998 828.375 45.5996 c 0
+ 828.375 43.2002 827.574 41.5996 826.774 40 c 0
+ 825.975 38.3994 824.375 36.7998 821.975 36 c 1
+ 823.574 36 824.375 35.2002 825.175 34.3994 c 0
+ 825.975 33.5996 827.574 32 828.375 29.5996 c 2
+ 833.175 20 l 1
+ 823.574 20 l 1xcfc0
+ 819.574 28.7998 l 2
+ 818.774 30.3994 817.175 31.2002 816.375 32 c 0
+ 815.574 32.7998 814.774 33.5996 813.175 33.5996 c 2
+ 810.774 33.5996 l 1
+EndSplineSet
+Validated: 524321
 EndChar
 EndChars
 EndSplineFont

css/font-combodo/font-combodo.css

@@ -1,8 +1,8 @@
 @font-face {
     font-family: 'CombodoRegular';
-    src: url('combodo-webfont.woff2?v=1.0') format('woff2'),
-         url('combodo-webfont.woff?v=1.0') format('woff'),
-         url('combodo-webfont.ttf?v=1.0') format('truetype');
+    src: url('combodo-webfont.woff2?v=2.0') format('woff2'),
+         url('combodo-webfont.woff?v=2.0') format('woff'),
+         url('combodo-webfont.ttf?v=2.0') format('truetype');
     font-weight: normal;
     font-style: normal;
 
@@ -202,4 +202,7 @@
 .fc-itop-icon:before {
   content: "I";
 }
+.fc-opensource-icon:before {
+  content: "O";
+}
 

css/font-combodo/glyphs/O.svg

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1000"
+   height="1000"
+   viewBox="0 0 264.58333 264.58334"
+   version="1.1"
+   id="svg876"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   sodipodi:docname="O.svg">
+  <defs
+     id="defs870" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="-272.85714"
+     inkscape:cy="560"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1005"
+     inkscape:window-x="1911"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata873">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-32.41664)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:middle;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8.99672318;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 131.53572,50.179132 c -54.174274,0 -100.702568,38.6765 -110.575582,91.938598 -9.873159,53.26282 19.698102,106.06258 70.277674,125.4761 2.319548,0.89024 4.921621,-0.26836 5.811987,-2.58786 L 122.30183,199.2106 c 0.89023,-2.31957 -0.26838,-4.92164 -2.58789,-5.812 -14.87072,-5.70891 -23.515673,-21.14784 -20.612431,-36.80689 2.903191,-15.6588 16.504681,-26.96534 32.434211,-26.96534 15.92952,0 29.53338,11.30654 32.43657,26.96534 2.90326,15.65905 -5.74171,31.09798 -20.61242,36.80689 -2.31951,0.89036 -3.47812,3.49245 -2.58788,5.812 l 25.25202,65.79537 c 0.89038,2.31821 3.49074,3.47652 5.8096,2.58786 50.57958,-19.41352 80.15083,-72.21328 70.27768,-125.4761 -9.87301,-53.262098 -56.4013,-91.938598 -110.57557,-91.938598 z"
+       id="path3773"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssccscsssccccss" />
+    <g
+       style="display:inline"
+       id="g3797"
+       transform="matrix(1.2200654,0,0,1.2200654,455.86197,1099.5367)"
+       inkscape:export-filename="/home/rafael/workspace/logo-osi/3/png/logo396x412.png"
+       inkscape:export-xdpi="48.18"
+       inkscape:export-ydpi="48.18">
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.25831962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         d="m -183.5617,-698.57555 c -5.02556,0 -9.12392,4.09113 -9.12392,9.10782 0,5.01668 4.09836,9.10781 9.12392,9.10781 5.02556,0 9.12392,-4.09113 9.12392,-9.10781 0,-5.01669 -4.09836,-9.10782 -9.12392,-9.10782 z m 0,2.25596 c 3.80399,0 6.8633,3.05458 6.8633,6.85186 0,3.79727 -3.05931,6.85119 -6.8633,6.85119 -3.80399,0 -6.86397,-3.05392 -6.86397,-6.85119 0,-3.79728 3.05998,-6.85186 6.86397,-6.85186 z"
+         id="path3015"
+         inkscape:connector-curvature="0" />
+      <g
+         aria-label="R"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:0%;font-family:OpenSymbol;-inkscape-font-specification:'OpenSymbol Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+         id="text3793">
+        <path
+           inkscape:connector-curvature="0"
+           d="m -183.7552,-690.46513 q 0.74769,0 1.06902,-0.27807 0.3275,-0.27807 0.3275,-0.91454 0,-0.63028 -0.3275,-0.90217 -0.32133,-0.27189 -1.06902,-0.27189 h -1.00105 v 2.36667 z m -1.00105,1.64369 v 3.4913 h -2.37902 v -9.22569 h 3.63342 q 1.82289,0 2.66946,0.61175 0.85274,0.61175 0.85274,1.93412 0,0.91454 -0.44491,1.50157 -0.43873,0.58703 -1.32855,0.8651 0.48817,0.11123 0.87128,0.50671 0.3893,0.38929 0.78477,1.18642 l 1.29147,2.62002 h -2.53351 l -1.12463,-2.29252 q -0.33986,-0.69208 -0.69208,-0.94543 -0.34604,-0.25335 -0.92689,-0.25335 z"
+           style="font-size:12.65519524px;line-height:1.25"
+           id="path863" />
+      </g>
+    </g>
+  </g>
+</svg>

css/font-combodo/test.html

@@ -18,6 +18,9 @@ aIcons = {
 	'combodo-icon': 'Combodo icon',
 	'combodo-icon-o': 'Combodo icon (outline)',
 	'itop-icon': 'iTop icon',
+	'itophub-icon': 'iTop Hub icon',
+	'chameleon-icon': 'Hub\'s Chameleon icon',
+	'opensource-icon': 'Open Source Logo',
 }
 
 function GenerateTable() {