ngohungcuong.windy@gmail.com / T-Shats Frontend

Browse Code »

Commit aff3eb043c4767e889cf95ba1ffa596fdaeb60ab

Authored by TRUONG 2016-11-15 14:06:54 +0900

1 parent b0bc7eb37a

Exists in master and in 1 other branch

update illustration interactive

Showing 4 changed files with 143 additions and 49 deletions Inline Diff

app/index.html
app/scripts/controllers/tshirtdesign.js
app/styles/main.css
app/views/tshirt-design.html

app/index.html

Diff comments View file @ aff3eb0

1	<!doctype html>	1	<!doctype html>
2	<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" id="ng-app" ng-app=""> <![endif]-->	2	<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" id="ng-app" ng-app=""> <![endif]-->
3	<!--[if IE 8]> <html class="no-js lt-ie9" id="ng-app" ng-app=""> <![endif]-->	3	<!--[if IE 8]> <html class="no-js lt-ie9" id="ng-app" ng-app=""> <![endif]-->
4	<!--[if gt IE 8]><!--> <html class="no-js" ng-app> <!--<![endif]-->	4	<!--[if gt IE 8]><!--> <html class="no-js" ng-app> <!--<![endif]-->
5	<head>	5	<head>
6	<meta charset="utf-8">	6	<meta charset="utf-8">
7	<meta http-equiv="X-UA-Compatible" content="IE=edge">	7	<meta http-equiv="X-UA-Compatible" content="IE=edge">
8	<title></title>	8	<title></title>
9	<meta name="description" content="">	9	<meta name="description" content="">
10	<meta name="viewport" content="width=device-width">	10	<meta name="viewport" content="width=device-width">
11	<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->	11	<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
12	<!-- build:css styles/vendor.css -->	12	<!-- build:css styles/vendor.css -->
13	<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" />	13	<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" />
14	<link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css" />	14	<link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css" />
15	<link rel="stylesheet" href="bower_components/select2/select2.css">	15	<link rel="stylesheet" href="bower_components/select2/select2.css">
16	<!-- bower:css -->	16	<!-- bower:css -->
17	<!-- endbower -->	17	<!-- endbower -->
18	<!-- endbuild -->	18	<!-- endbuild -->
19	<!-- build:css({.tmp,app}) styles/main.css -->	19	<!-- build:css({.tmp,app}) styles/main.css -->
20	<link rel="stylesheet" href="styles/main.css">	20	<link rel="stylesheet" href="styles/main.css">
21	<!-- endbuild -->	21	<!-- endbuild -->
22	</head>	22	</head>
23	<body ng-app="tshatsApp">	23	<body ng-app="tshatsApp">
24	<!--[if lt IE 7]>	24	<!--[if lt IE 7]>
25	<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>	25	<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
26	<![endif]-->	26	<![endif]-->
27		27
28	<!-- Add your site or application content here -->	28	<!-- Add your site or application content here -->
29	<div class="container" ng-view></div>	29	<div class="container" ng-view></div>
30		30
31	<!-- Google Analytics: change UA-XXXXX-X to be your site's ID -->	31	<!-- Google Analytics: change UA-XXXXX-X to be your site's ID -->
32	<script>	32	<script>
33	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]\|\|function(){	33	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]\|\|function(){
34	(i[r].q=i[r].q\|\|[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),	34	(i[r].q=i[r].q\|\|[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
35	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)	35	m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
36	})(window,document,'script','//www.google-analytics.com/analytics.js','ga');	36	})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
37		37
38	ga('create', 'UA-XXXXX-X');	38	ga('create', 'UA-XXXXX-X');
39	ga('send', 'pageview');	39	ga('send', 'pageview');
40	</script>	40	</script>
41	<script type="text/javascript" src="bower_components/jquery/dist/jquery.min.js"></script>	41	<script type="text/javascript" src="bower_components/jquery/dist/jquery.min.js"></script>
42	<script type="text/javascript" src="bower_components/fabric.js/dist/fabric.min.js"></script>	42	<script type="text/javascript" src="bower_components/fabric.js/dist/fabric.min.js"></script>
43	<script type="text/javascript" src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>	43	<script type="text/javascript" src="bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
44	<!--[if lt IE 9]>	44	<!--[if lt IE 9]>
45	<script src="bower_components/es5-shim/es5-shim.js"></script>	45	<script src="bower_components/es5-shim/es5-shim.js"></script>
46	<script src="bower_components/json3/lib/json3.min.js"></script>	46	<script src="bower_components/json3/lib/json3.min.js"></script>
47	<![endif]-->	47	<![endif]-->
48	<script type="text/javascript">	48	<script type="text/javascript">
49	var VERSION = '13-11_01';	49	var VERSION = new Date().getTime();
50	var require = {	50	var require = {
51	urlArgs: "ver="+VERSION,	51	urlArgs: "ver="+VERSION,
52	};	52	};
53	</script>	53	</script>
54	<script src="bower_components/requirejs/require.js" data-main="scripts/main"></script>	54	<script src="bower_components/requirejs/require.js" data-main="scripts/main"></script>
55	</body>	55	</body>
56	</html>	56	</html>
57		57

app/scripts/controllers/tshirtdesign.js

Diff comments View file @ aff3eb0

1	define(['app'], function (app) {	1	define(['app'], function (app) {
2	'use strict';	2	'use strict';
3		3
4	app.controller('TshirtdesignCtrl', function ($scope, $rootScope, $illustration) {	4	app.controller('TshirtdesignCtrl', function ($scope, $rootScope, $illustration) {
5		5
6	var canvas = new fabric.Canvas('main-design-container');	6	var canvas = new fabric.Canvas('main-design-container');
7	fabric.Object.prototype.transparentCorners = false;	7	fabric.Object.prototype.transparentCorners = false;
8		8
9	canvas.on('after:render', function() {	9	canvas.on('after:render', function() {
10	});	10	});
11	canvas.on({	11	canvas.on({
		12	'object:added': onIllustrationAdded,
12	'object:moving': onIllustrationChange,	13	'object:moving': onIllustrationChange,
13	'object:scaling': onIllustrationChange,	14	'object:scaling': onIllustrationChange,
14	'object:rotating': onIllustrationChange,	15	'object:rotating': onIllustrationChange,
15	'object:selected': onllustrationSelected,	16	'object:selected': onllustrationSelected,
		17	'object:modified': onllustrationModifield
16	});	18	});
		19
		20	var currentObj;
		21	var listObj = [];
		22	var stateObj = [];
		23	var indexCurr = 0;
		24	var indexCurr2 = 0;
		25	var actionObj = false;
		26	var refreshObj = true;
		27
		28	function onIllustrationAdded(options){
		29	var object = options.target;
		30	console.log('object:added');
		31
		32	if (actionObj === true) {
		33	stateObj = [stateObj[indexCurr2]];
		34	listObj = [listObj[indexCurr2]];
		35
		36	actionObj = false;
		37	console.log(stateObj);
		38	indexCurr = 1;
		39	}
		40	object.saveState();
		41
		42	console.log(object.originalState);
		43	stateObj[indexCurr] = JSON.stringify(object.originalState);
		44	listObj[indexCurr] = object;
		45	indexCurr++;
		46	indexCurr2 = indexCurr - 1;
		47	refreshObj = true;
		48	}
		49
		50	function onllustrationModifield(options){
		51	var objOffset = canvas.getActiveObject().getBoundingRect();
		52	var cH = canvas.height, cW = canvas.width, H0 = 50, W0 = 50;
		53	console.log(objOffset,canvas.height,canvas.width);
		54	if (objOffset.left<W0-objOffset.width \|\| objOffset.left>cW-W0 \|\| objOffset.top<H0-objOffset.height \|\| objOffset.top>cH-H0){
		55	if (confirm('削除してもよろしいですか')){
		56	canvas.getActiveObject().remove();
		57	}else{
		58	undoCanvas();
		59	return;
		60	}
		61	}
		62
		63	var object = options.target;
		64	console.log('object:modified');
		65	if (actionObj === true) {
		66	stateObj = [stateObj[indexCurr2]];
		67	listObj = [listObj[indexCurr2]];
		68
		69	actionObj = false;
		70	console.log(stateObj);
		71	indexCurr = 1;
		72	}
		73
		74	object.saveState();
		75
		76	stateObj[indexCurr] = JSON.stringify(object.originalState);
		77	listObj[indexCurr] = object;
		78	indexCurr++;
		79	indexCurr2 = indexCurr - 1;
		80	console.log(stateObj);
		81	refreshObj = true;
		82	}
		83
17	function onIllustrationChange(options) {	84	function onIllustrationChange(options) {
18	// options.target.setCoords();	85	// options.target.setCoords();
19	// canvas.forEachObject(function(obj) {	86	// canvas.forEachObject(function(obj) {
20	// if (obj === options.target) return;	87	// if (obj === options.target) return;
21	// obj.setOpacity(options.target.intersectsWithObject(obj) ? 0.5 : 1);	88	// obj.setOpacity(options.target.intersectsWithObject(obj) ? 0.5 : 1);
22	// });	89	// });
23	}	90	}
24		91
25	$scope.currentObject = null;
26	function onllustrationSelected(options){	92	function onllustrationSelected(options){
27	$scope.currentObject = canvas.getActiveObject();	93	//console.log(canvas.getActiveObject());
28	console.log(canvas.getActiveObject());
29	}	94	}
		95
		96	function undoCanvas() {
		97	if (indexCurr <= 0) {
		98	indexCurr = 0;
		99	return;
		100	}
		101
		102	if (refreshObj === true) {
		103	indexCurr--;
		104	refreshObj = false;
		105	}
		106
		107	console.log('undo');
		108
		109	indexCurr2 = indexCurr - 1;
		110	currentObj = listObj[indexCurr2];
		111	if (currentObj){
		112	currentObj.setOptions(JSON.parse(indexCurr[indexCurr2]));
		113	}
		114
		115	indexCurr--;
		116	currentObj.setCoords();
		117	canvas.renderAll();
		118	actionObj = true;
		119	}
		120
		121	function redoCanvas() {
		122	actionObj = true;
		123	if (indexCurr >= stateObj.length - 1) {
		124	return;
		125	}
		126
		127	console.log('redo');
		128
		129	indexCurr2 = indexCurr + 1;
		130	currentObj = listObj[indexCurr2];
		131	currentObj.setOptions(JSON.parse(indexCurr[indexCurr2]));
		132
		133	indexCurr++;
		134	currentObj.setCoords();
		135	canvas.renderAll();
		136	}
30		137
31	// Illustration process	138	// Illustration process
32	$scope.changeIllustrationCategory = function(currentIllustration){	139	$scope.changeIllustrationCategory = function(currentIllustration){
33	$scope.currentIllustrationCate = $illustration.getList(currentIllustration);	140	$scope.currentIllustrationCate = $illustration.getList(currentIllustration);
34	console.log($scope.currentIllustrationCate);	141	console.log($scope.currentIllustrationCate);
35	};	142	};
36		143
37	$scope.insertSvg = function(item){	144	$scope.insertSvg = function(item){
38	fabric.loadSVGFromURL(item.path, function(objects, options) {	145	fabric.loadSVGFromURL(item.path, function(objects, options) {
39	var shape = fabric.util.groupSVGElements(objects, options);	146	var shape = fabric.util.groupSVGElements(objects, options);
40	// shape.setFill('green');	147	// shape.setFill('green');
41	canvas.add(shape.scale(0.6));	148	canvas.add(shape.scale(0.6));
42	shape.set({ left: 150, top: 200 }).setCoords();	149	shape.set({ left: 150, top: 200 }).setCoords();
43	canvas.renderAll();	150	canvas.renderAll();
44	canvas.setActiveObject(shape);	151	canvas.setActiveObject(shape);
45	});	152	});
46	};	153	};
47		154
48	// color pattern	155	// color pattern
49	$scope.changeColorPattern = function(color){	156	$scope.changeColorPattern = function(color){
50	canvas.getActiveObject().set("fill", color);	157	if (canvas.getActiveObject()){
51	canvas.renderAll();	158	canvas.getActiveObject().set("fill", color);
		159	canvas.renderAll();
		160	}
52	};	161	};
53	$scope.listColorPatterns = [	162	$scope.listColorPatterns = [
54	'#000000',	163	'#000000','#ffff00','#ff6600','#ff0000','#ff6262','#ffa19c','#ff9933','#c45d01','#5d2b03','#ffffcc',
55	'#ffff00',	164	'#ffff99','#ffd500','#c0db50','#21a52a','#00663f','#abfcab','#36ffaa','#89eaea','#00938c','#005450',
56	'#ff6600',	165	'#0badff','#006cff','#839aff','#0410a0','#ffb2ff','#f93fff','#6600ca','#ff6699','#999999','#666666',
57	'#ff0000',	166	'#333333'
58	'#ff6262',
59	'#ffa19c',
60	'#ff9933',
61	'#c45d01',
62	'#5d2b03',
63	'#ffffcc',
64	'#000000',
65	'#ffff00',
66	'#ff6600',
67	'#ff0000',
68	'#ff6262',
69	'#ffa19c',
70	'#ff9933',
71	'#c45d01',

app/styles/main.css

Diff comments View file @ aff3eb0

 /* Space out content a bit */
 @import "../fonts/font.css";
 body {
   font-family: 'Hiragino Kaku Gothic Pro', sans-serif;
 }
 .padding-right-0{
   padding-right: 0!important;
 }
 .padding-left-0{
   padding-left: 0!important;
 }
 button.red{
   color: #ffffff;
   background-color: #ff0000;
   border: 1px solid #ff0000;
 }
 button.white{
   border: 1px solid #ff8080;
   color: #ff8080;
   background-color: #ffffff;
 }
 button.brown{
   background-color: #666666;
   border: 1px solid #666666;
   color: #ffffff;
   border-radius: 5px;
 }
 button.black{
   border: 1px solid #c9c9c9;
   background-color: #343434;
   color: #ffffff;
   padding: 1px 6px;
 }
 #tshirt-container{
   border-left: 1px solid #dcdcdc;
   border-right: 1px solid #dcdcdc;
 }
 /*HEADER*/
 header{
   border-bottom: 1px solid #dcdcdc;
 }
 header .logo{
   color: #ed1d24;
   font-size: 30px;
   text-transform: uppercase;
   font-weight: bold;
 }
 header .logo img{
   width: 60px;
 }
 /*NAVIGATION*/
 nav{
   border-bottom: 1px solid #dcdcdc;
   padding: 10px 0;
 }
 nav h2{
   font-size: 27px;
   margin: 0 0;
 }
 nav ul{
   list-style: none;
   padding-left: 0;
   margin-bottom: 0;
 }
 nav ul li{
   margin-left: 2px;
   float: left;
   padding: 6px 12px;
   background-color: #999999;
   position: relative;
 }
 nav ul li i.fa{
   position: absolute;
   color: #ffffff;
   font-size: 18px;
   right: -4px;
   top: 50%;
   transform: translateX(-50%) translateY(-50%);
   -webkit-transform: translateX(-50%) translateY(-50%);
 }
 nav ul li a{
   color: #ffffff;
 }
 nav ul li:hover a{
   text-decoration: none;
   color: #ffffff;
 }
 nav ul li.action{
   color: #ffffff;
   background-color: #ed1d24;
 }
 /*ASIDE*/
 aside{
   margin: 10px 0;
 }
 aside .break-down{
   padding: 0 0;
 }
 aside .break-down i.fa{
   font-size: 35px;
   color: #ff0000;
 }
 aside .break-line{
   height: 10px;
 }
 aside .break-line hr{
   border-top: 1px dotted #cccccc;
 }
 aside .step{
   margin: 0 0;
 }
 aside .step .title{
   font-size: 15px;
   line-height: 16px;
   font-weight: bold;
   margin-bottom: 3px;
 }
 aside .step .title-notice{
   font-size: 13px;
   line-height: 16px;
   margin-bottom: 3px;
 }
 aside .step .title-notice .require{
   font-size: 10px;
 }
 aside .step .step-box{
   border: 2px solid #dcdcdc;
   font-size: 12px;
 }
 /*Step 1*/
 aside .step .step-box .tshirt-design{
   border: 1px solid #cccccc;
   background-color: #f5f5f5;
   margin: 10px 10px;
 }
 aside .step .step-box .tshirt-design:hover{
   border: 1px solid #ff0000;
 }
 aside .step .step-box .tshirt-design button:hover{
   background-color: #fa7b7b;
   border: 1px solid #fa7b7b;
 }
 aside .step .step-box .tshirt-design div{
   float: left;
 }
 aside .step .step-box .tshirt-design .icon{
   padding: 4px 4px;
   border-right: 1px solid #cccccc;
 }
 aside .step .step-box .tshirt-design .icon img{
   height: 50px;
 }
 aside .step .step-box .tshirt-design .name{
   padding: 10px 10px;
 }
 aside .step .step-box .tshirt-design .action{
   padding: 10px 10px;
   float: right;
 }
 aside .step .step-box .tshirt-design .action button{
   padding: 8px 10px;
 }
 /*Step 2*/
 aside .step .step-box .tshirt-color{
   padding: 6px 10px;
   position: relative;
 }
 aside .step .step-box .tshirt-color ul.choice-color{
   float: left;
   list-style: none;
   padding-left: 0;
   width: 100%;
   margin-bottom: 3px;
 }
 aside .step .step-box .tshirt-color ul.choice-color li{
   margin: 0 10px 0 0;
   border: 1px solid #cccccc;
   padding: 2px 2px;
   float: left;
   cursor: pointer;
 }
 aside .step .step-box .tshirt-color ul.choice-color li.action{
   border: 1px solid #ff0000;
 }
 aside .step .step-box .tshirt-color ul.choice-color li:hover{
   border: 1px solid #ff0000;
 }
 aside .step .step-box .tshirt-color ul.choice-color li div{
   height: 30px;
   width: 30px;
 }
 aside .step .step-box .tshirt-color ul.choice-color li.white div{
   background-color: #ece7e4;
 }
 aside .step .step-box .tshirt-color ul.choice-color li.blue div{
   background-color: #e7dfd0;
 }
 aside .step .step-box .tshirt-color .color-name{
   width: 100%;
   font-size: 10px;
 }
 aside .step .step-box .tshirt-color .view-more{
   position: absolute;
   bottom: 6px;
   right: 10px;
 }
 /*Step 3*/
 aside .step .step-box .tshirt-saveorder{
   padding: 10px 10px 6px 10px;
 }
 aside .step .step-box .tshirt-saveorder .action{
   width: 50%;
   float: left;
 }
 aside .step .step-box .tshirt-saveorder .action:first-child{
   padding-right: 5px;
 }
 aside .step .step-box .tshirt-saveorder .action:last-child{
   padding-left: 5px;
 }
 aside .step .step-box .tshirt-saveorder .action button{
   padding: 8px 10px;
 }
 aside .step .step-box .tshirt-saveorder .action button .text{
   float: left;
   width: 80%;
   text-align: center;
   padding-left: 10px;
   vertical-align: bottom;
 }
 aside .step .step-box .tshirt-saveorder .action button .arrow{
   float: left;
   width: 20%;
   height: 40px;
   position: relative;
 }
 aside .step .step-box .tshirt-saveorder .action button .arrow i.fa{
   position: absolute;
   top: 50%;
   right: -6px;
   transform: translateX(-50%) translateY(-50%);
   -webkit-transform: translateX(-50%) translateY(-50%);
 }
 aside .step .step-box .tshirt-saveorder .notice{
   padding: 5px 0 0 0;
 }
 /*Step 4*/
 aside .step .title-notice{
 }
 aside .step .step-box .change-design{
   padding: 4px 4px;
 }
 aside .step .step-box .change-design table{
 }
 aside .step .step-box .change-design table tr{
   border-bottom: 1px dotted #cccccc;
 }
 aside .step .step-box .change-design table tr:last-child{
   border-bottom: 0;
 }
 /*Step 5- finish*/
 aside .step .finish-design{
   padding: 20px 0;
 }
 aside .step .finish-design button{
   width: 100%;
   padding: 8px 10px;
 }
 /*DESIGN CONTENT*/
 #tshirt-content{
   position: relative;
 }
 #tshirt-content .switch-border-design{
   position: absolute;
   top: 5px;
   right: 10px;
   color: red;
   font-size: 11px;
 }
 #tshirt-content .tshirt-image{
   padding: 20px 0 0 0;
 }
 #tshirt-content .tshirt-choice{
 }
 #tshirt-content .tshirt-choice ul{
   list-style: none;
   padding-left: 0;
   display: table;
   margin: auto;
 }
 #tshirt-content .tshirt-choice ul li{
   float: left;
   margin: 10px 10px;
   cursor: pointer;
 }
 #tshirt-content .tshirt-choice ul li .image{
   border: 1px solid #cccccc;
   padding: 3px 3px;
 }
 #tshirt-content .tshirt-choice ul li.focus{
 }
 #tshirt-content .tshirt-choice ul li.focus .image{
   border: 1px solid #ff0000;
 }
 #tshirt-content .tshirt-choice ul li .image img{
   width: 50px;
   height: auto;
 }
 /*MODAL Design*/
 #tshirt-design{
   background-color: #666666;
 }
 #tshirt-design .modal-dialog{
   width: 75%;
   margin: 0 auto;
 }
 #tshirt-design .modal-dialog .modal-content{
   background-color: transparent;
   border-radius: 0;
   border: 0;
   -webkit-box-shadow: 0 0 0 rgba(0, 0, 0, .5)!important;
   box-shadow: 0 0 0 rgba(0, 0, 0, .5)!important;
 }
 #tshirt-design .modal-dialog .modal-content .modal-header{
   padding: 0 0 10px 0;
   border-bottom: 0;
   border-shadow: none!important;
 }
 #tshirt-design .modal-dialog .modal-content .modal-body{
   background-color: #f5f5f5;
   padding: 0 0;
 }
 #tshirt-design header{
   border-bottom: 1px solid #cccccc;
   background-color: #dddddd;
 }
 #tshirt-design header ul.nav{
   padding-left: 0;
   list-style: none;
 }
 #tshirt-design header ul.nav li{
   float: left;
   padding: 8px 26px;
   border-right: 1px solid #cccccc;
   font-size: 14px;
   cursor: pointer;
 }
 #tshirt-design header ul.nav li:hover, #tshirt-design header ul.nav li.active{
   background-color: red;
   color: #ffffff;
 }
 #tshirt-design header ul.nav li:hover i.fa, #tshirt-design header ul.nav li.active i.fa{
   color: #ffffff;
 }
 #tshirt-design header ul.nav li i.fa{
   color: #fe070f;
   font-size: 20px;
   margin-right: 10px;
 }
 #tshirt-design header .action{
 }
 #tshirt-design header .action button{
   padding: 2px 10px;
   margin: 6px 10px;
 }
 #tshirt-design header .action button:hover{
   background-color: red;
   color: #ffffff;
 }
 /*Aside modal*/
 .aside{
+  padding-left: 0;
 }
 .aside #choice-design-option{
   list-style: none;
   padding-left: 0;
   margin-top: 10px;
 }
 .aside #choice-design-option li{
   border: 1px solid #cdcdcd;
   position: relative;
   cursor: pointer;
 }
 .aside #choice-design-option li .hover{
   background-color: #fddad4;
   opacity: 0.6;
   position: absolute;
   width: 100%;
   height: 100%;
   display: none;
 }
 .aside #choice-design-option li:hover .hover{
   display: block;
 }
 .aside #choice-design-option li .title{
   background: url("../images/bg1.png") repeat #cdcdcd;
   padding: 3px 10px;
 }
 .aside #choice-design-option li .title i.fa{
   color: #000000;
 }
 .aside #choice-design-option li .content{
 }
 .aside #choice-design-option li .content i.fa{
   font-size: 30px;
   color: #fe070f;
   margin: 8px 0;
 }
 .aside #choice-design-option li .content .des{
   padding: 3px 10px 3px 0;
 }
 .aside #choice-illustration{
   list-style: none;
   padding-left: 0;
   margin-top: 10px;
 }
 .aside #choice-illustration li{
-  border: 1px solid #cdcdcd;
+  border: 1px #cdcdcd double;
+  border-radius: 5px;
   position: relative;
+  padding: 5px 10px;
+  margin-bottom: 20px;
 }
 .aside #choice-illustration li .title{
-  background: url("../images/bg1.png") repeat #cdcdcd;
+  /*background: url("../images/bg1.png") repeat #cdcdcd;*/
   padding: 3px 10px;
+  font-size: 13px;
+  color: #ff0f00;
+  font-weight: 600;
 }
 .aside #choice-illustration li .content {
-  padding: 10px 10px;
+  /*padding: 10px 10px;*/
 }
 .aside #choice-illustration li .content select{
   width: 100%;
 }
 .aside #choice-illustration li .content .illustration-list {
   width: 100%;
   border: #bbb solid 1px;
   background: #FFF;
   margin-top: 5px;
 }
 .aside #choice-illustration li .content .illustration-list .illstration-item{
-  height: 65px;
+  height: 61px;
   overflow: hidden;
   float: left;
-  margin-left: 5px;
+  margin-left: 10px;
+  margin-top: 10px;
+  background: #e2e2e2;
+  border: #d7d7d7 solid 1px;
+  padding: 2px;
 }
 .aside #choice-illustration li .content .illustration-list .illstration-item:hover {
   outline: 2px solid #ed1d24;
 }
 .aside #choice-illustration li .content .illustration-list .illstration-item img {
-  width: 62px;
+  width: 53px;
   cursor: pointer;
 }
 .aside #choice-illustration li .content .color-patterns {
   width: 100%;
   border: #bbb solid 1px;
   background: #FFF;
   margin-top: 5px;
 }
 .aside #choice-illustration li .content .color-patterns .color-pattern-item{
   height: 20px;
   float: left;
   margin-left: 4px;
   margin-top: 2px;
   width: 20px;
   cursor: pointer;
   border: 1px solid #ddd;
 }
 .aside #choice-illustration li .content .color-patterns .color-pattern-item:hover {
   outline: 1px solid #ed1d24;
 }
 /*Design content*/
 .tshirt-design-container{
   position: relative;
 }
 .tshirt-design-container .design-content{
   padding: 10px 30px 10px 15px;
 }
 .tshirt-design-container .design-content .content{
   width: 100%;
   min-height: 650px;
   background-color: #f0efea;
   padding: 40px 40px;
   height: 100%;
 }
 .tshirt-design-container .design-content .content .selection-design{
   border: 1px solid #ff0000;
   width: 100%;
   height: 620px;
 }
 .tshirt-design-container .agree-design{
   position: absolute;
   right: -16px;
   top: 40%;
 }
 .tshirt-design-container .trash-design{
   position: absolute;
   right: 5px;
   bottom: 0;
 }
 /*FOOTER*/
 footer{
   background-color: #333333;
 }
 footer ul.nav-footer{
   padding-left: 0;
   list-style: none;
 }
 footer ul.nav-footer li{
   float: left;
   padding: 3px 10px;
   border-right: 1px dotted #ffffff;
 }
 footer ul.nav-footer li a{
   color: #ffffff;
   font-size: 11px;
 }
 /* Customize container */
 @media (min-width: 768px) {
   .container {
     /*max-width: 730px;*/
   }
 }
 /* Responsive: Portrait tablets and up */
 @media screen and (min-width: 768px) {
   /* Remove the padding we set earlier */
 }

app/views/tshirt-design.html

Diff comments View file @ aff3eb0

 <!-- Modal -->
 <div class="modal fade" id="tshirt-design" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" ng-controller="TshirtdesignCtrl">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <button class="black" ng-click="modalClose()"><i class="fa fa-times" aria-hidden="true"></i> キャンセル</button>
                 <button class="black"> <i class="fa fa-angle-right" aria-hidden="true"></i> はじめての方へ</button>
             </div>
             <div class="modal-body">
                 <header class="clearfix">
                     <ul class="nav pull-left">
                         <li ng-class="{'active': isShowLeftPanel=='text'}" ng-click="showIllustration('text')">
                             <i class="fa fa-jpy" aria-hidden="true"></i> 文字
                         </li>
                         <li ng-class="{'active': isShowLeftPanel=='illustration'}" ng-click="showIllustration('illustration')">
                             <i class="fa fa-btc" aria-hidden="true"></i> イラスト・イメージ
                         </li>
                         <li>
                             <i class="fa fa-money" aria-hidden="true"></i> 自分の画像・写真
                         </li>
                         <li>
                             <i class="fa fa-minus-circle" aria-hidden="true"></i> 全消去
                         </li>
                     </ul>
                     <div class="action pull-right">
                         <button class="white">
                             アルバムを開く
                         </button>
                         <button class="white">
                             アルバムに入れる
                         </button>
                     </div>
                 </header>
                 <section class="tshirt-design-container clearfix">
                     <div class="aside col-xs-4">
                         <ul id="choice-design-option" ng-show="isShowLeftPanel=='default'">
                             <li>
                                 <div class="hover"></div>
                                 <div class="title">
                                     <i class="fa fa-chevron-circle-right" aria-hidden="true"></i>
                                     文字を追加
                                 </div>
                                 <div class="content clearfix">
                                     <div class="col-xs-2 text-center">
                                         <i class="fa fa-jpy" aria-hidden="true"></i>
                                     </div>
                                     <div class="col-xs-10 des padding-left-0">
                                         書体を選んでお好きな文字を入力できます
                                     </div>
                                 </div>
                             </li>
                             <li>
                                 <div class="hover"></div>
                                 <div class="title">
                                     <i class="fa fa-chevron-circle-right" aria-hidden="true"></i>
                                     イラストやイメージを追加
                                 </div>
                                 <div class="content clearfix">
                                     <div class="col-xs-2 text-center">
                                         <i class="fa fa-btc" aria-hidden="true"></i>
                                     </div>
                                     <div class="col-xs-10 des padding-left-0">
                                         自由にお使いいただけるデザイン画像をご用意しました
                                     </div>
                                 </div>
                             </li>
                             <li>
                                 <div class="hover"></div>
                                 <div class="title">
                                     <i class="fa fa-chevron-circle-right" aria-hidden="true"></i>
                                     自分の画像・写真を追加
                                 </div>
                                 <div class="content clearfix">
                                     <div class="col-xs-2 text-center">
                                         <i class="fa fa-jpy" aria-hidden="true"></i>
                                     </div>
                                     <div class="col-xs-10 des padding-left-0">
                                         ご自分で用意した画像をアップロードして使えます
                                     </div>
                                 </div>
                             </li>
                             <li>
                                 <div class="hover"></div>
                                 <div class="title">
                                     <i class="fa fa-chevron-circle-right" aria-hidden="true"></i>
                                     おすすめデザインを使う
                                 </div>
                                 <div class="content clearfix">
                                     <div class="col-xs-2 text-center">
                                         <i class="fa fa-jpy" aria-hidden="true"></i>
                                     </div>
                                     <div class="col-xs-10 des padding-left-0">
                                         おすすめデザインデータをご自由にカスタマイズしてお使いください
                                     </div>
                                 </div>
                             </li>
                         </ul>
                         <ul id="choice-illustration" ng-show="isShowLeftPanel=='illustration'">
                             <li>
                                 <div class="hover"></div>
                                 <div class="title">
-                                    <i class="fa fa-chevron-circle-right" aria-hidden="true"></i>
+                                    <!--<i class="fa fa-chevron-circle-right" aria-hidden="true"></i>-->
-                                    items
+                                    イラスト・イメージ選択
                                 </div>
                                 <div class="content clearfix">
                                     <select id="illustration-select-category" ui-select2="illustrationSelectConfig" ng-model="currentIllustration" ng-change="changeIllustrationCategory(currentIllustration)" data-placeholder="Choose category" style="width: 100%">
                                         <option ng-repeat="(key,cate) in IllustrationList" value="{{key}}">{{cate.name}}</option>
                                     </select>
                                     <div class="illustration-list">
                                         <div class="illstration-item" ng-repeat="item in currentIllustrationCate.list" ng-click="insertSvg(item)">
                                             <img ng-src="{{item.path}}"/>
                                         </div>
                                         <div class="clearfix"></div>
                                     </div>
                                 </div>
                             </li>
                             <li>
                                 <div class="hover"></div>
                                 <div class="title">
-                                    <i class="fa fa-chevron-circle-right" aria-hidden="true"></i>
+                                    <!--<i class="fa fa-chevron-circle-right" aria-hidden="true"></i>-->
-                                    Color to fill
+                                    カラー変更
+                                    <div class="pull-right">元の色に戻す</div>
                                 </div>
                                 <div class="content clearfix">
                                     <div class="color-patterns">
                                         <div class="color-pattern-item" ng-repeat="color in listColorPatterns track by $index" ng-click="changeColorPattern(color)" ng-style="{'background-color': color}">
                                         </div>
                                         <div class="clearfix"></div>
                                     </div>
                                 </div>
                             </li>
                             <li>
                                 <div class="hover"></div>
                                 <div class="title">
-                                    <i class="fa fa-chevron-circle-right" aria-hidden="true"></i>
+                                    <!--<i class="fa fa-chevron-circle-right" aria-hidden="true"></i>-->
-                                    Layer option
+                                    重ね順変更
                                 </div>
                                 <div class="content clearfix">
                                 </div>
                             </li>
                         </ul>
                         <!-- Text design-->
                         <ul id="choice-text" ng-show="isShowLeftPanel=='text'" ng-include="'views/design_part/text.html'">
                         </ul>
                     </div>
                     <div class="design-content col-xs-8">
                         <div class="content" ng-style="{'background-color' : tShirtColorCode}">
                             <canvas id="main-design-container" width="510px" height="620px" class="selection-design lower-canvas">
                             </canvas>
                         </div>
                         <div class="agree-design">
                             <img src="images/agree-design.png" alt="agree design" />
                         </div>
                         <div class="trash-design">
                             <img src="images/trash.png" alt="trash design" />
                         </div>
                     </div>
                 </section>
             </div>
         </div>
     </div>
 </div>