diff --git a/css/font-combodo/combodo-webfont.woff b/css/font-combodo/combodo-webfont.woff index fb275baa5..408495bcb 100644 Binary files a/css/font-combodo/combodo-webfont.woff and b/css/font-combodo/combodo-webfont.woff differ diff --git a/css/font-combodo/combodo-webfont.woff2 b/css/font-combodo/combodo-webfont.woff2 index f50f6264d..93755b0ba 100644 Binary files a/css/font-combodo/combodo-webfont.woff2 and b/css/font-combodo/combodo-webfont.woff2 differ diff --git a/css/font-combodo/combodo.sfd b/css/font-combodo/combodo.sfd index 938e533c0..77b9930f5 100644 --- a/css/font-combodo/combodo.sfd +++ b/css/font-combodo/combodo.sfd @@ -5,7 +5,7 @@ FamilyName: Combodo Weight: Regular Copyright: Copyright (c) 2016, Combodo UComments: "2016-5-20: Created with FontForge (http://fontforge.org)" -Version: 001.000 +Version: 001.100 ItalicAngle: 0 UnderlinePosition: -102 UnderlineWidth: 51 @@ -23,7 +23,7 @@ OS2Version: 0 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1463745065 -ModificationTime: 1464086488 +ModificationTime: 1464103566 OS2TypoAscent: 0 OS2TypoAOffset: 1 OS2TypoDescent: 0 @@ -48,7 +48,7 @@ FitToEm: 0 WinInfo: 0 31 10 BeginPrivate: 0 EndPrivate -BeginChars: 256 6 +BeginChars: 256 8 StartChar: zero Encoding: 48 48 0 @@ -263,194 +263,194 @@ Flags: HW LayerCount: 3 Fore SplineSet -641 -116 m 0x9b20 - 637 -116 633 -115 630 -113 c 0 - 623 -109 611 -99 618 -75 c 0 - 621 -65 626 -52 632 -40 c 0 - 640 -23 648 -4 651 13 c 0 - 653 26 643 50 624 75 c 0 - 609 94 595 108 586 115 c 1 - 562 107 523 97 500 97 c 2 - 499 97 l 2xdb20 - 479 97 468 105 460 111 c 0 - 457 114 455 115 453 116 c 0 - 450 116 438 112 423 104 c 0 - 412 98 405 94 401 90 c 1 - 411 80 436 61 448 52 c 0 - 460 43 468 37 473 32 c 0 - 491 15 488 -28 487 -36 c 0 - 485 -55 477 -90 452 -105 c 0 - 444 -110 435 -112 426 -112 c 0 - 388 -112 356 -68 351 -51 c 0 - 347 -39 346 -18 345 -6 c 1 - 338 0 325 9 313 21 c 0 - 283 49 271 70 272 87 c 0 - 274 119 301 173 354 215 c 0 - 367 225 387 232 404 236 c 1 - 397 242 388 247 377 249 c 0 - 375 249 373 250 372 250 c 0 - 366 250 361 247 356 244 c 0 - 354 243 352 241 350 240 c 0 - 321 226 296 206 277 189 c 0 - 260 174 248 164 236 161 c 0 - 234 161 232 161 230 161 c 0 - 221 161 206 165 168 192 c 0 - 159 198 151 204 145 209 c 1 - 127 190 l 1 - 126 189 l 2 - 123 187 109 178 93 178 c 0 - 79 178 67 185 61 198 c 0 - 50 221 53 284 53 296 c 2 - 53 298 l 1 - 54 299 l 2 - 55 305 61 333 82 345 c 0 - 86 347 89 348 94 348 c 0 - 104 348 120 344 172 314 c 0 - 189 304 205 294 215 288 c 1 - 309 342 l 1 - 312 366 l 1 - 304 373 290 386 276 400 c 0 - 244 432 226 456 221 475 c 0 - 214 502 218 538 231 575 c 0 - 237 593 255 636 284 651 c 0 - 293 656 305 658 320 658 c 0xb9a0 - 342 658 367 653 389 644 c 0 - 416 633 437 617 452 597 c 0 - 479 562 478 509 475 479 c 1 - 482 479 l 1 - 505 499 l 1 - 543 519 l 1 - 538 529 l 1 - 495 537 l 1 - 492 547 l 2 - 492 548 483 571 477 598 c 0 - 471 625 466 664 490 680 c 0 - 498 685 508 687 520 687 c 0 - 554 687 597 666 602 664 c 2 - 607 661 l 1 - 644 593 l 2 - 649 589 659 581 669 571 c 0 - 691 549 700 531 696 515 c 0 - 692 499 674 481 643 452 c 0 - 623 433 601 412 593 399 c 0 - 584 382 601 365 614 355 c 1 - 625 367 641 385 651 397 c 0 - 661 409 680 426 700 441 c 0 - 727 461 749 472 765 473 c 0 - 766 473 767 473 768 473 c 0 - 787 473 808 460 831 446 c 0 - 845 437 865 424 873 424 c 0 - 874 424 l 2x9d60 - 875 424 880 425 884 426 c 0 - 897 429 915 433 930 433 c 0 - 956 433 965 421 969 412 c 0 - 976 395 967 367 959 347 c 0 - 954 334 939 303 921 292 c 0 - 916 289 911 288 905 288 c 0 - 888 288 863 299 835 311 c 0 - 810 322 780 335 766 335 c 0 - 765 335 764 335 764 335 c 0 - 763 335 757 331 748 315 c 0 - 741 301 734 283 727 264 c 0 - 721 248 715 231 708 216 c 1 - 744 178 763 108 753 47 c 0 - 748 19 727 -22 708 -51 c 0 - 697 -68 687 -82 677 -93 c 0 - 663 -109 652 -116 641 -116 c 0x9b20 -308 85 m 1 - 308 83 312 72 340 46 c 0 - 357 30 374 18 374 18 c 2 - 380 13 l 1 - 381 4 l 2 - 382 -9 383 -32 386 -40 c 0 - 387 -42 393 -53 402 -62 c 0 - 411 -71 419 -76 426 -76 c 0 - 429 -76 430 -75 433 -73 c 0 - 439 -69 445 -60 448 -46 c 0 - 454 -22 450 1 447 6 c 0 - 443 9 435 17 426 23 c 0 - 379 58 358 75 362 95 c 0 - 363 100 366 113 402 134 c 0 - 410 138 435 153 453 153 c 0xb9a0 - 455 153 458 152 460 152 c 0 - 470 150 476 145 482 141 c 0 - 488 136 491 133 499 133 c 2 - 500 133 l 2xd920 - 521 133 562 145 581 153 c 2 - 589 156 l 1 - 596 153 l 2xb920 - 612 146 637 119 654 97 c 0 - 672 73 693 37 688 7 c 0 - 686 -7 681 -21 675 -35 c 1 - 677 -32 679 -28 681 -25 c 0 - 700 6 713 36 716 53 c 0 - 720 79 719 109 711 136 c 0 - 703 163 690 185 674 198 c 2 - 663 207 l 1 - 670 221 l 2 - 678 237 686 257 693 277 c 0 - 710 322 724 361 753 370 c 0 - 757 371 761 372 766 372 c 0 - 788 372 818 359 850 345 c 0 - 868 337 893 326 903 325 c 1 - 907 329 916 340 924 359 c 0 - 932 377 934 390 934 396 c 0 - 933 396 932 396 930 396 c 0xdb20 - 919 396 902 392 892 390 c 0 - 886 389 881 388 878 388 c 0 - 876 388 875 387 873 387 c 0 - 855 387 833 400 811 414 c 0 - 797 423 776 437 768 437 c 0 - 762 436 745 429 722 412 c 0 - 703 398 687 381 680 373 c 0 - 664 353 631 319 630 318 c 2 - 620 307 l 1 - 607 314 l 2 - 606 314 589 325 574 341 c 0 - 552 366 547 393 561 417 c 0 - 571 435 595 458 618 479 c 0 - 633 493 656 515 660 523 c 0 - 659 525 656 533 640 548 c 0 - 629 559 619 566 619 566 c 2 - 615 569 l 1 - 580 633 l 1 - 566 639 539 650 520 650 c 0x9d60 - 514 650 512 650 511 649 c 0 - 509 646 507 633 514 602 c 0 - 517 589 520 577 523 569 c 1 - 562 561 l 1 - 593 505 l 1 - 526 468 l 1 - 495 442 l 1 - 431 443 l 1 - 435 465 l 2 - 439 485 446 544 423 575 c 0 - 400 605 354 621 320 621 c 0x99a0 - 310 621 304 619 301 618 c 0 - 278 606 246 528 257 484 c 0 - 262 463 311 415 344 388 c 2 - 352 381 l 1 - 342 318 l 1 - 214 245 l 1 - 205 251 l 2 - 205 251 181 266 155 281 c 0 - 119 302 104 308 98 310 c 1 - 95 306 91 298 90 293 c 0 - 89 264 90 227 94 215 c 0 - 97 216 100 217 103 219 c 2 - 142 260 l 1 - 155 249 l 2 - 185 224 218 201 229 198 c 0 - 234 201 245 210 253 217 c 0 - 273 234 300 258 334 274 c 0 - 335 274 336 275 338 276 c 0 - 345 280 356 287 372 287 c 0 - 376 287 380 286 384 285 c 0 - 431 276 455 235 456 233 c 2 - 469 209 l 1 - 442 206 l 2 - 424 204 390 196 377 186 c 0 - 330 149 310 105 308 85 c 1 +641 -116 m 4x9b20 + 637 -116 633 -115 630 -113 c 4 + 623 -109 611 -99 618 -75 c 4 + 621 -65 626 -52 632 -40 c 4 + 640 -23 648 -4 651 13 c 4 + 653 26 643 50 624 75 c 4 + 609 94 595 108 586 115 c 5 + 562 107 523 97 500 97 c 6 + 499 97 l 6xdb20 + 479 97 468 105 460 111 c 4 + 457 114 455 115 453 116 c 4 + 450 116 438 112 423 104 c 4 + 412 98 405 94 401 90 c 5 + 411 80 436 61 448 52 c 4 + 460 43 468 37 473 32 c 4 + 491 15 488 -28 487 -36 c 4 + 485 -55 477 -90 452 -105 c 4 + 444 -110 435 -112 426 -112 c 4 + 388 -112 356 -68 351 -51 c 4 + 347 -39 346 -18 345 -6 c 5 + 338 0 325 9 313 21 c 4 + 283 49 271 70 272 87 c 4 + 274 119 301 173 354 215 c 4 + 367 225 387 232 404 236 c 5 + 397 242 388 247 377 249 c 4 + 375 249 373 250 372 250 c 4 + 366 250 361 247 356 244 c 4 + 354 243 352 241 350 240 c 4 + 321 226 296 206 277 189 c 4 + 260 174 248 164 236 161 c 4 + 234 161 232 161 230 161 c 4 + 221 161 206 165 168 192 c 4 + 159 198 151 204 145 209 c 5 + 127 190 l 5 + 126 189 l 6 + 123 187 109 178 93 178 c 4 + 79 178 67 185 61 198 c 4 + 50 221 53 284 53 296 c 6 + 53 298 l 5 + 54 299 l 6 + 55 305 61 333 82 345 c 4 + 86 347 89 348 94 348 c 4 + 104 348 120 344 172 314 c 4 + 189 304 205 294 215 288 c 5 + 309 342 l 5 + 312 366 l 5 + 304 373 290 386 276 400 c 4 + 244 432 226 456 221 475 c 4 + 214 502 218 538 231 575 c 4 + 237 593 255 636 284 651 c 4 + 293 656 305 658 320 658 c 4xb9a0 + 342 658 367 653 389 644 c 4 + 416 633 437 617 452 597 c 4 + 479 562 478 509 475 479 c 5 + 482 479 l 5 + 505 499 l 5 + 543 519 l 5 + 538 529 l 5 + 495 537 l 5 + 492 547 l 6 + 492 548 483 571 477 598 c 4 + 471 625 466 664 490 680 c 4 + 498 685 508 687 520 687 c 4 + 554 687 597 666 602 664 c 6 + 607 661 l 5 + 644 593 l 6 + 649 589 659 581 669 571 c 4 + 691 549 700 531 696 515 c 4 + 692 499 674 481 643 452 c 4 + 623 433 601 412 593 399 c 4 + 584 382 601 365 614 355 c 5 + 625 367 641 385 651 397 c 4 + 661 409 680 426 700 441 c 4 + 727 461 749 472 765 473 c 4 + 766 473 767 473 768 473 c 4 + 787 473 808 460 831 446 c 4 + 845 437 865 424 873 424 c 4 + 874 424 l 6x9d60 + 875 424 880 425 884 426 c 4 + 897 429 915 433 930 433 c 4 + 956 433 965 421 969 412 c 4 + 976 395 967 367 959 347 c 4 + 954 334 939 303 921 292 c 4 + 916 289 911 288 905 288 c 4 + 888 288 863 299 835 311 c 4 + 810 322 780 335 766 335 c 4 + 765 335 764 335 764 335 c 4 + 763 335 757 331 748 315 c 4 + 741 301 734 283 727 264 c 4 + 721 248 715 231 708 216 c 5 + 744 178 763 108 753 47 c 4 + 748 19 727 -22 708 -51 c 4 + 697 -68 687 -82 677 -93 c 4 + 663 -109 652 -116 641 -116 c 4x9b20 +308 85 m 5 + 308 83 312 72 340 46 c 4 + 357 30 374 18 374 18 c 6 + 380 13 l 5 + 381 4 l 6 + 382 -9 383 -32 386 -40 c 4 + 387 -42 393 -53 402 -62 c 4 + 411 -71 419 -76 426 -76 c 4 + 429 -76 430 -75 433 -73 c 4 + 439 -69 445 -60 448 -46 c 4 + 454 -22 450 1 447 6 c 4 + 443 9 435 17 426 23 c 4 + 379 58 358 75 362 95 c 4 + 363 100 366 113 402 134 c 4 + 410 138 435 153 453 153 c 4xb9a0 + 455 153 458 152 460 152 c 4 + 470 150 476 145 482 141 c 4 + 488 136 491 133 499 133 c 6 + 500 133 l 6xd920 + 521 133 562 145 581 153 c 6 + 589 156 l 5 + 596 153 l 6xb920 + 612 146 637 119 654 97 c 4 + 672 73 693 37 688 7 c 4 + 686 -7 681 -21 675 -35 c 5 + 677 -32 679 -28 681 -25 c 4 + 700 6 713 36 716 53 c 4 + 720 79 719 109 711 136 c 4 + 703 163 690 185 674 198 c 6 + 663 207 l 5 + 670 221 l 6 + 678 237 686 257 693 277 c 4 + 710 322 724 361 753 370 c 4 + 757 371 761 372 766 372 c 4 + 788 372 818 359 850 345 c 4 + 868 337 893 326 903 325 c 5 + 907 329 916 340 924 359 c 4 + 932 377 934 390 934 396 c 4 + 933 396 932 396 930 396 c 4xdb20 + 919 396 902 392 892 390 c 4 + 886 389 881 388 878 388 c 4 + 876 388 875 387 873 387 c 4 + 855 387 833 400 811 414 c 4 + 797 423 776 437 768 437 c 4 + 762 436 745 429 722 412 c 4 + 703 398 687 381 680 373 c 4 + 664 353 631 319 630 318 c 6 + 620 307 l 5 + 607 314 l 6 + 606 314 589 325 574 341 c 4 + 552 366 547 393 561 417 c 4 + 571 435 595 458 618 479 c 4 + 633 493 656 515 660 523 c 4 + 659 525 656 533 640 548 c 4 + 629 559 619 566 619 566 c 6 + 615 569 l 5 + 580 633 l 5 + 566 639 539 650 520 650 c 4x9d60 + 514 650 512 650 511 649 c 4 + 509 646 507 633 514 602 c 4 + 517 589 520 577 523 569 c 5 + 562 561 l 5 + 593 505 l 5 + 526 468 l 5 + 495 442 l 5 + 431 443 l 5 + 435 465 l 6 + 439 485 446 544 423 575 c 4 + 400 605 354 621 320 621 c 4x99a0 + 310 621 304 619 301 618 c 4 + 278 606 246 528 257 484 c 4 + 262 463 311 415 344 388 c 6 + 352 381 l 5 + 342 318 l 5 + 214 245 l 5 + 205 251 l 6 + 205 251 181 266 155 281 c 4 + 119 302 104 308 98 310 c 5 + 95 306 91 298 90 293 c 4 + 89 264 90 227 94 215 c 4 + 97 216 100 217 103 219 c 6 + 142 260 l 5 + 155 249 l 6 + 185 224 218 201 229 198 c 4 + 234 201 245 210 253 217 c 4 + 273 234 300 258 334 274 c 4 + 335 274 336 275 338 276 c 4 + 345 280 356 287 372 287 c 4 + 376 287 380 286 384 285 c 4 + 431 276 455 235 456 233 c 6 + 469 209 l 5 + 442 206 l 6 + 424 204 390 196 377 186 c 4 + 330 149 310 105 308 85 c 5 EndSplineSet EndChar @@ -558,5 +558,140 @@ SplineSet 512 443 l 1 EndSplineSet EndChar + +StartChar: four +Encoding: 52 52 6 +Width: 1024 +VWidth: 0 +Flags: H +LayerCount: 3 +Fore +SplineSet +801 -67 m 1 + 643 19 l 1 + 601 9 557 -2 513 -2 c 0 + 407 -2 307 33 233 97 c 0 + 197 128 168 165 148 206 c 0 + 127 248 117 293 117 339 c 0 + 117 385 127 431 148 473 c 0 + 168 514 197 550 233 581 c 0 + 307 645 407 680 513 680 c 0 + 564 680 614 672 662 654 c 0 + 709 637 751 612 788 581 c 0 + 825 550 855 513 876 473 c 0 + 898 430 909 385 909 339 c 0 + 909 288 892 238 861 189 c 0 + 835 149 801 111 757 77 c 1 + 801 -67 l 1 + 801 -67 l 1 +649 63 m 1 + 733 17 l 1 + 710 93 l 1 + 721 102 l 2 + 816 173 868 256 868 339 c 0 + 868 502 705 639 513 639 c 0 + 317 639 158 504 158 339 c 0 + 158 174 317 39 513 39 c 0 + 552 39 592 49 634 59 c 2 + 649 63 l 1 + 649 63 l 1 +675 306 m 1 + 675 298 667 292 657 292 c 2 + 550 292 l 1 + 550 185 l 2 + 550 175 543 167 535 167 c 2 + 456 167 l 2 + 448 167 441 175 441 185 c 2 + 441 292 l 1 + 334 292 l 2 + 324 292 316 298 316 306 c 2 + 316 386 l 2 + 316 394 324 401 334 401 c 2 + 441 401 l 1 + 441 508 l 2 + 441 518 448 525 456 525 c 2 + 535 525 l 2 + 543 525 550 518 550 508 c 2 + 550 401 l 1 + 657 401 l 2 + 667 401 675 394 675 386 c 2 + 675 306 l 1 + 675 306 l 1 +EndSplineSet +EndChar + +StartChar: D +Encoding: 68 68 7 +Width: 1080 +VWidth: 0 +Flags: HW +LayerCount: 3 +Fore +SplineSet +468.64572731 -13.558737032 m 0 + 468.64572731 -44.7954148575 458.407451046 -89.0800233035 424.775770836 -89.0800233035 c 0 + 397.022747309 -89.0800233035 372.32180565 -52.6263197761 369 -41 c 0 + 365 -27 363 7 363 7 c 1 + 363 7 291.959642075 62.4698685172 291.959642075 87.9691750735 c 0 + 291.959642075 113.376863783 316.679015082 163.529631764 366 202 c 0 + 388 219 439 225 439 225 c 1 + 439 225 414.110137344 268.926791176 372.740852657 268.926791176 c 0 + 359.228703245 268.926791176 349.708131846 261.354065923 343 258 c 0 + 289 232 252 185 234 181 c 0 + 233.433333333 180.866666667 232.807777778 180.802222222 232.127888889 180.802222222 c 0 + 212.411111111 180.802222222 147 235 147 235 c 1 + 119 206 l 1 + 119 206 107.410225922 197.844233056 96.8861781951 197.844233056 c 0 + 72.8428111824 197.844233056 75.8106508876 252.834903882 75.8106508876 279.065543924 c 0 + 75.8106508876 288.562130178 76 295 76 295 c 2 + 76 295 82 320 96 328 c 0 + 96.7777777778 328.444444444 97.8425925926 328.654320988 99.1601508916 328.654320988 c 0 + 121.558641975 328.654320988 217 268 217 268 c 2 + 327 330 l 1 + 333 372 l 1 + 333 372 250 441 241 477 c 0 + 239.237084845 484.198570214 238.423796587 492.217272748 238.423796587 500.713675674 c 0 + 238.423796587 550.051499679 265.848016675 615.497463136 294 630 c 0 + 300.138285885 633.19190866 309.652570174 634.876675176 321.06264977 634.876675176 c 0 + 356.123522363 634.876675176 409.08466311 618.968959665 437 582 c 0 + 453.253731343 560.328358209 457.37781243 530.165961239 457.37781243 505.134225287 c 0 + 457.37781243 479.343951882 453 459 453 459 c 1 + 488 459 l 1 + 514 481 l 1 + 566 509 l 1 + 548 542 l 1 + 507 550 l 1 + 507 550 489.207333635 598.144861928 489.207333635 631.213835085 c 0 + 489.207333635 653.370834845 497.209328773 663.76 518.552 663.76 c 0 + 548.76 663.76 591 642 591 642 c 1 + 627 577 l 1 + 627 577 674.338776197 541.495917852 674.338776197 519.129431851 c 0 + 674.338776197 494.680774842 591.858662315 438.748733005 574 407 c 0 + 570.44966443 400.67114094 568.948515833 394.461420657 568.948515833 388.484860559 c 0 + 568.948515833 355.743705239 614 330 614 330 c 1 + 614 330 646 364 662 384 c 0 + 677.698951456 403.623689319 733.747750392 453.052350823 762.50041559 453.052350823 c 0 + 789.718129014 453.052350823 840.744832641 403.683896618 866.626933224 403.683896618 c 0 + 877.665037682 403.683896618 901.761638559 412.671089779 923.596296639 412.671089779 c 0 + 937.424421815 412.671089779 945.131722305 409.276302365 945.131722305 396.117809414 c 0 + 945.131722305 371.07574487 921.900878422 317.674239003 905 307 c 0 + 903.42865268 306.007570114 901.296449801 305.555476681 898.689371742 305.555476681 c 0 + 871.975805728 305.555476681 795.404207421 353.021610762 761.47268426 353.021610762 c 0 + 758.674526974 353.021610762 756.166341309 352.698819777 754 352 c 0 + 723 342 708 263 682 213 c 1 + 713.440186944 187.351426441 732.558534282 135.005533735 732.558534282 84.8474797418 c 0 + 732.558534282 74.3822920494 731.726266594 64.0123462436 730 54 c 0 + 722.320058737 8.88034508281 658.423377389 -91.5344640176 638.282830107 -91.5344640176 c 0 + 633.665749707 -91.5344640176 631.828849883 -86.9206443165 631.828849883 -82.6811859806 c 0 + 631.828849883 -63.99641099 660.208602509 -21.5757274442 666 14 c 0 + 666.344981129 16.1191697915 666.510229881 18.3087752442 666.510229881 20.5578040153 c 0 + 666.510229881 63.9437392488 605.014339632 129.443547166 586 138 c 1 + 565 130 522 118 499 118 c 0 + 474.770142654 118 470.175238349 137.203046458 452.692311762 137.203046458 c 0 + 436.234303616 137.203046458 379.90506877 108.265081487 379.90506877 93.00730293 c 0 + 379.90506877 77.1876677059 446.297232175 35.7239986947 460 23 c 0 + 465.46621004 17.924233534 468.64572731 3.39680361548 468.64572731 -13.558737032 c 0 +EndSplineSet +EndChar EndChars EndSplineFont diff --git a/css/font-combodo/combodo.ttf b/css/font-combodo/combodo.ttf index d504fd97b..8049b8f2b 100644 Binary files a/css/font-combodo/combodo.ttf and b/css/font-combodo/combodo.ttf differ diff --git a/css/font-combodo/exclude.txt b/css/font-combodo/exclude.txt index 42e8ee903..2debb76e7 100644 --- a/css/font-combodo/exclude.txt +++ b/css/font-combodo/exclude.txt @@ -4,4 +4,4 @@ # glyphs combodo.sfd -combodo.ttf \ No newline at end of file +test.html \ No newline at end of file diff --git a/css/font-combodo/font-combodo.css b/css/font-combodo/font-combodo.css index 396744b2a..e03514c5a 100644 --- a/css/font-combodo/font-combodo.css +++ b/css/font-combodo/font-combodo.css @@ -1,7 +1,8 @@ @font-face { font-family: 'CombodoRegular'; - src: url('combodo-webfont.woff2') format('woff2'), - url('combodo-webfont.woff') format('woff'); + 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'); font-weight: normal; font-style: normal; @@ -21,6 +22,12 @@ line-height: 0.75em; vertical-align: -15%; } +.fc-1-5x { + font-size: 1.5em; +} +.fc-1-6x { + font-size: 1.6em; +} .fc-2x { font-size: 2em; } @@ -33,21 +40,159 @@ .fc-5x { font-size: 5em; } +.fc-border { + padding: .2em .25em .15em; + border: solid 0.08em #eeeeee; + border-radius: .1em; +} +.fc-ul { + padding-left: 0; + margin-left: 2.2em; + list-style-type: none; +} +.fc-ul > li { + position: relative; +} +.fc-li { + position: absolute; + left: -2.2em; + width: 2.2em; + top: 0.15em; + text-align: center; +} +.fc-li.fa-lg { + left: -1.9em; +} +.fc-pull-left { + float: left; +} +.fc-pull-right { + float: right; +} +.fc.fc-pull-left { + margin-right: .3em; +} +.fc.fa-pull-right { + margin-left: .3em; +} +.fc-fw { + width: 1.3em; + text-align: center; +} +.fc-rotate-90 { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=1)"; + -webkit-transform: rotate(90deg); + -ms-transform: rotate(90deg); + transform: rotate(90deg); +} +.fc-rotate-180 { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2)"; + -webkit-transform: rotate(180deg); + -ms-transform: rotate(180deg); + transform: rotate(180deg); +} +.fc-rotate-270 { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=3)"; + -webkit-transform: rotate(270deg); + -ms-transform: rotate(270deg); + transform: rotate(270deg); +} +.fc-flip-horizontal { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)"; + -webkit-transform: scale(-1, 1); + -ms-transform: scale(-1, 1); + transform: scale(-1, 1); +} +.fc-flip-vertical { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)"; + -webkit-transform: scale(1, -1); + -ms-transform: scale(1, -1); + transform: scale(1, -1); +} +.fc-spin { + -webkit-animation: fc-spin 2s infinite linear; + animation: fc-spin 2s infinite linear; +} +.fc-pulse { + -webkit-animation: fc-spin 1s infinite steps(8); + animation: fc-spin 1s infinite steps(8); +} +.fc-rotate { + -webkit-animation: fc-rotate 2s infinite linear; + animation: fc-rotate 2s infinite linear; +} + +@-webkit-keyframes fc-spin { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} +@keyframes fc-spin { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } +} +@-webkit-keyframes fc-rotate { + 0% { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=0)"; + -webkit-transform: scale(1, 1); + -ms-transform: scale(1, 1); + transform: scale(1, 1); + } + 100% { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)"; + -webkit-transform: scale(-1, 1); + -ms-transform: scale(-1, 1); + transform: scale(-1, 1); + } +} +@keyframes fc-rotate { + 0% { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=0)"; + -webkit-transform: scale(1, 1); + -ms-transform: scale(1, 1); + transform: scale(1, 1); + } + 100% { + -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)"; + -webkit-transform: scale(-1, 1); + -ms-transform: scale(-1, 1); + transform: scale(-1, 1); + } +} + +/* icons */ .fc-life-saver:before { content: "0"; } .fc-new-request:before { content: "1"; } +.fc-new-request-o:before { + content: "4"; +} .fc-ongoing-request:before { content: "2"; } .fc-closed-request:before { content: "3"; } -.fc-combodo-icon:before { +.fc-combodo-icon-o:before { content: "C"; } +.fc-combodo-icon:before { + content: "D"; +} .fc-itop-icon:before { content: "I"; } diff --git a/css/font-combodo/glyphs/4.svg b/css/font-combodo/glyphs/4.svg new file mode 100644 index 000000000..9e807f579 --- /dev/null +++ b/css/font-combodo/glyphs/4.svg @@ -0,0 +1,20 @@ + + + + + + + diff --git a/css/font-combodo/glyphs/D.svg b/css/font-combodo/glyphs/D.svg new file mode 100644 index 000000000..78fba5683 --- /dev/null +++ b/css/font-combodo/glyphs/D.svg @@ -0,0 +1,23 @@ + + + + + + diff --git a/css/font-combodo/test.html b/css/font-combodo/test.html new file mode 100644 index 000000000..c1a102a8e --- /dev/null +++ b/css/font-combodo/test.html @@ -0,0 +1,81 @@ + + + +Combodo Font test page + + + + + +

Combodo Font test page

+

Parameters

+
+

Text color:

+

Icon size:

+

Rotation:

+

Flip: (NB: flip and rotation cannot be combined)

+

Animation:

+ +
+

Icons

+
+ + + + + \ No newline at end of file diff --git a/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php index 45b45e52f..cee619db8 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php @@ -417,6 +417,7 @@ class ApplicationHelper */ static function LoadCurrentUser(Application $oApp) { + // User $oUser = UserRights::GetUserObject(); if ($oUser === null) { @@ -425,7 +426,8 @@ class ApplicationHelper $oApp['combodo.current_user'] = $oUser; - $sUrl = $oApp['combodo.portal.base.absolute_url'].'img/user-profile-default-256px.png'; + // Contact + $sContactPhotoUrl = $oApp['combodo.portal.base.absolute_url'] . 'img/user-profile-default-256px.png'; $oContact = UserRights::GetContactObject(); if ($oContact) { @@ -434,15 +436,15 @@ class ApplicationHelper $oImage = $oContact->Get('picture'); if (is_object($oImage) && !$oImage->IsEmpty()) { - $sUrl = $oImage->GetDownloadURL(get_class($oContact), $oContact->GetKey(), 'picture'); + $sContactPhotoUrl = $oImage->GetDownloadURL(get_class($oContact), $oContact->GetKey(), 'picture'); } else { - $sUrl = MetaModel::GetAttributeDef(get_class($oContact), 'picture')->Get('default_image'); + $sContactPhotoUrl = MetaModel::GetAttributeDef(get_class($oContact), 'picture')->Get('default_image'); } } } - $oApp['combodo.current_user_img'] = $sUrl; + $oApp['combodo.current_contact.photo_url'] = $sContactPhotoUrl; } /** diff --git a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/user-profile/layout.html.twig b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/user-profile/layout.html.twig index 20eb48517..7c48e0b4c 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/views/bricks/user-profile/layout.html.twig +++ b/datamodels/2.x/itop-portal-base/portal/src/views/bricks/user-profile/layout.html.twig @@ -38,10 +38,12 @@

Photo

-
+
- + +
+
Picture edition not available in beta
diff --git a/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig b/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig index b180acc2c..f6443757d 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig +++ b/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig @@ -5,7 +5,7 @@ {% set bUserConnected = true %} {% set sUserFullname = app['combodo.current_user'].Get('first_name') ~ ' ' ~ app['combodo.current_user'].Get('last_name') %} {% set sUserEmail = app['combodo.current_user'].Get('email') %} - {% set sUserPhotoUrl = app['combodo.current_user_img'] %} + {% set sUserPhotoUrl = app['combodo.current_contact.photo_url'] %} {% else %} {% set bUserConnected = false %} {% set sUserFullname = '' %} @@ -100,7 +100,7 @@ {% block pPageBodyWrapper %} {% block pNavigationWrapper %} {# Topbar navigation menu for mobile screens #} -