Commit 862daa8a4535833a5fc7f8117a102cff51d18d79

Authored by DANG 2016-11-09 23:51:37 +0900

Showing 14 changed files with 448 additions and 472 deletions Side-by-side Diff

.DS_Store

Diff comments   View file @ 862daa8

No preview for this file type

app/.DS_Store

Diff comments   View file @ 862daa8

No preview for this file type

app/bower_components/bootstrap/.bower.json

Diff comments   View file @ 862daa8

1	1	{
2	2	"name": "bootstrap",
3		- "version": "3.0.3",
	3	+ "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
	4	+ "keywords": [
	5	+ "css",
	6	+ "js",
	7	+ "less",
	8	+ "mobile-first",
	9	+ "responsive",
	10	+ "front-end",
	11	+ "framework",
	12	+ "web"
	13	+ ],
	14	+ "homepage": "http://getbootstrap.com",
	15	+ "license": "MIT",
	16	+ "moduleType": "globals",
4	17	"main": [
5		- "./dist/js/bootstrap.js",
6		- "./dist/css/bootstrap.css",
7		- "./dist/fonts/glyphicons-halflings-regular.eot",
8		- "./dist/fonts/glyphicons-halflings-regular.svg",
9		- "./dist/fonts/glyphicons-halflings-regular.ttf",
10		- "./dist/fonts/glyphicons-halflings-regular.woff"
	18	+ "less/bootstrap.less",
	19	+ "dist/js/bootstrap.js"
11	20	],
12	21	"ignore": [
13		- "**/.*",
14		- "_*",
15		- "docs-assets",
16		- "examples",
17		- "/fonts",
18		- "js/tests",
	22	+ "/.*",
	23	+ "_config.yml",
19	24	"CNAME",
20		- "CONTRIBUTING.md",
21		- "Gruntfile.js",
22		- "browserstack.json",
23	25	"composer.json",
24		- "package.json",
25		- "*.html"
	26	+ "CONTRIBUTING.md",
	27	+ "docs",
	28	+ "js/tests",
	29	+ "test-infra"
26	30	],
27	31	"dependencies": {
28		- "jquery": ">= 1.9.0"
	32	+ "jquery": "1.9.1 - 3"
29	33	},
30		- "homepage": "https://github.com/twbs/bootstrap",
31		- "_release": "3.0.3",
	34	+ "version": "3.3.7",
	35	+ "_release": "3.3.7",
32	36	"_resolution": {
33	37	"type": "version",
34		- "tag": "v3.0.3",
35		- "commit": "6d03173a1aad98e75f7d33e65b411c519176c59a"
	38	+ "tag": "v3.3.7",
	39	+ "commit": "0b9c4a4007c44201dce9a6cc1a38407005c26c86"
36	40	},
37	41	"_source": "https://github.com/twbs/bootstrap.git",
38		- "_target": "~3.0.3",
	42	+ "_target": "^3.3.7",
39	43	"_originalSource": "bootstrap"
40	44	}

app/bower_components/bootstrap/LICENSE

Diff comments   View file @ 862daa8

1		- Apache License
2		- Version 2.0, January 2004
3		- http://www.apache.org/licenses/
	1	+The MIT License (MIT)
4	2
5		- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
	3	+Copyright (c) 2011-2016 Twitter, Inc.
6	4
7		- 1. Definitions.
	5	+Permission is hereby granted, free of charge, to any person obtaining a copy
	6	+of this software and associated documentation files (the "Software"), to deal
	7	+in the Software without restriction, including without limitation the rights
	8	+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
	9	+copies of the Software, and to permit persons to whom the Software is
	10	+furnished to do so, subject to the following conditions:
8	11
9		- "License" shall mean the terms and conditions for use, reproduction,
10		- and distribution as defined by Sections 1 through 9 of this document.
	12	+The above copyright notice and this permission notice shall be included in
	13	+all copies or substantial portions of the Software.
11	14
12		- "Licensor" shall mean the copyright owner or entity authorized by
13		- the copyright owner that is granting the License.
14		-
15		- "Legal Entity" shall mean the union of the acting entity and all
16		- other entities that control, are controlled by, or are under common
17		- control with that entity. For the purposes of this definition,
18		- "control" means (i) the power, direct or indirect, to cause the
19		- direction or management of such entity, whether by contract or
20		- otherwise, or (ii) ownership of fifty percent (50%) or more of the
21		- outstanding shares, or (iii) beneficial ownership of such entity.
22		-
23		- "You" (or "Your") shall mean an individual or Legal Entity
24		- exercising permissions granted by this License.
25		-
26		- "Source" form shall mean the preferred form for making modifications,
27		- including but not limited to software source code, documentation
28		- source, and configuration files.
29		-
30		- "Object" form shall mean any form resulting from mechanical
31		- transformation or translation of a Source form, including but
32		- not limited to compiled object code, generated documentation,
33		- and conversions to other media types.
34		-
35		- "Work" shall mean the work of authorship, whether in Source or
36		- Object form, made available under the License, as indicated by a
37		- copyright notice that is included in or attached to the work
38		- (an example is provided in the Appendix below).
39		-
40		- "Derivative Works" shall mean any work, whether in Source or Object
41		- form, that is based on (or derived from) the Work and for which the
42		- editorial revisions, annotations, elaborations, or other modifications
43		- represent, as a whole, an original work of authorship. For the purposes
44		- of this License, Derivative Works shall not include works that remain
45		- separable from, or merely link (or bind by name) to the interfaces of,
46		- the Work and Derivative Works thereof.
47		-
48		- "Contribution" shall mean any work of authorship, including
49		- the original version of the Work and any modifications or additions
50		- to that Work or Derivative Works thereof, that is intentionally
51		- submitted to Licensor for inclusion in the Work by the copyright owner
52		- or by an individual or Legal Entity authorized to submit on behalf of
53		- the copyright owner. For the purposes of this definition, "submitted"
54		- means any form of electronic, verbal, or written communication sent
55		- to the Licensor or its representatives, including but not limited to
56		- communication on electronic mailing lists, source code control systems,
57		- and issue tracking systems that are managed by, or on behalf of, the
58		- Licensor for the purpose of discussing and improving the Work, but
59		- excluding communication that is conspicuously marked or otherwise
60		- designated in writing by the copyright owner as "Not a Contribution."
61		-
62		- "Contributor" shall mean Licensor and any individual or Legal Entity
63		- on behalf of whom a Contribution has been received by Licensor and
64		- subsequently incorporated within the Work.
65		-
66		- 2. Grant of Copyright License. Subject to the terms and conditions of
67		- this License, each Contributor hereby grants to You a perpetual,
68		- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69		- copyright license to reproduce, prepare Derivative Works of,
70		- publicly display, publicly perform, sublicense, and distribute the
71		- Work and such Derivative Works in Source or Object form.
72		-
73		- 3. Grant of Patent License. Subject to the terms and conditions of
74		- this License, each Contributor hereby grants to You a perpetual,
75		- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76		- (except as stated in this section) patent license to make, have made,
77		- use, offer to sell, sell, import, and otherwise transfer the Work,
78		- where such license applies only to those patent claims licensable
79		- by such Contributor that are necessarily infringed by their
80		- Contribution(s) alone or by combination of their Contribution(s)
81		- with the Work to which such Contribution(s) was submitted. If You
82		- institute patent litigation against any entity (including a
83		- cross-claim or counterclaim in a lawsuit) alleging that the Work
84		- or a Contribution incorporated within the Work constitutes direct
85		- or contributory patent infringement, then any patent licenses
86		- granted to You under this License for that Work shall terminate
87		- as of the date such litigation is filed.
88		-
89		- 4. Redistribution. You may reproduce and distribute copies of the
90		- Work or Derivative Works thereof in any medium, with or without
91		- modifications, and in Source or Object form, provided that You
92		- meet the following conditions:
93		-
94		- (a) You must give any other recipients of the Work or
95		- Derivative Works a copy of this License; and
96		-
97		- (b) You must cause any modified files to carry prominent notices
98		- stating that You changed the files; and
99		-
100		- (c) You must retain, in the Source form of any Derivative Works
101		- that You distribute, all copyright, patent, trademark, and
102		- attribution notices from the Source form of the Work,
103		- excluding those notices that do not pertain to any part of
104		- the Derivative Works; and
105		-
106		- (d) If the Work includes a "NOTICE" text file as part of its
107		- distribution, then any Derivative Works that You distribute must
108		- include a readable copy of the attribution notices contained
109		- within such NOTICE file, excluding those notices that do not
110		- pertain to any part of the Derivative Works, in at least one
111		- of the following places: within a NOTICE text file distributed
112		- as part of the Derivative Works; within the Source form or
113		- documentation, if provided along with the Derivative Works; or,
114		- within a display generated by the Derivative Works, if and
115		- wherever such third-party notices normally appear. The contents
116		- of the NOTICE file are for informational purposes only and
117		- do not modify the License. You may add Your own attribution
118		- notices within Derivative Works that You distribute, alongside
119		- or as an addendum to the NOTICE text from the Work, provided
120		- that such additional attribution notices cannot be construed
121		- as modifying the License.
122		-
123		- You may add Your own copyright statement to Your modifications and
124		- may provide additional or different license terms and conditions
125		- for use, reproduction, or distribution of Your modifications, or
126		- for any such Derivative Works as a whole, provided Your use,
127		- reproduction, and distribution of the Work otherwise complies with
128		- the conditions stated in this License.
129		-
130		- 5. Submission of Contributions. Unless You explicitly state otherwise,
131		- any Contribution intentionally submitted for inclusion in the Work
132		- by You to the Licensor shall be under the terms and conditions of
133		- this License, without any additional terms or conditions.
134		- Notwithstanding the above, nothing herein shall supersede or modify
135		- the terms of any separate license agreement you may have executed
136		- with Licensor regarding such Contributions.
137		-
138		- 6. Trademarks. This License does not grant permission to use the trade
139		- names, trademarks, service marks, or product names of the Licensor,
140		- except as required for reasonable and customary use in describing the
141		- origin of the Work and reproducing the content of the NOTICE file.
142		-
143		- 7. Disclaimer of Warranty. Unless required by applicable law or
144		- agreed to in writing, Licensor provides the Work (and each
145		- Contributor provides its Contributions) on an "AS IS" BASIS,
146		- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147		- implied, including, without limitation, any warranties or conditions
148		- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149		- PARTICULAR PURPOSE. You are solely responsible for determining the
150		- appropriateness of using or redistributing the Work and assume any
151		- risks associated with Your exercise of permissions under this License.
152		-
153		- 8. Limitation of Liability. In no event and under no legal theory,
154		- whether in tort (including negligence), contract, or otherwise,
155		- unless required by applicable law (such as deliberate and grossly
156		- negligent acts) or agreed to in writing, shall any Contributor be
157		- liable to You for damages, including any direct, indirect, special,
158		- incidental, or consequential damages of any character arising as a
159		- result of this License or out of the use or inability to use the
160		- Work (including but not limited to damages for loss of goodwill,
161		- work stoppage, computer failure or malfunction, or any and all
162		- other commercial damages or losses), even if such Contributor
163		- has been advised of the possibility of such damages.
164		-
165		- 9. Accepting Warranty or Additional Liability. While redistributing
166		- the Work or Derivative Works thereof, You may choose to offer,
167		- and charge a fee for, acceptance of support, warranty, indemnity,
168		- or other liability obligations and/or rights consistent with this
169		- License. However, in accepting such obligations, You may act only
170		- on Your own behalf and on Your sole responsibility, not on behalf
171		- of any other Contributor, and only if You agree to indemnify,
172		- defend, and hold each Contributor harmless for any liability
173		- incurred by, or claims asserted against, such Contributor by reason
174		- of your accepting any such warranty or additional liability.
175		-
176		- END OF TERMS AND CONDITIONS
	15	+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
	16	+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
	17	+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
	18	+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
	19	+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
	20	+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
	21	+THE SOFTWARE.

app/bower_components/bootstrap/README.md

Diff comments   View file @ 862daa8

1		-# [Bootstrap](http://getbootstrap.com) [](http://travis-ci.org/twbs/bootstrap) [](https://david-dm.org/twbs/bootstrap#info=devDependencies)
	1	+# [Bootstrap](http://getbootstrap.com)
	2	+
	3	+[](https://bootstrap-slack.herokuapp.com)
	4	+
	5	+[](https://www.npmjs.com/package/bootstrap)
	6	+[](https://travis-ci.org/twbs/bootstrap)
	7	+[](https://david-dm.org/twbs/bootstrap#info=devDependencies)
	8	+[](https://www.nuget.org/packages/Bootstrap)
2	9	[](https://saucelabs.com/u/bootstrap)
3	10
4		-Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat).
	11	+Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created by [Mark Otto](https://twitter.com/mdo) and [Jacob Thornton](https://twitter.com/fat), and maintained by the [core team](https://github.com/orgs/twbs/people) with the massive support and involvement of the community.
5	12
6	13	To get started, check out <http://getbootstrap.com>!
7	14
8	15
	16	+## Table of contents
9	17
	18	+* [Quick start](#quick-start)
	19	+* [Bugs and feature requests](#bugs-and-feature-requests)
	20	+* [Documentation](#documentation)
	21	+* [Contributing](#contributing)
	22	+* [Community](#community)
	23	+* [Versioning](#versioning)
	24	+* [Creators](#creators)
	25	+* [Copyright and license](#copyright-and-license)
	26	+
	27	+
10	28	## Quick start
11	29
12		-Three quick start options are available:
	30	+Several quick start options are available:
13	31
14		-* [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.0.3.zip).
	32	+* [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.7.zip).
15	33	* Clone the repo: `git clone https://github.com/twbs/bootstrap.git`.
16	34	* Install with [Bower](http://bower.io): `bower install bootstrap`.
	35	+* Install with [npm](https://www.npmjs.com): `npm install bootstrap@3`.
	36	+* Install with [Meteor](https://www.meteor.com): `meteor add twbs:bootstrap`.
	37	+* Install with [Composer](https://getcomposer.org): `composer require twbs/bootstrap`.
17	38
18		-Read the [Getting Started page](http://getbootstrap.com/getting-started/) for information on the framework contents, templates and examples, and more.
	39	+Read the [Getting started page](http://getbootstrap.com/getting-started/) for information on the framework contents, templates and examples, and more.
19	40
20	41	### What's included
21	42
22	43
23	44
...	...	@@ -25,9 +46,13 @@
25	46	bootstrap/
26	47	├── css/
27	48	│ ├── bootstrap.css
	49	+│ ├── bootstrap.css.map
28	50	│ ├── bootstrap.min.css
	51	+│ ├── bootstrap.min.css.map
29	52	│ ├── bootstrap-theme.css
30		-│ └── bootstrap-theme.min.css
	53	+│ ├── bootstrap-theme.css.map
	54	+│ ├── bootstrap-theme.min.css
	55	+│ └── bootstrap-theme.min.css.map
31	56	├── js/
32	57	│ ├── bootstrap.js
33	58	│ └── bootstrap.min.js
34	59
35	60
36	61
37	62
38	63
39	64
...	...	@@ -35,31 +60,30 @@
35	60	├── glyphicons-halflings-regular.eot
36	61	├── glyphicons-halflings-regular.svg
37	62	├── glyphicons-halflings-regular.ttf
38		- └── glyphicons-halflings-regular.woff
	63	+ ├── glyphicons-halflings-regular.woff
	64	+ └── glyphicons-halflings-regular.woff2
39	65	```
40	66
41		-We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). Fonts from Glyphicons are included, as is the optional Bootstrap theme.
	67	+We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). CSS [source maps](https://developer.chrome.com/devtools/docs/css-preprocessors) (`bootstrap.*.map`) are available for use with certain browsers' developer tools. Fonts from Glyphicons are included, as is the optional Bootstrap theme.
42	68
43	69
44		-
45	70	## Bugs and feature requests
46	71
47		-Have a bug or a feature request? [Please open a new issue](https://github.com/twbs/bootstrap/issues). Before opening any issue, please search for existing issues and read the [Issue Guidelines](https://github.com/necolas/issue-guidelines), written by [Nicolas Gallagher](https://github.com/necolas/).
	72	+Have a bug or a feature request? Please first read the [issue guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md#using-the-issue-tracker) and search for existing and closed issues. If your problem or idea is not addressed yet, [please open a new issue](https://github.com/twbs/bootstrap/issues/new).
48	73
49		-You may use [this JS Bin](http://jsbin.com/aKiCIDO/1/edit) as a template for your bug reports.
	74	+Note that **feature requests must target [Bootstrap v4](https://github.com/twbs/bootstrap/tree/v4-dev),** because Bootstrap v3 is now in maintenance mode and is closed off to new features. This is so that we can focus our efforts on Bootstrap v4.
50	75
51	76
52		-
53	77	## Documentation
54	78
55	79	Bootstrap's documentation, included in this repo in the root directory, is built with [Jekyll](http://jekyllrb.com) and publicly hosted on GitHub Pages at <http://getbootstrap.com>. The docs may also be run locally.
56	80
57	81	### Running documentation locally
58	82
59		-1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v1.x).
60		-2. From the root `/bootstrap` directory, run `jekyll serve` in the command line.
61		- - **Windows users:** run `chcp 65001` first to change the command prompt's character encoding ([code page](http://en.wikipedia.org/wiki/Windows_code_page)) to UTF-8 so Jekyll runs without errors.
62		-3. Open <http://localhost:9001> in your browser, and voilà.
	83	+1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) and other Ruby dependencies with `bundle install`.
	84	+ **Note for Windows users:** Read [this unofficial guide](http://jekyll-windows.juthilo.com/) to get Jekyll up and running without problems.
	85	+2. From the root `/bootstrap` directory, run `bundle exec jekyll serve` in the command line.
	86	+4. Open `http://localhost:9001` in your browser, and voilà.
63	87
64	88	Learn more about using Jekyll by reading its [documentation](http://jekyllrb.com/docs/home/).
65	89
66	90
67	91
68	92
69	93
70	94
71	95
72	96
73	97
74	98
75	99
76	100
77	101
78	102
79	103
80	104
81	105
...	...	@@ -70,98 +94,50 @@
70	94	[Previous releases](https://github.com/twbs/bootstrap/releases) and their documentation are also available for download.
71	95
72	96
73		-
74		-## Compiling CSS and JavaScript
75		-
76		-Bootstrap uses [Grunt](http://gruntjs.com/) with convenient methods for working with the framework. It's how we compile our code, run tests, and more. To use it, install the required dependencies as directed and then run some Grunt commands.
77		-
78		-### Install Grunt
79		-
80		-From the command line:
81		-
82		-1. Install `grunt-cli` globally with `npm install -g grunt-cli`.
83		-2. Navigate to the root `/bootstrap` directory, then run `npm install`. npm will look at [package.json](package.json) and automatically install the necessary local dependencies listed there.
84		-
85		-When completed, you'll be able to run the various Grunt commands provided from the command line.
86		-
87		-**Unfamiliar with `npm`? Don't have node installed?** That's a-okay. npm stands for [node packaged modules](http://npmjs.org/) and is a way to manage development dependencies through node.js. [Download and install node.js](http://nodejs.org/download/) before proceeding.
88		-
89		-### Available Grunt commands
90		-
91		-#### Build - `grunt`
92		-Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Uses [recess](http://twitter.github.io/recess/) and [UglifyJS](http://lisperator.net/uglifyjs/).**
93		-
94		-#### Only compile CSS and JavaScript - `grunt dist`
95		-`grunt dist` creates the `/dist` directory with compiled files. **Uses [recess](http://twitter.github.io/recess/) and [UglifyJS](http://lisperator.net/uglifyjs/).**
96		-
97		-#### Tests - `grunt test`
98		-Runs [JSHint](http://jshint.com) and [QUnit](http://qunitjs.com/) tests headlessly in [PhantomJS](http://phantomjs.org/) (used for CI).
99		-
100		-#### Watch - `grunt watch`
101		-This is a convenience method for watching just Less files and automatically building them whenever you save.
102		-
103		-### Troubleshooting dependencies
104		-
105		-Should you encounter problems with installing dependencies or running Grunt commands, uninstall all previous dependency versions (global and local). Then, rerun `npm install`.
106		-
107		-
108		-
109	97	## Contributing
110	98
111	99	Please read through our [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development.
112	100
113		-More over, if your pull request contains JavaScript patches or features, you must include relevant unit tests. All HTML and CSS should conform to the [Code Guide](http://github.com/mdo/code-guide), maintained by [Mark Otto](http://github.com/mdo).
	101	+Moreover, if your pull request contains JavaScript patches or features, you must include [relevant unit tests](https://github.com/twbs/bootstrap/tree/master/js/tests). All HTML and CSS should conform to the [Code Guide](https://github.com/mdo/code-guide), maintained by [Mark Otto](https://github.com/mdo).
114	102
115		-Editor preferences are available in the [editor config](.editorconfig) for easy use in common text editors. Read more and download plugins at <http://editorconfig.org>.
	103	+**Bootstrap v3 is now closed off to new features.** It has gone into maintenance mode so that we can focus our efforts on [Bootstrap v4](https://github.com/twbs/bootstrap/tree/v4-dev), the future of the framework. Pull requests which add new features (rather than fix bugs) should target [Bootstrap v4 (the `v4-dev` git branch)](https://github.com/twbs/bootstrap/tree/v4-dev) instead.
116	104
117		-With v3.1, we're moving from the Apache 2 to the MIT license for the Bootstrap code (not the docs). Please see the [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md) for more information.
	105	+Editor preferences are available in the [editor config](https://github.com/twbs/bootstrap/blob/master/.editorconfig) for easy use in common text editors. Read more and download plugins at <http://editorconfig.org>.
118	106
119	107
120	108	## Community
121	109
122		-Keep track of development and community news.
	110	+Get updates on Bootstrap's development and chat with the project maintainers and community members.
123	111
124		-* Follow [@twbootstrap on Twitter](http://twitter.com/twbootstrap).
	112	+* Follow [@getbootstrap on Twitter](https://twitter.com/getbootstrap).
125	113	* Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com).
126		-* Have a question that's not a feature request or bug report? [Ask on the mailing list.](http://groups.google.com/group/twitter-bootstrap)
127		-* Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##twitter-bootstrap` channel.
	114	+* Join [the official Slack room](https://bootstrap-slack.herokuapp.com).
	115	+* Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##bootstrap` channel.
	116	+* Implementation help may be found at Stack Overflow (tagged [`twitter-bootstrap-3`](https://stackoverflow.com/questions/tagged/twitter-bootstrap-3)).
	117	+* Developers should use the keyword `bootstrap` on packages which modify or add to the functionality of Bootstrap when distributing through [npm](https://www.npmjs.com/browse/keyword/bootstrap) or similar delivery mechanisms for maximum discoverability.
128	118
129	119
130		-
131		-
132	120	## Versioning
133	121
134		-For transparency and insight into our release cycle, and for striving to maintain backward compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible.
	122	+For transparency into our release cycle and in striving to maintain backward compatibility, Bootstrap is maintained under [the Semantic Versioning guidelines](http://semver.org/). Sometimes we screw up, but we'll adhere to those rules whenever possible.
135	123
136		-Releases will be numbered with the following format:
	124	+See [the Releases section of our GitHub project](https://github.com/twbs/bootstrap/releases) for changelogs for each release version of Bootstrap. Release announcement posts on [the official Bootstrap blog](http://blog.getbootstrap.com) contain summaries of the most noteworthy changes made in each release.
137	125
138		-`<major>.<minor>.<patch>`
139	126
140		-And constructed with the following guidelines:
	127	+## Creators
141	128
142		-* Breaking backward compatibility bumps the major (and resets the minor and patch)
143		-* New additions without breaking backward compatibility bumps the minor (and resets the patch)
144		-* Bug fixes and misc changes bumps the patch
145		-
146		-For more information on SemVer, please visit <http://semver.org/>.
147		-
148		-
149		-
150		-## Authors
151		-
152	129	**Mark Otto**
153	130
154		-+ <http://twitter.com/mdo>
155		-+ <http://github.com/mdo>
	131	+* <https://twitter.com/mdo>
	132	+* <https://github.com/mdo>
156	133
157	134	**Jacob Thornton**
158	135
159		-+ <http://twitter.com/fat>
160		-+ <http://github.com/fat>
	136	+* <https://twitter.com/fat>
	137	+* <https://github.com/fat>
161	138
162	139
163		-
164	140	## Copyright and license
165	141
166		-Copyright 2013 Twitter, Inc under [the Apache 2.0 license](LICENSE).
	142	+Code and documentation copyright 2011-2016 Twitter, Inc. Code released under [the MIT license](https://github.com/twbs/bootstrap/blob/master/LICENSE). Docs released under [Creative Commons](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE).

app/bower_components/bootstrap/bower.json

Diff comments   View file @ 862daa8

1	1	{
2	2	"name": "bootstrap",
3		- "version": "3.0.3",
	3	+ "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
	4	+ "keywords": [
	5	+ "css",
	6	+ "js",
	7	+ "less",
	8	+ "mobile-first",
	9	+ "responsive",
	10	+ "front-end",
	11	+ "framework",
	12	+ "web"
	13	+ ],
	14	+ "homepage": "http://getbootstrap.com",
	15	+ "license": "MIT",
	16	+ "moduleType": "globals",
4	17	"main": [
5		- "./dist/js/bootstrap.js",
6		- "./dist/css/bootstrap.css",
7		- "./dist/fonts/glyphicons-halflings-regular.eot",
8		- "./dist/fonts/glyphicons-halflings-regular.svg",
9		- "./dist/fonts/glyphicons-halflings-regular.ttf",
10		- "./dist/fonts/glyphicons-halflings-regular.woff"
	18	+ "less/bootstrap.less",
	19	+ "dist/js/bootstrap.js"
11	20	],
12	21	"ignore": [
13		- "**/.*",
14		- "_*",
15		- "docs-assets",
16		- "examples",
17		- "/fonts",
18		- "js/tests",
	22	+ "/.*",
	23	+ "_config.yml",
19	24	"CNAME",
20		- "CONTRIBUTING.md",
21		- "Gruntfile.js",
22		- "browserstack.json",
23	25	"composer.json",
24		- "package.json",
25		- "*.html"
	26	+ "CONTRIBUTING.md",
	27	+ "docs",
	28	+ "js/tests",
	29	+ "test-infra"
26	30	],
27	31	"dependencies": {
28		- "jquery": ">= 1.9.0"
	32	+ "jquery": "1.9.1 - 3"
29	33	}
30	34	}

app/bower_components/jquery/.bower.json

Diff comments   View file @ 862daa8

...	...	@@ -20,7 +20,7 @@
20	20	"commit": "1b30f3ad466ebf2714d47eda34dbd7fdf6849fe3"
21	21	},
22	22	"_source": "https://github.com/jquery/jquery-dist.git",
23		- "_target": "1.9.1 - 3",
	23	+ "_target": "^3.1.1",
24	24	"_originalSource": "jquery"
25	25	}

app/images/agree-design.png

Diff comments   View file @ 862daa8

7.82 KB

app/images/bg1.png

Diff comments   View file @ 862daa8

7.11 KB

app/images/bg_step_arrow.gif

Diff comments   View file @ 862daa8

104 Bytes

app/images/trash.png

Diff comments   View file @ 862daa8

7.82 KB

app/styles/main.css

Diff comments   View file @ 862daa8

...	...	@@ -2,7 +2,14 @@
2	2	@import "../fonts/font.css";
3	3	body {
4	4	font-family: 'Hiragino Kaku Gothic Pro';
	5	+
5	6	}
	7	+.padding-right-0{
	8	+ padding-right: 0!important;
	9	+}
	10	+.padding-left-0{
	11	+ padding-left: 0!important;
	12	+}
6	13	button.red{
7	14	color: #ffffff;
8	15	background-color: #ff0000;
...	...	@@ -20,6 +27,12 @@
20	27	color: #ffffff;
21	28	border-radius: 5px;
22	29	}
	30	+button.black{
	31	+ border: 1px solid #c9c9c9;
	32	+ background-color: #343434;
	33	+ color: #ffffff;
	34	+ padding: 1px 6px;
	35	+}
23	36	#tshirt-container{
24	37	border-left: 1px solid #dcdcdc;
25	38	border-right: 1px solid #dcdcdc;
26	39
27	40
...	...	@@ -40,13 +53,16 @@
40	53	/*NAVIGATION*/
41	54	nav{
42	55	border-bottom: 1px solid #dcdcdc;
	56	+ padding: 10px 0;
43	57	}
44	58	nav h2{
45		- font-size: 24px;
	59	+ font-size: 27px;
	60	+ margin: 0 0;
46	61	}
47	62	nav ul{
48	63	list-style: none;
49	64	padding-left: 0;
	65	+ margin-bottom: 0;
50	66	}
51	67	nav ul li{
52	68	margin-left: 2px;
...	...	@@ -63,7 +79,7 @@
63	79	}
64	80	/*ASIDE*/
65	81	aside{
66		-
	82	+ margin: 10px 0;
67	83	}
68	84
69	85	aside .break-down{
70	86
71	87
...	...	@@ -83,13 +99,15 @@
83	99	margin: 0 0;
84	100	}
85	101	aside .step .title{
86		- font-size: 13px;
	102	+ font-size: 15px;
87	103	line-height: 16px;
88	104	font-weight: bold;
	105	+ margin-bottom: 3px;
89	106	}
90	107	aside .step .title-notice{
91	108	font-size: 13px;
92	109	line-height: 16px;
	110	+ margin-bottom: 3px;
93	111	}
94	112	aside .step .title-notice .require{
95	113	font-size: 10px;
...	...	@@ -138,6 +156,7 @@
138	156	list-style: none;
139	157	padding-left: 0;
140	158	width: 100%;
	159	+ margin-bottom: 3px;
141	160	}
142	161	aside .step .step-box .tshirt-color ul.choice-color li{
143	162	margin: 0 10px 0 0;
...	...	@@ -158,6 +177,7 @@
158	177	}
159	178	aside .step .step-box .tshirt-color .color-name{
160	179	width: 100%;
	180	+ font-size: 10px;
161	181	}
162	182	aside .step .step-box .tshirt-color .view-more{
163	183	position: absolute;
...	...	@@ -166,7 +186,7 @@
166	186	}
167	187	/*Step 3*/
168	188	aside .step .step-box .tshirt-saveorder{
169		- padding: 10px 10px;
	189	+ padding: 10px 10px 6px 10px;
170	190	}
171	191	aside .step .step-box .tshirt-saveorder .action{
172	192	width: 50%;
...	...	@@ -202,6 +222,9 @@
202	222	transform: translateX(-50%) translateY(-50%);
203	223	-webkit-transform: translateX(-50%) translateY(-50%);
204	224	}
	225	+aside .step .step-box .tshirt-saveorder .notice{
	226	+ padding: 5px 0 0 0;
	227	+}
205	228	/*Step 4*/
206	229	aside .step .title-notice{
207	230
208	231
209	232
210	233
211	234
...	...	@@ -221,19 +244,26 @@
221	244
222	245	/*Step 5- finish*/
223	246	aside .step .finish-design{
224		-
	247	+ padding: 20px 0;
225	248	}
226	249	aside .step .finish-design button{
227	250	width: 100%;
228		- padding: 6px 10px;
	251	+ padding: 8px 10px;
229	252	}
230	253
231	254	/*DESIGN CONTENT*/
232	255	#tshirt-content{
233		-
	256	+ position: relative;
234	257	}
	258	+#tshirt-content .switch-border-design{
	259	+ position: absolute;
	260	+ top: 5px;
	261	+ right: 10px;
	262	+ color: red;
	263	+ font-size: 11px;
	264	+}
235	265	#tshirt-content .tshirt-image{
236		-
	266	+ padding: 20px 0;
237	267	}
238	268	#tshirt-content .tshirt-choice{
239	269
...	...	@@ -261,7 +291,7 @@
261	291	}
262	292	/*MODAL Design*/
263	293	#tshirt-design{
264		- background-color: #000;
	294	+ background-color: #666666;
265	295	}
266	296	#tshirt-design .modal-dialog{
267	297	width: 75%;
268	298
269	299
270	300
...	...	@@ -271,17 +301,20 @@
271	301	background-color: transparent;
272	302	border-radius: 0;
273	303	border: 0;
	304	+
274	305	}
275	306	#tshirt-design .modal-dialog .modal-content .modal-header{
276	307	padding: 0 0 10px 0;
277	308	border-bottom: 0;
	309	+ border-shadow: none!important;
278	310	}
279	311	#tshirt-design .modal-dialog .modal-content .modal-body{
280		- background-color: #ffffff;
	312	+ background-color: #f5f5f5;
281	313	padding: 0 0;
282	314	}
283	315	#tshirt-design header{
284		- border-bottom: 1px solid #DDDDDD;
	316	+ border-bottom: 1px solid #cccccc;
	317	+ background-color: #dddddd;
285	318	}
286	319	#tshirt-design header ul.nav{
287	320	padding-left: 0;
288	321
289	322
290	323
291	324
...	...	@@ -289,17 +322,104 @@
289	322	}
290	323	#tshirt-design header ul.nav li{
291	324	float: left;
292		- padding: 10px 15px;
293		- border-right: 1px solid #DDDDDD;
	325	+ padding: 8px 26px;
	326	+ border-right: 1px solid #cccccc;
	327	+ font-size: 14px;
	328	+ cursor: pointer;
294	329	}
	330	+#tshirt-design header ul.nav li:hover{
	331	+ background-color: red;
	332	+ color: #ffffff;
	333	+}
	334	+#tshirt-design header ul.nav li:hover i.fa{
	335	+ color: #ffffff;
	336	+}
	337	+#tshirt-design header ul.nav li i.fa{
	338	+ color: #fe070f;
	339	+ font-size: 20px;
	340	+ margin-right: 10px;
	341	+}
	342	+#tshirt-design header .action{
295	343
	344	+}
	345	+#tshirt-design header .action button{
	346	+ padding: 3px 10px;
	347	+ margin: 7px 10px;
	348	+}
	349	+#tshirt-design header .action button:hover{
	350	+ background-color: red;
	351	+ color: #ffffff;
	352	+}
	353	+
296	354	/*Aside modal*/
297	355	.aside{
298		-
299	356	}
300	357	.aside #choice-design-option{
301	358	list-style: none;
302	359	padding-left: 0;
	360	+ margin-top: 10px;
	361	+
	362	+}
	363	+.aside #choice-design-option li{
	364	+ border: 1px solid #cdcdcd;
	365	+}
	366	+.aside #choice-design-option li .hover{
	367	+ background-color: #fddad4;
	368	+ opacity: 0.5;
	369	+ display: none;
	370	+}
	371	+.aside #choice-design-option li:hover .hover{
	372	+ display: block;
	373	+}
	374	+
	375	+.aside #choice-design-option li .title{
	376	+ background: url("../images/bg1.png") repeat #cdcdcd;
	377	+ padding: 3px 10px;
	378	+}
	379	+.aside #choice-design-option li .title i.fa{
	380	+ color: #000000;
	381	+}
	382	+
	383	+.aside #choice-design-option li .content{
	384	+
	385	+}
	386	+.aside #choice-design-option li .content i.fa{
	387	+ font-size: 30px;
	388	+ color: #fe070f;
	389	+ margin: 8px 0;
	390	+}
	391	+.aside #choice-design-option li .content .des{
	392	+ padding: 3px 10px 3px 0;
	393	+}
	394	+
	395	+/*Design content*/
	396	+.tshirt-design-container{
	397	+ position: relative;
	398	+}
	399	+.tshirt-design-container .design-content{
	400	+ padding: 10px 50px 10px 25px;
	401	+}
	402	+.tshirt-design-container .design-content .content{
	403	+ width: 100%;
	404	+ min-height: 650px;
	405	+ background-color: #f0efea;
	406	+ padding: 40px 85px;
	407	+ height: 100%;
	408	+}
	409	+.tshirt-design-container .design-content .content .selection-design{
	410	+ border: 1px solid #ff0000;
	411	+ width: 100%;
	412	+ height: 620px;
	413	+}
	414	+.tshirt-design-container .agree-design{
	415	+ position: absolute;
	416	+ right: -16px;
	417	+ top: 40%;
	418	+}
	419	+.tshirt-design-container .trash-design{
	420	+ position: absolute;
	421	+ right: 5px;
	422	+ bottom: 0;
303	423	}
304	424	/* Customize container */
305	425	@media (min-width: 768px) {

app/views/main.html

Diff comments   View file @ 862daa8

1	1	<div ng-controller="MainCtrl" class="col-sm-10 col-sm-offset-1" id="tshirt-container">
2		- <header>
3		- <div class="logo">
4		- <img src="images/uniqlo_logo.png" alt="Logo Uniqlo" />
5		- Uniqlo Customize
6		- </div>
7		- </header>
8		- <nav class="clearfix">
9		- <h2 class="pull-left">加工箇所を選択してデザインしてください。</h2>
10		- <ul class="pull-right">
11		- <li><a href="#">商品に戻る</a></li>
12		- <li><a href="#">加工方法に戻る</a></li>
13		- <li class="action">デザインする</li>
14		- </ul>
15		- </nav>
16		- <article>
17		- <div class="row">
18		- <aside class="col-sm-5">
19		- <div class="step">
20		- <div class="title">
21		- 1. デザインを作る
22		- </div>
23		- <div class="step-box">
24		- <div class="tshirt-design clearfix">
25		- <div class="icon">
26		- <img src="images/t-shirt_icon/tshirt1.gif" alt="icon t-shirt" />
	2	+ <div class="row">
	3	+ <header>
	4	+ <div class="logo">
	5	+ <img src="images/uniqlo_logo.png" alt="Logo Uniqlo" />
	6	+ Uniqlo Customize
	7	+ </div>
	8	+ </header>
	9	+ <nav class="clearfix">
	10	+ <div class="col-sm-12">
	11	+ <h2 class="pull-left">加工箇所を選択してデザインしてください。</h2>
	12	+ <ul class="pull-right">
	13	+ <li><a href="#">商品に戻る</a></li>
	14	+ <li><a href="#">加工方法に戻る</a></li>
	15	+ <li class="action">デザインする</li>
	16	+ </ul>
	17	+ </div>
	18	+ </nav>
	19	+ <article>
	20	+
	21	+ <aside class="col-sm-5">
	22	+ <div class="step">
	23	+ <div class="title">
	24	+ 1. デザインを作る
	25	+ </div>
	26	+ <div class="step-box">
	27	+ <div class="tshirt-design clearfix">
	28	+ <div class="icon">
	29	+ <img src="images/t-shirt_icon/tshirt1.gif" alt="icon t-shirt" />
	30	+ </div>
	31	+ <div class="name">
	32	+ 背中背中 (28x22)
	33	+ </div>
	34	+ <div class="action">
	35	+ <button class="red" ng-click="modalTShirtDesign()">
	36	+ <i class="fa fa-caret-right" aria-hidden="true"></i> デザインを作る
	37	+ </button>
	38	+ </div>
27	39	</div>
28		- <div class="name">
29		- 背中背中 (28x22)
30		- </div>
31		- <div class="action">
32		- <button class="red" ng-click="modalTShirtDesign()">
33		- <i class="fa fa-caret-right" aria-hidden="true"></i> デザインを作る
34		- </button>
35		- </div>
36	40	</div>
37	41	</div>
38		- </div>
39	42
40		- <!-- BREAK DOWN-->
41		- <div class="text-center break-down">
42		- <i class="fa fa-caret-down" aria-hidden="true"></i>
43		- </div>
44		-
45		- <!-- STEP 2-->
46		- <div class="step">
47		- <div class="title">
48		- 2.アイテムカラーを変更する
	43	+ <!-- BREAK DOWN-->
	44	+ <div class="text-center break-down">
	45	+ <img src="images/bg_step_arrow.gif" alt="arrow" />
49	46	</div>
50		- <div class="step-box clearfix">
51		- <div class="tshirt-color">
52		- <ul class="choice-color clearfix">
53		- <li class="white"><div></div></li>
54		- <li class="blue"><div></div></li>
55		- </ul>
56		- <div class="color-name">
57		- color: 00 WHITE
	47	+
	48	+ <!-- STEP 2-->
	49	+ <div class="step">
	50	+ <div class="title">
	51	+ 2.アイテムカラーを変更する
	52	+ </div>
	53	+ <div class="step-box clearfix">
	54	+ <div class="tshirt-color">
	55	+ <ul class="choice-color clearfix">
	56	+ <li class="white"><div></div></li>
	57	+ <li class="blue"><div></div></li>
	58	+ </ul>
	59	+ <div class="color-name">
	60	+ color: 00 WHITE
	61	+ </div>
	62	+ <div class="view-more">
	63	+ 在庫確認 <i class="fa fa-chevron-circle-right" aria-hidden="true"></i>
	64	+ </div>
58	65	</div>
59		- <div class="view-more">
60		- 在庫確認 <i class="fa fa-chevron-circle-right" aria-hidden="true"></i>
61		- </div>
62	66	</div>
63	67	</div>
64		- </div>
65	68
66		- <!-- BREAK DOWN-->
67		- <div class="text-center break-down">
68		- <i class="fa fa-caret-down" aria-hidden="true"></i>
69		- </div>
	69	+ <!-- BREAK DOWN-->
	70	+ <div class="text-center break-down">
	71	+ <img src="images/bg_step_arrow.gif" alt="arrow" />
	72	+ </div>
70	73
71		- <!-- STEP 3-->
72		- <div class="step">
73		- <div class="step-box clearfix">
74		- <div class="tshirt-saveorder">
75		- <div class="clearfix">
76		- <div class="action">
77		- <button class="white">
78		- <div class="text">
79		- このデザインを保存する
80		- </div>
81		- <div class="arrow">
	74	+ <!-- STEP 3-->
	75	+ <div class="step">
	76	+ <div class="step-box clearfix">
	77	+ <div class="tshirt-saveorder">
	78	+ <div class="clearfix">
	79	+ <div class="action">
	80	+ <button class="white">
	81	+ <div class="text">
	82	+ このデザインを保存する
	83	+ </div>
	84	+ <div class="arrow">
82	85	<i class="fa fa-chevron-circle-right" aria-hidden="true"></i>
83		- </div>
84		- </button>
	86	+ </div>
	87	+ </button>
	88	+ </div>
	89	+ <div class="action">
	90	+ <button class="red">
	91	+ <div class="text">
	92	+ このデザインで注文する
	93	+ </div>
	94	+ <div class="arrow clearfix">
	95	+ <i class="fa fa-chevron-circle-right" aria-hidden="true"></i>
	96	+ </div>
	97	+ </button>
	98	+ </div>
85	99	</div>
86		- <div class="action">
87		- <button class="red">
88		- <div class="text">
89		- このデザインで注文する
90		- </div>
91		- <div class="arrow clearfix">
92		- <i class="fa fa-chevron-circle-right" aria-hidden="true"></i>
93		- </div>
94		- </button>
	100	+ <div class="notice">
	101	+ デザインを保存するには、ログインしてください
95	102	</div>
96	103	</div>
97		- <div class="notice">
98		- デザインを保存するには、ログインしてください
99		- </div>
100	104	</div>
101		- </div>
102	105
103		- <!-- BREAL LINE-->
104		- <div class="text-center break-line">
105		- <hr />
106		- </div>
	106	+ <!-- BREAL LINE-->
	107	+ <div class="text-center break-line">
	108	+ <hr />
	109	+ </div>
107	110
108		- <!-- STEP 4-->
109		- <div class="step">
110		- <div class="title-notice">
111		- 商品・デザインの変更はこちら <span class="require">作業中のデザインは破棄されます</span>
	111	+ <!-- STEP 4-->
	112	+ <div class="step">
	113	+ <div class="title-notice">
	114	+ 商品・デザインの変更はこちら <span class="require">作業中のデザインは破棄されます</span>
	115	+ </div>
	116	+ <div class="step-box">
	117	+ <div class="change-design">
	118	+ <table>
	119	+ <tr>
	120	+ <td class="text-center">商品</td>
	121	+ <td>MENドライカノコポロシャツ・ポケツキ半袖（ホワイト）</td>
	122	+ <td class="text-right">
	123	+ <button class="brown"><i class="fa fa-caret-right" aria-hidden="true"></i> 変更</button>
	124	+ </td>
	125	+ </tr>
	126	+ <tr>
	127	+ <td width="10%" class="text-center">加工方法</td>
	128	+ <td width="70%">シルク：胸中央 (27×27)</td>
	129	+ <td width="20%" class="text-right">
	130	+ <button class="brown"><i class="fa fa-caret-right" aria-hidden="true"></i> 変更</button>
	131	+ </td>
	132	+ </tr>
	133	+ </table>
	134	+ </div>
	135	+ </div>
112	136	</div>
113		- <div class="step-box">
114		- <div class="change-design">
115		- <table>
116		- <tr>
117		- <td class="text-center">商品</td>
118		- <td>MENドライカノコポロシャツ・ポケツキ半袖（ホワイト）</td>
119		- <td class="text-right">
120		- <button class="brown"><i class="fa fa-caret-right" aria-hidden="true"></i> 変更</button>
121		- </td>
122		- </tr>
123		- <tr>
124		- <td width="10%" class="text-center">加工方法</td>
125		- <td width="70%">シルク：胸中央 (27×27)</td>
126		- <td width="20%" class="text-right">
127		- <button class="brown"><i class="fa fa-caret-right" aria-hidden="true"></i> 変更</button>
128		- </td>
129		- </tr>
130		- </table>
	137	+ <!-- STEP 5- finish-->
	138	+ <div class="step">
	139	+ <div class="finish-design">
	140	+ <button class="white">
	141	+ 自分で保存したデザインを呼び出す <i class="fa fa-chevron-circle-right" aria-hidden="true"></i>
	142	+ </button>
131	143	</div>
	144	+
132	145	</div>
133	146	</div>
134		- <!-- STEP 5- finish-->
135		- <div class="step">
136		- <div class="finish-design">
137		- <button class="white">
138		- 自分で保存したデザインを呼び出す <i class="fa fa-chevron-circle-right" aria-hidden="true"></i>
139		- </button>
140		- </div>
	147	+ </aside>
	148	+ <section id="tshirt-content" class="col-sm-7 text-center">
	149	+ <div class="switch-border-design">
	150	+ <i class="fa fa-square-o" aria-hidden="true"></i> 替えます
	151	+ </div>
	152	+ <div class="tshirt-image">
	153	+ <img src="images/t-shirt/front.png" alt="" />
	154	+ </div>
	155	+ <div class="tshirt-choice">
	156	+ <ul>
	157	+ <li class="front focus">
	158	+ <div>前</div>
	159	+ <div class="image">
	160	+ <img src="images/t-shirt_icon/tshirt1-front.png" alt="" />
	161	+ </div>
141	162
	163	+ </li>
	164	+ <li class="back">
	165	+ <div>後</div>
	166	+ <div class="image">
	167	+ <img src="images/t-shirt_icon/tshirt1-back.png" alt="" />
	168	+ </div>
	169	+
	170	+ </li>
	171	+ </ul>
142	172	</div>
143		- </div>
144		- </aside>
145		- <section id="tshirt-content" class="col-sm-7 text-center">
146		- <div class="tshirt-image">
147		- <img src="images/t-shirt/front.png" alt="" />
148		- </div>
149		- <div class="tshirt-choice">
150		- <ul>
151		- <li class="front focus">
152		- <div>前</div>
153		- <div class="image">
154		- <img src="images/t-shirt_icon/tshirt1-front.png" alt="" />
155		- </div>
	173	+ </section>
156	174
157		- </li>
158		- <li class="back">
159		- <div>後</div>
160		- <div class="image">
161		- <img src="images/t-shirt_icon/tshirt1-back.png" alt="" />
162		- </div>
	175	+ </article>
163	176
164		- </li>
165		- </ul>
166		- </div>
167		- </section>
168		- </div>
169		- </article>
	177	+ <!--MODAL CONTENT-->
	178	+ <div ng-include="'views/tshirt-design.html'"></div>
	179	+ </div>
170	180
171		- <!--MODAL CONTENT-->
172		- <div ng-include="'views/tshirt-design.html'"></div>
173	181
174	182	</div>

app/views/tshirt-design.html

Diff comments   View file @ 862daa8

...	...	@@ -4,11 +4,12 @@
4	4	<div class="modal-dialog" role="document">
5	5	<div class="modal-content">
6	6	<div class="modal-header">
7		- <button class="" ng-click="modalClose()">Close</button>
	7	+ <button class="black" ng-click="modalClose()">x キャンセル</button>
	8	+ <button class="black">> はじめての方へ</button>
8	9	</div>
9	10	<div class="modal-body">
10		- <header>
11		- <ul class="nav">
	11	+ <header class="clearfix">
	12	+ <ul class="nav pull-left">
12	13	<li>
13	14	<i class="fa fa-jpy" aria-hidden="true"></i> 文字
14	15	</li>
...	...	@@ -22,6 +23,14 @@
22	23	<i class="fa fa-minus-circle" aria-hidden="true"></i> 全消去
23	24	</li>
24	25	</ul>
	26	+ <div class="action pull-right">
	27	+ <button class="white">
	28	+ アルバムを開く
	29	+ </button>
	30	+ <button class="white">
	31	+ アルバムに入れる
	32	+ </button>
	33	+ </div>
25	34	</header>
26	35	<section class="tshirt-design-container clearfix">
27	36	<div class="aside col-xs-4">
28	37
...	...	@@ -31,11 +40,11 @@
31	40	<i class="fa fa-chevron-circle-right" aria-hidden="true"></i>
32	41	文字を追加
33	42	</div>
34		- <div class="clearfix">
	43	+ <div class="content clearfix">
35	44	<div class="col-xs-2 text-center">
36	45	<i class="fa fa-jpy" aria-hidden="true"></i>
37	46	</div>
38		- <div class="col-xs-10">
	47	+ <div class="col-xs-10 des padding-left-0">
39	48	書体を選んでお好きな文字を入力できます
40	49	</div>
41	50	</div>
42	51
...	...	@@ -45,11 +54,11 @@
45	54	<i class="fa fa-chevron-circle-right" aria-hidden="true"></i>
46	55	イラストやイメージを追加
47	56	</div>
48		- <div class="clearfix">
	57	+ <div class="content clearfix">
49	58	<div class="col-xs-2 text-center">
50	59	<i class="fa fa-btc" aria-hidden="true"></i>
51	60	</div>
52		- <div class="col-xs-10">
	61	+ <div class="col-xs-10 des padding-left-0">
53	62	自由にお使いいただけるデザイン画像をご用意しました
54	63	</div>
55	64	</div>
56	65
...	...	@@ -59,11 +68,11 @@
59	68	<i class="fa fa-chevron-circle-right" aria-hidden="true"></i>
60	69	自分の画像・写真を追加
61	70	</div>
62		- <div class="clearfix">
	71	+ <div class="content clearfix">
63	72	<div class="col-xs-2 text-center">
64	73	<i class="fa fa-jpy" aria-hidden="true"></i>
65	74	</div>
66		- <div class="col-xs-10">
	75	+ <div class="col-xs-10 des padding-left-0">
67	76	ご自分で用意した画像をアップロードして使えます
68	77	</div>
69	78	</div>
70	79
...	...	@@ -73,11 +82,11 @@
73	82	<i class="fa fa-chevron-circle-right" aria-hidden="true"></i>
74	83	おすすめデザインを使う
75	84	</div>
76		- <div class="clearfix">
	85	+ <div class="content clearfix">
77	86	<div class="col-xs-2 text-center">
78	87	<i class="fa fa-jpy" aria-hidden="true"></i>
79	88	</div>
80		- <div class="col-xs-10">
	89	+ <div class="col-xs-10 des padding-left-0">
81	90	おすすめデザインデータをご自由にカスタマイズしてお使いください
82	91	</div>
83	92	</div>
84	93
...	...	@@ -85,8 +94,18 @@
85	94
86	95	</ul>
87	96	</div>
88		- <div class="design-contetn col-xs-8">
	97	+ <div class="design-content col-xs-8">
	98	+ <div class="content">
	99	+ <div class="selection-design">
89	100
	101	+ </div>
	102	+ </div>
	103	+ <div class="agree-design">
	104	+ <img src="images/agree-design.png" alt="agree design" />
	105	+ </div>
	106	+ <div class="trash-design">
	107	+ <img src="images/trash.png" alt="trash design" />
	108	+ </div>
90	109	</div>
91	110	</section>
92	111	</div>