Commit 83f7186e9d9f6f1d5acb32e4dbe93c10362c779c
1 parent
c674a36080
Exists in
master
and in
1 other branch
fix bug reponsive
Showing 4 changed files with 10 additions and 16 deletions Side-by-side Diff
app/scripts/controllers/main.js
| ... | ... | @@ -20,6 +20,7 @@ |
| 20 | 20 | $scope.tShirtImgFront = $scope.tShirtColor[tShirtColorFirstKey].img.front; |
| 21 | 21 | $scope.tShirtImgBack = $scope.tShirtColor[tShirtColorFirstKey].img.back; |
| 22 | 22 | $scope.tShirtImg = $scope.tShirtImgFront; |
| 23 | + | |
| 23 | 24 | |
| 24 | 25 | //review design set position |
| 25 | 26 | function setSizePreViewDesign() { |
app/scripts/controllers/tshirtdesign.js
| ... | ... | @@ -465,7 +465,8 @@ |
| 465 | 465 | fontWeight: 'normal', |
| 466 | 466 | textAlign: 'center', |
| 467 | 467 | fontSize: 28, |
| 468 | - fill: 'black' | |
| 468 | + fill: 'black', | |
| 469 | + editable: false | |
| 469 | 470 | }); |
| 470 | 471 | } else { |
| 471 | 472 | if(currentObj.type != 'i-text') { |
| ... | ... | @@ -476,7 +477,8 @@ |
| 476 | 477 | fontWeight: 'normal', |
| 477 | 478 | textAlign: 'center', |
| 478 | 479 | fontSize: 28, |
| 479 | - fill: 'black' | |
| 480 | + fill: 'black', | |
| 481 | + editable: false | |
| 480 | 482 | }); |
| 481 | 483 | } else{ |
| 482 | 484 | $scope.iText = currentObj; |
| 483 | 485 | |
| ... | ... | @@ -516,18 +518,9 @@ |
| 516 | 518 | else if (spacingNum >= -30){ |
| 517 | 519 | spacingNum = spacingNum - 30; |
| 518 | 520 | } |
| 519 | - currentObj.set('charSpacing', spacingNum); | |
| 520 | - canvas.renderAll(); | |
| 521 | - canvas.setActiveObject(currentObj); | |
| 522 | - } | |
| 523 | - } | |
| 524 | - }; | |
| 521 | + if(e == 'default') | |
| 522 | + spacingNum = 0; | |
| 525 | 523 | |
| 526 | - $scope.setLetterSpacingTextDefault = function() { | |
| 527 | - if(canvas.getActiveObject()) { | |
| 528 | - var currentObj = canvas.getActiveObject(); | |
| 529 | - if(currentObj.type == 'i-text') { | |
| 530 | - spacingNum = 0; | |
| 531 | 524 | currentObj.set('charSpacing', spacingNum); |
| 532 | 525 | canvas.renderAll(); |
| 533 | 526 | canvas.setActiveObject(currentObj); |
app/styles/main.css
| ... | ... | @@ -820,10 +820,11 @@ |
| 820 | 820 | top: 110px; |
| 821 | 821 | } |
| 822 | 822 | } |
| 823 | +@media (max-width: 762px) and (min-width: 600px) { | |
| 823 | 824 | |
| 825 | +} | |
| 824 | 826 | @media (max-width: 762px) { |
| 825 | 827 | .modal-dialog{ |
| 826 | - /*width: 100%!important;*/ | |
| 827 | 828 | margin: 0 0!important; |
| 828 | 829 | } |
| 829 | 830 | #tshirt-design header .menu-nav{ |
| ... | ... | @@ -834,7 +835,6 @@ |
| 834 | 835 | #tshirt-design header ul.nav { |
| 835 | 836 | text-align: justify; |
| 836 | 837 | width: 680px; |
| 837 | - | |
| 838 | 838 | } |
| 839 | 839 | |
| 840 | 840 | #tshirt-design header ul.nav li { |
app/views/design_part/text.html
| ... | ... | @@ -22,7 +22,7 @@ |
| 22 | 22 | <div class="item item-plus" ng-click="setLetterSpacingText('plus')"> |
| 23 | 23 | <i class="fa fa-plus-square-o" aria-hidden="true"></i> |
| 24 | 24 | </div> |
| 25 | - <div class="item item-text" style="cursor: pointer" ng-click="setLetterSpacingTextDefault()"> | |
| 25 | + <div class="item item-text" style="cursor: pointer" ng-click="setLetterSpacingText('default')"> | |
| 26 | 26 | リセット |
| 27 | 27 | </div> |
| 28 | 28 | <div class="item item-minus" ng-click="setLetterSpacingText('minus')"> |