From 8f087d20435ea646ac21dcf278249449f5a1e9de Mon Sep 17 00:00:00 2001 From: Dang Bui Date: Tue, 8 Nov 2016 08:07:52 +0700 Subject: [PATCH] Theme + add bower fontawesome --- app/bower_components/angular/.bower.json | 2 +- app/images/t-shirt_icon/tship1.gif | Bin 0 -> 1114 bytes app/images/uniqlo_logo.png | Bin 0 -> 5157 bytes app/index.html | 1 + app/styles/main.css | 100 ++++++++++++------------------- app/views/main.html | 47 ++++++++++++++- bower.json | 3 +- package.json | 1 + 8 files changed, 88 insertions(+), 66 deletions(-) create mode 100644 app/images/t-shirt_icon/tship1.gif create mode 100644 app/images/uniqlo_logo.png diff --git a/app/bower_components/angular/.bower.json b/app/bower_components/angular/.bower.json index 7e8ccef..16ea458 100644 --- a/app/bower_components/angular/.bower.json +++ b/app/bower_components/angular/.bower.json @@ -13,6 +13,6 @@ "commit": "1e96502ac7a4350011d3aae23922940004aa40b0" }, "_source": "https://github.com/angular/bower-angular.git", - "_target": "~1.5.9", + "_target": "1.5.9-build.5105+sha.d80cdeb", "_originalSource": "angular" } \ No newline at end of file diff --git a/app/images/t-shirt_icon/tship1.gif b/app/images/t-shirt_icon/tship1.gif new file mode 100644 index 0000000000000000000000000000000000000000..add7a6668aacdacb4e037adaeff2059f2dd60bd6 GIT binary patch literal 1114 zcmV-g1f}~&Nk%w1VNd{20K@000I5ASI4uX`X1Ru59bRa4gSsZQppV z?|kq7z@TtQOcfxGfMg&lAPA2`k%w>?0+fLSz%@t&3WMVynAQ-100JOzC;$=(r6373 z9+W`AKv0`q1!)INSxOBA3=9wr3;<{X03>Ju1_gg40|x+tgd|>?1Cen81OowOCISa( z2xfr{mMeM!0R)=_2ANVTeYmJTPXU7fohkvuBn1S!DyB^UzBv+;ts@9>ErDE{gDux3 z0$0p4ZrCNELs%yT59Tp}1}W-6ktoMB4$k)JC%a-gA2OxeQ$5?couG3*Q_eVH^UmVf&JB z92M|j$yPTDKA||QPfr500LaDWGibvjx{A_Fix$JiylfKn?U&00UnAvfP1Kl>i|N4HQQ~gDd!hRtfuo z1`cB<9H2l$B=+~AffSao6NZ|xbfGcIfk+{OBh2Tbjubc$BV9{DcB4}9b!XB8_lfY2 z3f~X~(~!mr@S_O| ztcMz#TZ-_aJZO?&q6+@tIV5!`DENY*@(4<1Au9a&0s&|$q2-_y%ymMYFdQ)_1#nEd zsF8CtAj2CG832ckl%i>i3$iy{qxN$(T|&han6_4<&o#TECk z))W`_P~}4z^YAgoQ;gh0$5e#81FQ&KJIEK~va!SxfKH4u4?YeD%eAMRqCf#Z2mNQz z1vGGk1h4>502}X~Iz=Pf9OFnF?#!&knpzaI1RGpK;&c&{Y{Nwyri#6Z*<84xz}gBh gz}q&7sC)?y)y{4A-FWA%_uhQ>?f2h+pAZ57JAGirU;qFB literal 0 HcmV?d00001 diff --git a/app/images/uniqlo_logo.png b/app/images/uniqlo_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..d9c3e034f3980b6bf6b5411467e022e3c186c4b4 GIT binary patch literal 5157 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 UA7L)Qy&uR(&s_JtHZ=Bs011xn+5i9m literal 0 HcmV?d00001 diff --git a/app/index.html b/app/index.html index 5f9c500..7ea9123 100644 --- a/app/index.html +++ b/app/index.html @@ -12,6 +12,7 @@ + diff --git a/app/styles/main.css b/app/styles/main.css index ae7a83f..2c3d8ef 100644 --- a/app/styles/main.css +++ b/app/styles/main.css @@ -1,79 +1,57 @@ /* Space out content a bit */ body { - padding-top: 20px; - padding-bottom: 20px; -} -/* Everything but the jumbotron gets side spacing for mobile first views */ -.header, -.marketing, -.footer { - padding-left: 15px; - padding-right: 15px; } - -/* Custom page header */ -.header { - border-bottom: 1px solid #e5e5e5; +#tship-container{ + border-left: 1px solid #dcdcdc; + border-right: 1px solid #dcdcdc; } -/* Make the masthead heading the same height as the navigation */ -.header h3 { - margin-top: 0; - margin-bottom: 0; - line-height: 40px; - padding-bottom: 19px; +/*HEADER*/ +header{ + border-bottom: 1px solid #dcdcdc; } - -/* Custom page footer */ -.footer { - padding-top: 19px; - color: #777; - border-top: 1px solid #e5e5e5; +header .logo{ + color: #ed1d24; + font-size: 30px; + text-transform: uppercase; + font-weight: bold; } - -/* Customize container */ -@media (min-width: 768px) { - .container { - max-width: 730px; - } +header .logo img{ + width: 60px; } -.container-narrow > hr { - margin: 30px 0; +/*NAVIGATION*/ +nav{ + border-bottom: 1px solid #dcdcdc; } - -/* Main marketing message and sign up button */ -.jumbotron { - text-align: center; - border-bottom: 1px solid #e5e5e5; +nav h2{ + font-size: 24px; } -.jumbotron .btn { - font-size: 21px; - padding: 14px 24px; +nav ul{ + list-style: none; + padding-left: 0; } - -/* Supporting marketing content */ -.marketing { - margin: 40px 0; +nav ul li{ + margin-left: 2px; + float: left; + padding: 6px 12px; + background-color: #999999; } -.marketing p + h4 { - margin-top: 28px; +nav ul li a{ + color: #ffffff; +} +nav ul li.action{ + color: #ffffff; + background-color: #ed1d24; +} +/* 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 */ - .header, - .marketing, - .footer { - padding-left: 0; - padding-right: 0; - } - /* Space out the masthead */ - .header { - margin-bottom: 30px; - } - /* Remove the bottom border on the jumbotron for visual effect */ - .jumbotron { - border-bottom: 0; - } + } diff --git a/app/views/main.html b/app/views/main.html index 7041395..510815d 100644 --- a/app/views/main.html +++ b/app/views/main.html @@ -1,4 +1,45 @@ -

+
+
+ +
+ +
+
+ +
- OK -

\ No newline at end of file + + + + diff --git a/bower.json b/bower.json index 31435d3..f892410 100644 --- a/bower.json +++ b/bower.json @@ -11,7 +11,8 @@ "angular-resource": "1.2.11", "angular-cookies": "~1.5.9", "angular-sanitize": "1.2.11", - "angular-route": "~1.5.9" + "angular-route": "~1.5.9", + "FortAwesome/Font-Awesome": "*" }, "devDependencies": { "angular-mocks": "1.2.11", diff --git a/package.json b/package.json index 3d729bc..b3ce2d0 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "grunt-usemin": "~2.0.0", "jshint-stylish": "~0.1.3", "load-grunt-tasks": "~0.2.0", + "nodemon": "^1.11.0", "time-grunt": "~0.2.1" }, "engines": { -- 1.8.5.3