Commit 8f087d20435ea646ac21dcf278249449f5a1e9de
1 parent
ec3a1b04b7
Exists in
master
and in
2 other branches
Theme + add bower fontawesome
Showing 8 changed files with 88 additions and 66 deletions Inline Diff
app/bower_components/angular/.bower.json
| 1 | { | 1 | { |
| 2 | "name": "angular", | 2 | "name": "angular", |
| 3 | "version": "1.5.9-build.5105+sha.d80cdeb", | 3 | "version": "1.5.9-build.5105+sha.d80cdeb", |
| 4 | "license": "MIT", | 4 | "license": "MIT", |
| 5 | "main": "./angular.js", | 5 | "main": "./angular.js", |
| 6 | "ignore": [], | 6 | "ignore": [], |
| 7 | "dependencies": {}, | 7 | "dependencies": {}, |
| 8 | "homepage": "https://github.com/angular/bower-angular", | 8 | "homepage": "https://github.com/angular/bower-angular", |
| 9 | "_release": "1.5.9-build.5105+sha.d80cdeb", | 9 | "_release": "1.5.9-build.5105+sha.d80cdeb", |
| 10 | "_resolution": { | 10 | "_resolution": { |
| 11 | "type": "version", | 11 | "type": "version", |
| 12 | "tag": "v1.5.9-build.5105+sha.d80cdeb", | 12 | "tag": "v1.5.9-build.5105+sha.d80cdeb", |
| 13 | "commit": "1e96502ac7a4350011d3aae23922940004aa40b0" | 13 | "commit": "1e96502ac7a4350011d3aae23922940004aa40b0" |
| 14 | }, | 14 | }, |
| 15 | "_source": "https://github.com/angular/bower-angular.git", | 15 | "_source": "https://github.com/angular/bower-angular.git", |
| 16 | "_target": "~1.5.9", | 16 | "_target": "1.5.9-build.5105+sha.d80cdeb", |
| 17 | "_originalSource": "angular" | 17 | "_originalSource": "angular" |
| 18 | } | 18 | } |
app/images/t-shirt_icon/tship1.gif
1.09 KB
app/images/uniqlo_logo.png
5.04 KB
app/index.html
| 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 | <!-- bower:css --> | 13 | <!-- bower:css --> |
| 14 | <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" /> | 14 | <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" /> |
| 15 | <link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css" /> | ||
| 15 | <!-- endbower --> | 16 | <!-- endbower --> |
| 16 | <!-- endbuild --> | 17 | <!-- endbuild --> |
| 17 | <!-- build:css({.tmp,app}) styles/main.css --> | 18 | <!-- build:css({.tmp,app}) styles/main.css --> |
| 18 | <link rel="stylesheet" href="styles/main.css"> | 19 | <link rel="stylesheet" href="styles/main.css"> |
| 19 | <!-- endbuild --> | 20 | <!-- endbuild --> |
| 20 | </head> | 21 | </head> |
| 21 | <body ng-app="tshatsApp"> | 22 | <body ng-app="tshatsApp"> |
| 22 | <!--[if lt IE 7]> | 23 | <!--[if lt IE 7]> |
| 23 | <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> | 24 | <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> |
| 24 | <![endif]--> | 25 | <![endif]--> |
| 25 | 26 | ||
| 26 | <!-- Add your site or application content here --> | 27 | <!-- Add your site or application content here --> |
| 27 | <div class="container" ng-view></div> | 28 | <div class="container" ng-view></div> |
| 28 | 29 | ||
| 29 | <!-- Google Analytics: change UA-XXXXX-X to be your site's ID --> | 30 | <!-- Google Analytics: change UA-XXXXX-X to be your site's ID --> |
| 30 | <script> | 31 | <script> |
| 31 | (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ | 32 | (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ |
| 32 | (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), | 33 | (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), |
| 33 | m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) | 34 | m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) |
| 34 | })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); | 35 | })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); |
| 35 | 36 | ||
| 36 | ga('create', 'UA-XXXXX-X'); | 37 | ga('create', 'UA-XXXXX-X'); |
| 37 | ga('send', 'pageview'); | 38 | ga('send', 'pageview'); |
| 38 | </script> | 39 | </script> |
| 39 | 40 | ||
| 40 | <!--[if lt IE 9]> | 41 | <!--[if lt IE 9]> |
| 41 | <script src="bower_components/es5-shim/es5-shim.js"></script> | 42 | <script src="bower_components/es5-shim/es5-shim.js"></script> |
| 42 | <script src="bower_components/json3/lib/json3.min.js"></script> | 43 | <script src="bower_components/json3/lib/json3.min.js"></script> |
| 43 | <![endif]--> | 44 | <![endif]--> |
| 44 | 45 | ||
| 45 | <script src="bower_components/requirejs/require.js" data-main="scripts/main.js"></script> | 46 | <script src="bower_components/requirejs/require.js" data-main="scripts/main.js"></script> |
| 46 | </body> | 47 | </body> |
| 47 | </html> | 48 | </html> |
| 48 | 49 |
app/styles/main.css
| 1 | /* Space out content a bit */ | 1 | /* Space out content a bit */ |
| 2 | body { | 2 | body { |
| 3 | padding-top: 20px; | ||
| 4 | padding-bottom: 20px; | ||
| 5 | } | ||
| 6 | 3 | ||
| 7 | /* Everything but the jumbotron gets side spacing for mobile first views */ | ||
| 8 | .header, | ||
| 9 | .marketing, | ||
| 10 | .footer { | ||
| 11 | padding-left: 15px; | ||
| 12 | padding-right: 15px; | ||
| 13 | } | 4 | } |
| 14 | 5 | #tship-container{ | |
| 15 | /* Custom page header */ | 6 | border-left: 1px solid #dcdcdc; |
| 16 | .header { | 7 | border-right: 1px solid #dcdcdc; |
| 17 | border-bottom: 1px solid #e5e5e5; | ||
| 18 | } | 8 | } |
| 19 | /* Make the masthead heading the same height as the navigation */ | 9 | /*HEADER*/ |
| 20 | .header h3 { | 10 | header{ |
| 21 | margin-top: 0; | 11 | border-bottom: 1px solid #dcdcdc; |
| 22 | margin-bottom: 0; | ||
| 23 | line-height: 40px; | ||
| 24 | padding-bottom: 19px; | ||
| 25 | } | 12 | } |
| 26 | 13 | header .logo{ | |
| 27 | /* Custom page footer */ | 14 | color: #ed1d24; |
| 28 | .footer { | 15 | font-size: 30px; |
| 29 | padding-top: 19px; | 16 | text-transform: uppercase; |
| 30 | color: #777; | 17 | font-weight: bold; |
| 31 | border-top: 1px solid #e5e5e5; | ||
| 32 | } | 18 | } |
| 33 | 19 | header .logo img{ | |
| 34 | /* Customize container */ | 20 | width: 60px; |
| 35 | @media (min-width: 768px) { | ||
| 36 | .container { | ||
| 37 | max-width: 730px; | ||
| 38 | } | ||
| 39 | } | 21 | } |
| 40 | .container-narrow > hr { | 22 | /*NAVIGATION*/ |
| 41 | margin: 30px 0; | 23 | nav{ |
| 24 | border-bottom: 1px solid #dcdcdc; | ||
| 42 | } | 25 | } |
| 43 | 26 | nav h2{ | |
| 44 | /* Main marketing message and sign up button */ | 27 | font-size: 24px; |
| 45 | .jumbotron { | ||
| 46 | text-align: center; | ||
| 47 | border-bottom: 1px solid #e5e5e5; | ||
| 48 | } | 28 | } |
| 49 | .jumbotron .btn { | 29 | nav ul{ |
| 50 | font-size: 21px; | 30 | list-style: none; |
| 51 | padding: 14px 24px; | 31 | padding-left: 0; |
| 52 | } | 32 | } |
| 53 | 33 | nav ul li{ | |
| 54 | /* Supporting marketing content */ | 34 | margin-left: 2px; |
| 55 | .marketing { | 35 | float: left; |
| 56 | margin: 40px 0; | 36 | padding: 6px 12px; |
| 37 | background-color: #999999; | ||
| 57 | } | 38 | } |
| 58 | .marketing p + h4 { | 39 | nav ul li a{ |
| 59 | margin-top: 28px; | 40 | color: #ffffff; |
| 60 | } | 41 | } |
| 42 | nav ul li.action{ | ||
| 43 | color: #ffffff; | ||
| 44 | background-color: #ed1d24; | ||
| 45 | } | ||
| 46 | /* Customize container */ | ||
| 47 | @media (min-width: 768px) { | ||
| 48 | .container { | ||
| 49 | /*max-width: 730px;*/ | ||
| 50 | } | ||
| 51 | } | ||
| 61 | 52 | ||
| 62 | /* Responsive: Portrait tablets and up */ | 53 | /* Responsive: Portrait tablets and up */ |
| 63 | @media screen and (min-width: 768px) { | 54 | @media screen and (min-width: 768px) { |
| 64 | /* Remove the padding we set earlier */ | 55 | /* Remove the padding we set earlier */ |
| 65 | .header, | 56 | |
| 66 | .marketing, | ||
| 67 | .footer { | ||
| 68 | padding-left: 0; |
app/views/main.html
| 1 | <h1 class="text-center"> | 1 | <div class="col-sm-10 col-sm-offset-1" id="tship-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="tship-design"> | ||
| 25 | <div class="icon"> | ||
| 26 | <img src="images/t-shirt_icon/tship1.gif" alt="icon t-shirt" /> | ||
| 27 | </div> | ||
| 28 | <div class="name"> | ||
| 29 | 背中 (28x22) | ||
| 30 | </div> | ||
| 31 | <div class="action"> | ||
| 32 | <button class=""> | ||
| 33 | <i class="fa fa-caret-right" aria-hidden="true"></i> デザインを作る | ||
| 34 | </button> | ||
| 35 | </div> | ||
| 36 | </div> | ||
| 37 | </div> | ||
| 38 | </div> | ||
| 39 | </aside> | ||
| 40 | <section class="col-sm-7 tship-content"> | ||
| 2 | 41 | ||
| 3 | OK | 42 | </section> |
| 4 | </h1> | 43 | </div> |
| 44 | </article> | ||
| 45 | </div> | ||
| 46 |
bower.json
| 1 | { | 1 | { |
| 2 | "name": "tshats", | 2 | "name": "tshats", |
| 3 | "version": "0.0.0", | 3 | "version": "0.0.0", |
| 4 | "dependencies": { | 4 | "dependencies": { |
| 5 | "angular": "~1.5.9", | 5 | "angular": "~1.5.9", |
| 6 | "json3": "~3.2.6", | 6 | "json3": "~3.2.6", |
| 7 | "requirejs": "~2.1.10", | 7 | "requirejs": "~2.1.10", |
| 8 | "es5-shim": "~2.1.0", | 8 | "es5-shim": "~2.1.0", |
| 9 | "jquery": "~1.11.0", | 9 | "jquery": "~1.11.0", |
| 10 | "bootstrap": "~3.0.3", | 10 | "bootstrap": "~3.0.3", |
| 11 | "angular-resource": "1.2.11", | 11 | "angular-resource": "1.2.11", |
| 12 | "angular-cookies": "~1.5.9", | 12 | "angular-cookies": "~1.5.9", |
| 13 | "angular-sanitize": "1.2.11", | 13 | "angular-sanitize": "1.2.11", |
| 14 | "angular-route": "~1.5.9" | 14 | "angular-route": "~1.5.9", |
| 15 | "FortAwesome/Font-Awesome": "*" | ||
| 15 | }, | 16 | }, |
| 16 | "devDependencies": { | 17 | "devDependencies": { |
| 17 | "angular-mocks": "1.2.11", | 18 | "angular-mocks": "1.2.11", |
| 18 | "angular-scenario": "1.2.11" | 19 | "angular-scenario": "1.2.11" |
| 19 | }, | 20 | }, |
| 20 | "resolutions": { | 21 | "resolutions": { |
| 21 | "angular": "~1.5.9" | 22 | "angular": "~1.5.9" |
| 22 | } | 23 | } |
| 23 | } | 24 | } |
| 24 | 25 |
package.json
| 1 | { | 1 | { |
| 2 | "name": "tshats", | 2 | "name": "tshats", |
| 3 | "version": "0.0.0", | 3 | "version": "0.0.0", |
| 4 | "dependencies": { | 4 | "dependencies": { |
| 5 | "express": "^4.13.4", | 5 | "express": "^4.13.4", |
| 6 | "gzippo": "^0.2.0", | 6 | "gzippo": "^0.2.0", |
| 7 | "body-parser": "^1.14.2" | 7 | "body-parser": "^1.14.2" |
| 8 | }, | 8 | }, |
| 9 | "devDependencies": { | 9 | "devDependencies": { |
| 10 | "connect-livereload": "^0.6.0", | 10 | "connect-livereload": "^0.6.0", |
| 11 | "connect-modrewrite": "^0.8.5", | 11 | "connect-modrewrite": "^0.8.5", |
| 12 | "grunt": "~0.4.1", | 12 | "grunt": "~0.4.1", |
| 13 | "grunt-autoprefixer": "~0.4.0", | 13 | "grunt-autoprefixer": "~0.4.0", |
| 14 | "grunt-bower-install": "~0.7.0", | 14 | "grunt-bower-install": "~0.7.0", |
| 15 | "grunt-bower-requirejs": "~0.8.4", | 15 | "grunt-bower-requirejs": "~0.8.4", |
| 16 | "grunt-concurrent": "~0.4.1", | 16 | "grunt-concurrent": "~0.4.1", |
| 17 | "grunt-contrib-clean": "~0.5.0", | 17 | "grunt-contrib-clean": "~0.5.0", |
| 18 | "grunt-contrib-concat": "~0.3.0", | 18 | "grunt-contrib-concat": "~0.3.0", |
| 19 | "grunt-contrib-connect": "~0.5.0", | 19 | "grunt-contrib-connect": "~0.5.0", |
| 20 | "grunt-contrib-copy": "~0.4.1", | 20 | "grunt-contrib-copy": "~0.4.1", |
| 21 | "grunt-contrib-cssmin": "~0.7.0", | 21 | "grunt-contrib-cssmin": "~0.7.0", |
| 22 | "grunt-contrib-htmlmin": "~0.1.3", | 22 | "grunt-contrib-htmlmin": "~0.1.3", |
| 23 | "grunt-contrib-imagemin": "~0.3.0", | 23 | "grunt-contrib-imagemin": "~0.3.0", |
| 24 | "grunt-contrib-jshint": "~0.7.1", | 24 | "grunt-contrib-jshint": "~0.7.1", |
| 25 | "grunt-contrib-requirejs": "~0.4.1", | 25 | "grunt-contrib-requirejs": "~0.4.1", |
| 26 | "grunt-contrib-watch": "~0.5.2", | 26 | "grunt-contrib-watch": "~0.5.2", |
| 27 | "grunt-google-cdn": "~0.2.0", | 27 | "grunt-google-cdn": "~0.2.0", |
| 28 | "grunt-newer": "~0.5.4", | 28 | "grunt-newer": "~0.5.4", |
| 29 | "grunt-ngmin": "~0.0.2", | 29 | "grunt-ngmin": "~0.0.2", |
| 30 | "grunt-rev": "~0.1.0", | 30 | "grunt-rev": "~0.1.0", |
| 31 | "grunt-svgmin": "~0.2.0", | 31 | "grunt-svgmin": "~0.2.0", |
| 32 | "grunt-text-replace": "~0.3.11", | 32 | "grunt-text-replace": "~0.3.11", |
| 33 | "grunt-usemin": "~2.0.0", | 33 | "grunt-usemin": "~2.0.0", |
| 34 | "jshint-stylish": "~0.1.3", | 34 | "jshint-stylish": "~0.1.3", |
| 35 | "load-grunt-tasks": "~0.2.0", | 35 | "load-grunt-tasks": "~0.2.0", |
| 36 | "nodemon": "^1.11.0", | ||
| 36 | "time-grunt": "~0.2.1" | 37 | "time-grunt": "~0.2.1" |
| 37 | }, | 38 | }, |
| 38 | "engines": { | 39 | "engines": { |
| 39 | "node": ">=0.10.0" | 40 | "node": ">=0.10.0" |
| 40 | } | 41 | } |
| 41 | } | 42 | } |
| 42 | 43 |