diff --git a/css/font-combodo/combodo-webfont.woff b/css/font-combodo/combodo-webfont.woff new file mode 100644 index 000000000..fb275baa5 Binary files /dev/null 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 new file mode 100644 index 000000000..f50f6264d Binary files /dev/null and b/css/font-combodo/combodo-webfont.woff2 differ diff --git a/css/font-combodo/combodo.sfd b/css/font-combodo/combodo.sfd new file mode 100644 index 000000000..938e533c0 --- /dev/null +++ b/css/font-combodo/combodo.sfd @@ -0,0 +1,562 @@ +SplineFontDB: 3.0 +FontName: Combodo +FullName: Combodo +FamilyName: Combodo +Weight: Regular +Copyright: Copyright (c) 2016, Combodo +UComments: "2016-5-20: Created with FontForge (http://fontforge.org)" +Version: 001.000 +ItalicAngle: 0 +UnderlinePosition: -102 +UnderlineWidth: 51 +Ascent: 819 +Descent: 205 +InvalidEm: 0 +LayerCount: 3 +Layer: 0 0 "Arri+AOgA-re" 1 +Layer: 1 0 "Avant" 0 +Layer: 2 0 "Arri+AOgA-re 2" 1 +XUID: [1021 788 735880319 2265] +StyleMap: 0x0000 +FSType: 0 +OS2Version: 0 +OS2_WeightWidthSlopeOnly: 0 +OS2_UseTypoMetrics: 1 +CreationTime: 1463745065 +ModificationTime: 1464086488 +OS2TypoAscent: 0 +OS2TypoAOffset: 1 +OS2TypoDescent: 0 +OS2TypoDOffset: 1 +OS2TypoLinegap: 92 +OS2WinAscent: 0 +OS2WinAOffset: 1 +OS2WinDescent: 0 +OS2WinDOffset: 1 +HheadAscent: 0 +HheadAOffset: 1 +HheadDescent: 0 +HheadDOffset: 1 +MarkAttachClasses: 1 +DEI: 91125 +Encoding: ISO8859-1 +UnicodeInterp: none +NameList: AGL For New Fonts +DisplaySize: -48 +AntiAlias: 1 +FitToEm: 0 +WinInfo: 0 31 10 +BeginPrivate: 0 +EndPrivate +BeginChars: 256 6 + +StartChar: zero +Encoding: 48 48 0 +Width: 1024 +VWidth: 0 +Flags: W +HStem: -14 54<392.945 631.055> 147 53<436.58 587.42> 520 54<436.58 587.42> 680 54<392.945 631.055> +VStem: 138 54<240.945 479.055> 298 54<284.58 435.42> 672 54<284.58 435.42> 832 54<242.481 479.055> +LayerCount: 3 +Fore +SplineSet +367 704 m 0 + 413 724 461 734 512 734 c 0 + 563 734 611 724 657 704 c 0 + 703 684 743 658 776 625 c 0 + 809 592 836 551 856 505 c 0 + 876 459 886 411 886 360 c 0 + 886 309 876 261 856 215 c 0 + 836 169 809 129 776 96 c 0 + 743 63 703 36 657 16 c 0 + 611 -4 563 -14 512 -14 c 0 + 461 -14 413 -4 367 16 c 0 + 321 36 280 63 247 96 c 0 + 214 129 188 169 168 215 c 0 + 148 261 138 309 138 360 c 0 + 138 411 148 459 168 505 c 0 + 188 551 214 592 247 625 c 0 + 280 658 321 684 367 704 c 0 +229 209 m 1 + 310 290 l 1 + 302 313 298 336 298 360 c 0 + 298 384 302 407 310 430 c 1 + 229 511 l 1 + 204 463 192 413 192 360 c 0 + 192 307 204 257 229 209 c 1 +399 247 m 0 + 430 216 468 200 512 200 c 0 + 556 200 594 216 625 247 c 0 + 656 278 672 316 672 360 c 0 + 672 404 656 442 625 473 c 0 + 594 504 556 520 512 520 c 0 + 468 520 430 504 399 473 c 0 + 368 442 352 404 352 360 c 0 + 352 316 368 278 399 247 c 0 +512 680 m 0 + 459 680 409 668 361 643 c 1 + 442 562 l 1 + 465 570 488 574 512 574 c 0 + 536 574 559 570 582 562 c 1 + 663 643 l 1 + 615 668 565 680 512 680 c 0 +512 40 m 0 + 565 40 615 52 663 77 c 1 + 582 158 l 1 + 559 150 536 147 512 147 c 0 + 488 147 465 150 442 158 c 1 + 361 77 l 1 + 409 52 459 40 512 40 c 0 +714 290 m 1 + 795 210 l 1 + 820 258 832 307 832 360 c 0 + 832 413 820 463 795 511 c 1 + 714 430 l 1 + 722 407 726 384 726 360 c 0 + 726 336 722 313 714 290 c 1 +EndSplineSet +EndChar + +StartChar: one +Encoding: 49 49 1 +Width: 1024 +VWidth: 0 +Flags: W +HStem: -6 148<444.866 547.081> 501 134<444.866 539.817> +VStem: 137 179<274.173 371.715> 674 213<269.376 371.715> +LayerCount: 3 +Fore +SplineSet +887 315 m 0 + 887 216 821 127 732 61 c 1 + 766 -50 l 1 + 645 17 l 1 + 600 6 556 -6 512 -6 c 0 + 302 -6 137 138 137 315 c 0 + 137 492 302 635 512 635 c 0 + 711 635 887 492 887 315 c 0 +674 282 m 1 + 674 361 l 2 + 674 369 666 376 656 376 c 2 + 549 376 l 1 + 549 483 l 2 + 549 493 543 501 535 501 c 2 + 455 501 l 2 + 447 501 440 493 440 483 c 2 + 440 376 l 1 + 333 376 l 2 + 323 376 316 369 316 361 c 2 + 316 282 l 2 + 316 274 323 267 333 267 c 2 + 440 267 l 1 + 440 160 l 2 + 440 150 447 142 455 142 c 2 + 535 142 l 2 + 543 142 549 150 549 160 c 2 + 549 267 l 1 + 656 267 l 2 + 666 267 674 274 674 282 c 1 +EndSplineSet +EndChar + +StartChar: two +Encoding: 50 50 2 +Width: 1024 +VWidth: 0 +HStem: -12 242<523.008 709.336> 89 500<229.64 345> 307 234<523.008 816.383> +VStem: 38 266<252.887 377.623> 346 138<235.474 301.49> 570 58<236.004 301.036> 714 59<236.004 301.036> 859 135<236.561 300.551> +LayerCount: 3 +Fore +SplineSet +304 272 m 4x5f + 304 205 329 141 372 91 c 5 + 359 89 345 89 331 89 c 4 + 297 89 263 97 228 106 c 5 + 133 55 l 5 + 159 141 l 5 + 90 193 38 261 38 339 c 4 + 38 477 176 589 331 589 c 4 + 394 589 453 572 500 544 c 5 + 384 494 304 392 304 272 c 4x5f +994 265 m 4 + 994 179 937 102 860 45 c 5 + 889 -50 l 5 + 785 7 l 5 + 747 -2 708 -12 670 -12 c 4 + 489 -12 346 113 346 265 c 4 + 346 417 489 541 670 541 c 4xbf + 841 541 994 417 994 265 c 4 +522 230 m 4 + 551 230 570 249 570 269 c 4 + 570 288 551 307 522 307 c 4 + 503 307 484 288 484 269 c 4 + 484 249 503 230 522 230 c 4 +666 230 m 4 + 695 230 714 249 714 269 c 4 + 714 288 695 307 666 307 c 4 + 647 307 628 288 628 269 c 4 + 628 249 647 230 666 230 c 4 +811 230 m 4 + 840 230 859 249 859 269 c 4 + 859 288 840 307 811 307 c 4 + 792 307 773 288 773 269 c 4 + 773 249 792 230 811 230 c 4 +EndSplineSet +EndChar + +StartChar: three +Encoding: 51 51 3 +Width: 1022 +VWidth: 0 +HStem: -11 549<490 708> 92 497<227.595 344> +VStem: 38 264<254.659 378.861> 348 644<178 415> +LayerCount: 3 +Fore +SplineSet +992 263 m 0xb0 + 992 178 935 103 859 46 c 1 + 888 -49 l 1 + 784 8 l 1 + 746 -1 708 -11 670 -11 c 0 + 490 -11 348 111 348 263 c 0 + 348 415 490 538 670 538 c 0 + 840 538 992 415 992 263 c 0xb0 +795 176 m 2 + 800 181 799 189 793 195 c 2 + 728 260 l 1 + 793 325 l 2 + 799 331 800 340 795 345 c 2 + 747 393 l 2 + 742 398 733 397 727 391 c 2 + 662 326 l 1 + 598 391 l 2 + 592 397 583 398 578 393 c 2 + 530 345 l 2 + 525 340 525 331 531 325 c 2 + 596 260 l 1 + 531 195 l 2 + 525 189 525 181 530 176 c 2 + 578 127 l 2 + 583 122 592 123 598 129 c 2 + 662 194 l 1 + 727 129 l 2 + 733 123 742 122 747 127 c 2 + 795 176 l 2 +302 273 m 0 + 302 206 327 144 370 94 c 1 + 357 92 344 92 330 92 c 0 + 296 92 260 101 226 109 c 1 + 132 58 l 1 + 158 144 l 1 + 89 195 38 264 38 341 c 0 + 38 478 176 589 330 589 c 0x70 + 393 589 450 573 497 545 c 1 + 382 496 302 392 302 273 c 0 +EndSplineSet +EndChar + +StartChar: C +Encoding: 67 67 4 +Width: 1080 +VWidth: 0 +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 +EndSplineSet +EndChar + +StartChar: I +Encoding: 73 73 5 +Width: 1024 +VWidth: 0 +Flags: HW +LayerCount: 3 +Fore +SplineSet +51 -154 m 1 + 51 768 l 1 + 973 768 l 1 + 973 -154 l 1 + 51 -154 l 1 +497 469 m 2 + 502 469 507 470 512 470 c 0 + 517 470 522 469 527 469 c 1 + 527 521 l 1 + 610 604 l 1 + 512 702 l 1 + 414 604 l 1 + 497 521 l 1 + 497 469 l 1 + 497 469 l 2 +653 417 m 1 + 681 445 l 1 + 798 445 l 1 + 798 584 l 1 + 659 584 l 1 + 659 467 l 1 + 633 440 l 1 + 643 433 649 425 653 417 c 1 +366 282 m 1 + 366 313 l 1 + 288 313 l 1 + 206 396 l 1 + 108 298 l 1 + 206 200 l 1 + 288 282 l 1 + 366 282 l 1 +343 445 m 1 + 371 417 l 1 + 375 425 381 433 391 440 c 1 + 365 467 l 1 + 365 584 l 1 + 226 584 l 1 + 226 445 l 1 + 343 445 l 1 +371 178 m 1 + 343 151 l 1 + 226 151 l 1 + 226 12 l 1 + 365 12 l 1 + 365 129 l 1 + 391 155 l 1 + 381 162 375 170 371 178 c 1 +818 396 m 1 + 735 313 l 1 + 658 313 l 1 + 658 282 l 1 + 735 282 l 1 + 818 200 l 1 + 916 298 l 1 + 818 396 l 1 +653 178 m 1 + 649 170 643 162 633 155 c 1 + 659 129 l 1 + 659 12 l 1 + 798 12 l 1 + 798 151 l 1 + 681 151 l 1 + 653 178 l 1 +527 126 m 1 + 522 126 517 126 512 126 c 0 + 507 126 502 126 497 126 c 1 + 497 74 l 1 + 414 -8 l 1 + 512 -106 l 1 + 610 -8 l 1 + 527 74 l 1 + 527 126 l 1 + 527 126 l 1 +610 348 m 0 + 584 337 549 330 512 330 c 0 + 475 330 441 337 414 348 c 0 + 408 351 402 353 397 356 c 1 + 397 192 l 2 + 397 184 408 174 426 167 c 0 + 449 157 479 152 512 152 c 0 + 545 152 575 157 598 167 c 0 + 616 174 627 184 627 192 c 2 + 627 356 l 1 + 622 353 616 351 610 348 c 0 +512 443 m 1 + 479 443 449 438 426 428 c 0 + 408 421 397 410 397 402 c 0 + 397 394 408 384 426 377 c 0 + 449 367 479 362 512 362 c 0 + 545 362 575 367 598 377 c 0 + 616 384 627 394 627 402 c 0 + 627 410 616 421 598 428 c 0 + 575 438 545 443 512 443 c 1 + 512 443 l 1 +EndSplineSet +EndChar +EndChars +EndSplineFont diff --git a/css/font-combodo/combodo.ttf b/css/font-combodo/combodo.ttf new file mode 100644 index 000000000..d504fd97b Binary files /dev/null and b/css/font-combodo/combodo.ttf differ diff --git a/css/font-combodo/exclude.txt b/css/font-combodo/exclude.txt new file mode 100644 index 000000000..42e8ee903 --- /dev/null +++ b/css/font-combodo/exclude.txt @@ -0,0 +1,7 @@ +# +# The following source files are not re-distributed with the "build" of the application +# since they are used solely for constructing other files during the build process +# +glyphs +combodo.sfd +combodo.ttf \ No newline at end of file diff --git a/css/font-combodo/font-combodo.css b/css/font-combodo/font-combodo.css new file mode 100644 index 000000000..396744b2a --- /dev/null +++ b/css/font-combodo/font-combodo.css @@ -0,0 +1,54 @@ +@font-face { + font-family: 'CombodoRegular'; + src: url('combodo-webfont.woff2') format('woff2'), + url('combodo-webfont.woff') format('woff'); + font-weight: normal; + font-style: normal; + +} + +.fc { + display: inline-block; + font: normal normal normal 14px/1 CombodoRegular; + font-size: inherit; + text-rendering: auto; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} +/* makes the font 33% larger relative to the icon container */ +.fc-lg { + font-size: 1.33333333em; + line-height: 0.75em; + vertical-align: -15%; +} +.fc-2x { + font-size: 2em; +} +.fc-3x { + font-size: 3em; +} +.fc-4x { + font-size: 4em; +} +.fc-5x { + font-size: 5em; +} +.fc-life-saver:before { + content: "0"; +} +.fc-new-request:before { + content: "1"; +} +.fc-ongoing-request:before { + content: "2"; +} +.fc-closed-request:before { + content: "3"; +} +.fc-combodo-icon:before { + content: "C"; +} +.fc-itop-icon:before { + content: "I"; +} + diff --git a/css/font-combodo/glyphs/0.svg b/css/font-combodo/glyphs/0.svg new file mode 100644 index 000000000..ad232eb48 --- /dev/null +++ b/css/font-combodo/glyphs/0.svg @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/css/font-combodo/glyphs/1.svg b/css/font-combodo/glyphs/1.svg new file mode 100644 index 000000000..2750be5d4 --- /dev/null +++ b/css/font-combodo/glyphs/1.svg @@ -0,0 +1,13 @@ + + + + + + diff --git a/css/font-combodo/glyphs/2.svg b/css/font-combodo/glyphs/2.svg new file mode 100644 index 000000000..7709ca27e --- /dev/null +++ b/css/font-combodo/glyphs/2.svg @@ -0,0 +1,18 @@ + + + + + + + diff --git a/css/font-combodo/glyphs/3.svg b/css/font-combodo/glyphs/3.svg new file mode 100644 index 000000000..ffe595e0c --- /dev/null +++ b/css/font-combodo/glyphs/3.svg @@ -0,0 +1,17 @@ + + + + + + + diff --git a/css/font-combodo/glyphs/C.svg b/css/font-combodo/glyphs/C.svg new file mode 100644 index 000000000..f1a82079b --- /dev/null +++ b/css/font-combodo/glyphs/C.svg @@ -0,0 +1,65 @@ + + + + + + diff --git a/css/font-combodo/glyphs/I.svg b/css/font-combodo/glyphs/I.svg new file mode 100644 index 000000000..2e6eec3e4 --- /dev/null +++ b/css/font-combodo/glyphs/I.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml b/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml index ab4ec70a5..d55db839e 100755 --- a/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml +++ b/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml @@ -613,7 +613,7 @@ Brick:Portal:FAQ:Title+ - fa fa-map fa-2x + fc fc-life-saver fc-2x 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 c5a97c17d..ec17228db 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 @@ -34,6 +34,8 @@ + {# - Font Combodo #} + {# - Font awesome #} {# - Misc libs #} diff --git a/datamodels/2.x/itop-portal-base/portal/web/css/portal.css b/datamodels/2.x/itop-portal-base/portal/web/css/portal.css index 6ee5920ad..59c57c38a 100644 --- a/datamodels/2.x/itop-portal-base/portal/web/css/portal.css +++ b/datamodels/2.x/itop-portal-base/portal/web/css/portal.css @@ -1,13 +1,6 @@ /*******************/ /* Global settings */ /*******************/ -@font-face { - font-family: 'Combodo'; - src: url('../fonts/fontawesome-webfont.woff') format('woff'), url('../fonts/fontawesome-webfont.ttf') format('truetype'); - font-weight: normal; - font-style: normal; -} - @media (max-width: 768px){ body{ padding-top: 60px; @@ -504,6 +497,10 @@ a:hover, a:focus{ padding: 40px 40px 30px 40px; min-height: 10em; text-align: left; + transition: all 0.2s linear; + } + .home .tile:hover{ + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.10); } .home .tile .tile_decoration{ display: block; diff --git a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml index e146fb637..2d763565c 100755 --- a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml +++ b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml @@ -1027,7 +1027,7 @@ Portal:CreateNewRequest+ - fa fa-map fa-2x + fc fc-new-request fc-2x @@ -1104,7 +1104,7 @@ Portal:ShowOngoing+ - fa fa-pencil-square fa-2x + fc fc-ongoing-request fc-2x @@ -1157,7 +1157,7 @@ Portal:ShowClosed+ - fa fa-pencil-square fa-2x + fc fc-closed-request fc-2x org_id AND caller_id = :current_contact_id AND status = 'closed']]>