Commit 97d46dae2bc7953e638b27a7aaa995a128484369
1 parent
2f1fcd7ad6
Exists in
master
update font text
Showing 3 changed files with 226 additions and 37 deletions Side-by-side Diff
app/index.html
app/scripts/controllers/tshirtdesign.js
| ... | ... | @@ -420,68 +420,256 @@ |
| 420 | 420 | |
| 421 | 421 | //Font |
| 422 | 422 | $scope.listFontFamily = [ |
| 423 | + // { | |
| 424 | + // name : 'GN Aki iro Sesami Cookies', | |
| 425 | + // slug : 'gn_aki_iro_sesami_cookies', | |
| 426 | + // }, | |
| 427 | + // { | |
| 428 | + // name : 'GN-Fuyu-iro_Script_Bold', | |
| 429 | + // slug : 'gn_fuyu_iro_script_bold' | |
| 430 | + // }, | |
| 431 | + // { | |
| 432 | + // name : 'GN Killgothic U Kanana', | |
| 433 | + // slug : 'gn_killgothic_u_kanana' | |
| 434 | + // }, | |
| 435 | + // { | |
| 436 | + // name : 'GN-Kin-iro_Alphabet_Cookies', | |
| 437 | + // slug : 'gn_kin_iro_alphabet_cookies' | |
| 438 | + // | |
| 439 | + // }, | |
| 440 | + // { | |
| 441 | + // name : 'GN-Kin-iro_SansSerif', | |
| 442 | + // slug : 'gn_kin_iro_sansserif' | |
| 443 | + // | |
| 444 | + // }, | |
| 445 | + // { | |
| 446 | + // name : 'GN-Koharuiro_Sunray', | |
| 447 | + // slug : 'gn_koharuiro_sunray' | |
| 448 | + // | |
| 449 | + // }, | |
| 450 | + // { | |
| 451 | + // name : 'GN-Kyu-pin', | |
| 452 | + // slug : 'gn_kyu_pin' | |
| 453 | + // }, | |
| 454 | + // { | |
| 455 | + // name : 'gn_natsu_iro_schedule', | |
| 456 | + // slug : 'gn_natsu_iro_schedule' | |
| 457 | + // | |
| 458 | + // }, | |
| 459 | + // { | |
| 460 | + // name : 'gnkana_kiniro_sansserif_l', | |
| 461 | + // slug : 'gnkana_kiniro_sansserif_l' | |
| 462 | + // | |
| 463 | + // }, | |
| 464 | + // { | |
| 465 | + // name : 'gnkana_kiniro_sansserif_st', | |
| 466 | + // slug : 'gnkana_kiniro_sansserif_st' | |
| 467 | + // }, | |
| 468 | + // { | |
| 469 | + // name : 'gnkana_kon_iro_nightfall', | |
| 470 | + // slug : 'gnkana_kon_iro_nightfall' | |
| 471 | + // | |
| 472 | + // }, | |
| 473 | + // { | |
| 474 | + // name : 'ms_gothic', | |
| 475 | + // slug : 'ms_gothic' | |
| 476 | + // | |
| 477 | + // }, | |
| 478 | + // { | |
| 479 | + // name : 'msmincho', | |
| 480 | + // slug : 'msmincho' | |
| 481 | + // }, | |
| 482 | + // { | |
| 483 | + // name : 'ufonts_com_ms_pgothic', | |
| 484 | + // slug : 'ufonts_com_ms_pgothic' | |
| 485 | + // } | |
| 423 | 486 | { |
| 424 | - name : 'GN Aki iro Sesami Cookies', | |
| 425 | - slug : 'gn_aki_iro_sesami_cookies', | |
| 487 | + name: 'Roboto', | |
| 488 | + slug: "'Roboto', sans-serif" | |
| 426 | 489 | }, |
| 427 | 490 | { |
| 428 | - name : 'GN-Fuyu-iro_Script_Bold', | |
| 429 | - slug : 'gn_fuyu_iro_script_bold' | |
| 491 | + name: 'Bungee', | |
| 492 | + slug: "'Bungee', cursive" | |
| 430 | 493 | }, |
| 431 | 494 | { |
| 432 | - name : 'GN Killgothic U Kanana', | |
| 433 | - slug : 'gn_killgothic_u_kanana' | |
| 495 | + name: 'Aref Ruqaa', | |
| 496 | + slug: "'Aref Ruqaa', serif" | |
| 434 | 497 | }, |
| 435 | 498 | { |
| 436 | - name : 'GN-Kin-iro_Alphabet_Cookies', | |
| 437 | - slug : 'gn_kin_iro_alphabet_cookies' | |
| 438 | - | |
| 499 | + name: 'Open Sans', | |
| 500 | + slug: "'Open Sans', sans-serif" | |
| 439 | 501 | }, |
| 440 | 502 | { |
| 441 | - name : 'GN-Kin-iro_SansSerif', | |
| 442 | - slug : 'gn_kin_iro_sansserif' | |
| 443 | - | |
| 503 | + name: 'Lato', | |
| 504 | + slug: "'Lato', sans-serif" | |
| 444 | 505 | }, |
| 445 | 506 | { |
| 446 | - name : 'GN-Koharuiro_Sunray', | |
| 447 | - slug : 'gn_koharuiro_sunray' | |
| 448 | - | |
| 507 | + name: 'Slabo 27px', | |
| 508 | + slug: "'Slabo 27px', serif" | |
| 449 | 509 | }, |
| 450 | 510 | { |
| 451 | - name : 'GN-Kyu-pin', | |
| 452 | - slug : 'gn_kyu_pin' | |
| 511 | + name: 'Oswald', | |
| 512 | + slug: "'Oswald', sans-serif" | |
| 453 | 513 | }, |
| 454 | 514 | { |
| 455 | - name : 'gn_natsu_iro_schedule', | |
| 456 | - slug : 'gn_natsu_iro_schedule' | |
| 457 | - | |
| 515 | + name: 'Yrsa', | |
| 516 | + slug: "'Yrsa', serif" | |
| 458 | 517 | }, |
| 459 | 518 | { |
| 460 | - name : 'gnkana_kiniro_sansserif_l', | |
| 461 | - slug : 'gnkana_kiniro_sansserif_l' | |
| 462 | - | |
| 519 | + name: 'Source Sans Pro', | |
| 520 | + slug: "'Source Sans Pro', sans-serif" | |
| 463 | 521 | }, |
| 464 | 522 | { |
| 465 | - name : 'gnkana_kiniro_sansserif_st', | |
| 466 | - slug : 'gnkana_kiniro_sansserif_st' | |
| 523 | + name: 'Montserrat', | |
| 524 | + slug: "'Montserrat', sans-serif" | |
| 467 | 525 | }, |
| 468 | 526 | { |
| 469 | - name : 'gnkana_kon_iro_nightfall', | |
| 470 | - slug : 'gnkana_kon_iro_nightfall' | |
| 471 | - | |
| 527 | + name: 'Raleway', | |
| 528 | + slug: "'Raleway', sans-serif" | |
| 472 | 529 | }, |
| 473 | 530 | { |
| 474 | - name : 'ms_gothic', | |
| 475 | - slug : 'ms_gothic' | |
| 476 | - | |
| 531 | + name: 'Merriweather', | |
| 532 | + slug: "'Merriweather', serif" | |
| 477 | 533 | }, |
| 478 | 534 | { |
| 479 | - name : 'msmincho', | |
| 480 | - slug : 'msmincho' | |
| 535 | + name: 'Open Sans Condensed', | |
| 536 | + slug: "'Open Sans Condensed', sans-serif" | |
| 481 | 537 | }, |
| 482 | 538 | { |
| 483 | - name : 'ufonts_com_ms_pgothic', | |
| 484 | - slug : 'ufonts_com_ms_pgothic' | |
| 539 | + name: 'Maitree', | |
| 540 | + slug: "'Maitree', serif" | |
| 541 | + }, | |
| 542 | + { | |
| 543 | + name: 'Lora', | |
| 544 | + slug: "'Lora', serif" | |
| 545 | + }, | |
| 546 | + { | |
| 547 | + name: 'Playfair Display', | |
| 548 | + slug: "'Playfair Display', serif" | |
| 549 | + }, | |
| 550 | + { | |
| 551 | + name: 'Noto Sans', | |
| 552 | + slug: "''Noto Sans', sans-serif', sans-serif" | |
| 553 | + }, | |
| 554 | + { | |
| 555 | + name: 'PT Sans Narrow', | |
| 556 | + slug: "'PT Sans Narrow', sans-serif" | |
| 557 | + }, | |
| 558 | + { | |
| 559 | + name: 'Titillium Web', | |
| 560 | + slug: "'Titillium Web', sans-serif" | |
| 561 | + }, | |
| 562 | + { | |
| 563 | + name: 'Muli', | |
| 564 | + slug: "'Muli', sans-serif" | |
| 565 | + }, | |
| 566 | + { | |
| 567 | + name: 'Inconsolata', | |
| 568 | + slug: "'Inconsolata', monospace" | |
| 569 | + }, | |
| 570 | + { | |
| 571 | + name: 'Indie Flower', | |
| 572 | + slug: "'Indie Flower', cursive" | |
| 573 | + }, | |
| 574 | + { | |
| 575 | + name: 'Bitter', | |
| 576 | + slug: "'Bitter', serif" | |
| 577 | + }, | |
| 578 | + { | |
| 579 | + name: 'Dosis', | |
| 580 | + slug: "'Dosis', sans-serif" | |
| 581 | + }, | |
| 582 | + { | |
| 583 | + name: 'Oxygen', | |
| 584 | + slug: "'Oxygen', sans-serif" | |
| 585 | + }, | |
| 586 | + { | |
| 587 | + name: 'Hind', | |
| 588 | + slug: "'Hind', sans-serif" | |
| 589 | + }, | |
| 590 | + { | |
| 591 | + name: 'Tillana', | |
| 592 | + slug: "'Tillana', cursive" | |
| 593 | + }, | |
| 594 | + { | |
| 595 | + name: 'Fjalla One', | |
| 596 | + slug: "'Fjalla One', sans-serif" | |
| 597 | + }, | |
| 598 | + { | |
| 599 | + name: 'Cabin', | |
| 600 | + slug: "'Cabin', sans-serif" | |
| 601 | + }, | |
| 602 | + { | |
| 603 | + name: 'Nunito', | |
| 604 | + slug: "'Nunito', sans-serif" | |
| 605 | + }, | |
| 606 | + { | |
| 607 | + name: 'Anton', | |
| 608 | + slug: "'Anton', sans-serif" | |
| 609 | + }, | |
| 610 | + { | |
| 611 | + name: 'Lobster', | |
| 612 | + slug: "'Lobster', cursive" | |
| 613 | + }, | |
| 614 | + { | |
| 615 | + name: 'Yanone Kaffeesatz', | |
| 616 | + slug: "'Yanone Kaffeesatz', sans-serif" | |
| 617 | + }, | |
| 618 | + { | |
| 619 | + name: 'Reem Kufi', | |
| 620 | + slug: "'Reem Kufi', sans-serif" | |
| 621 | + }, | |
| 622 | + { | |
| 623 | + name: 'Merriweather Sans', | |
| 624 | + slug: "'Merriweather Sans', sans-serif" | |
| 625 | + }, | |
| 626 | + { | |
| 627 | + name: 'Bree Serif', | |
| 628 | + slug: "'Bree Serif', serif" | |
| 629 | + }, | |
| 630 | + { | |
| 631 | + name: 'Josefin Sans', | |
| 632 | + slug: "'Josefin Sans', sans-serif" | |
| 633 | + }, | |
| 634 | + { | |
| 635 | + name: 'Abel', | |
| 636 | + slug: "'Abel', sans-serif" | |
| 637 | + }, | |
| 638 | + { | |
| 639 | + name: 'Crimson Text', | |
| 640 | + slug: "'Crimson Text', serif" | |
| 641 | + }, | |
| 642 | + { | |
| 643 | + name: 'Gloria Hallelujah', | |
| 644 | + slug: "'Gloria Hallelujah', cursive" | |
| 645 | + }, | |
| 646 | + { | |
| 647 | + name: 'Bungee Inline', | |
| 648 | + slug: "'Bungee Inline', cursive" | |
| 649 | + }, | |
| 650 | + { | |
| 651 | + name: 'Amatic SC', | |
| 652 | + slug: "'Amatic SC', cursive" | |
| 653 | + }, | |
| 654 | + { | |
| 655 | + name: 'Shadows Into Light', | |
| 656 | + slug: "'Shadows Into Light', cursive" | |
| 657 | + }, | |
| 658 | + { | |
| 659 | + name: 'Dancing Script', | |
| 660 | + slug: "'Dancing Script', cursive" | |
| 661 | + }, | |
| 662 | + { | |
| 663 | + name: 'Orbitron', | |
| 664 | + slug: "'Orbitron', sans-serif" | |
| 665 | + }, | |
| 666 | + { | |
| 667 | + name: 'Source Code Pro', | |
| 668 | + slug: "'Source Code Pro', monospace" | |
| 669 | + }, | |
| 670 | + { | |
| 671 | + name: 'Permanent Marker', | |
| 672 | + slug: "'Permanent Marker', cursive" | |
| 485 | 673 | } |
| 486 | 674 | ]; |
| 487 | 675 |
app/styles/main.css
| 1 | 1 | /* Space out content a bit */ |
| 2 | 2 | @import "../fonts/font.css"; |
| 3 | -@import "../fonts/font_canvas/font-canvas.css"; | |
| 3 | +/*@import "../fonts/font_canvas/font-canvas.css";*/ | |
| 4 | +@import url('https://fonts.googleapis.com/css?family=Abel|Amatic+SC|Anton|Aref+Ruqaa|Bitter|Bree+Serif|Bungee|Bungee+Inline|Cabin|Crimson+Text|Dancing+Script|Dosis|Fjalla+One|Gloria+Hallelujah|Hind|Inconsolata|Indie+Flower|Josefin+Sans|Lato|Lobster|Lora|Maitree|Merriweather|Merriweather+Sans|Montserrat|Muli|Noto+Sans|Nunito|Open+Sans|Open+Sans+Condensed:300|Orbitron|Oswald|Oxygen|PT+Sans+Narrow|Permanent+Marker|Playfair+Display|Raleway|Reem+Kufi|Roboto|Shadows+Into+Light|Slabo+27px|Source+Code+Pro|Source+Sans+Pro|Tillana|Titillium+Web|Yanone+Kaffeesatz|Yrsa'); | |
| 4 | 5 | @import "placedesign.css"; |
| 5 | 6 | html{ |
| 6 | 7 | height:100%; |