diff --git a/app/scripts/controllers/main.js b/app/scripts/controllers/main.js index b3645d8..922993f 100644 --- a/app/scripts/controllers/main.js +++ b/app/scripts/controllers/main.js @@ -20,6 +20,7 @@ define(['app'], function (app) { $scope.tShirtImgFront = $scope.tShirtColor[tShirtColorFirstKey].img.front; $scope.tShirtImgBack = $scope.tShirtColor[tShirtColorFirstKey].img.back; $scope.tShirtImg = $scope.tShirtImgFront; + //review design set position function setSizePreViewDesign() { diff --git a/app/scripts/controllers/tshirtdesign.js b/app/scripts/controllers/tshirtdesign.js index f901459..9dd9428 100644 --- a/app/scripts/controllers/tshirtdesign.js +++ b/app/scripts/controllers/tshirtdesign.js @@ -465,7 +465,8 @@ define(['app'], function (app) { fontWeight: 'normal', textAlign: 'center', fontSize: 28, - fill: 'black' + fill: 'black', + editable: false }); } else { if(currentObj.type != 'i-text') { @@ -476,7 +477,8 @@ define(['app'], function (app) { fontWeight: 'normal', textAlign: 'center', fontSize: 28, - fill: 'black' + fill: 'black', + editable: false }); } else{ $scope.iText = currentObj; @@ -516,18 +518,9 @@ define(['app'], function (app) { else if (spacingNum >= -30){ spacingNum = spacingNum - 30; } - currentObj.set('charSpacing', spacingNum); - canvas.renderAll(); - canvas.setActiveObject(currentObj); - } - } - }; + if(e == 'default') + spacingNum = 0; - $scope.setLetterSpacingTextDefault = function() { - if(canvas.getActiveObject()) { - var currentObj = canvas.getActiveObject(); - if(currentObj.type == 'i-text') { - spacingNum = 0; currentObj.set('charSpacing', spacingNum); canvas.renderAll(); canvas.setActiveObject(currentObj); diff --git a/app/styles/main.css b/app/styles/main.css index 94fa35a..0b0c65c 100644 --- a/app/styles/main.css +++ b/app/styles/main.css @@ -820,10 +820,11 @@ footer ul.nav-footer li a{ top: 110px; } } +@media (max-width: 762px) and (min-width: 600px) { +} @media (max-width: 762px) { .modal-dialog{ - /*width: 100%!important;*/ margin: 0 0!important; } #tshirt-design header .menu-nav{ @@ -834,7 +835,6 @@ footer ul.nav-footer li a{ #tshirt-design header ul.nav { text-align: justify; width: 680px; - } #tshirt-design header ul.nav li { diff --git a/app/views/design_part/text.html b/app/views/design_part/text.html index cd3c97f..d9e7096 100644 --- a/app/views/design_part/text.html +++ b/app/views/design_part/text.html @@ -22,7 +22,7 @@