Merge branch 'dev' of github.com:protoshop/protoshop-web into dev

* 'dev' of github.com:protoshop/protoshop-web: About增加Build样式&增加Donate二维码
protoshop · Jun 10, 2014 · a16bf67 · a16bf67
2 parents 590dce2 + 5573f07
commit a16bf67
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/app/partials/pg-about.html b/app/partials/pg-about.html
@@ -21,6 +21,6 @@ <h3 class="box-title">Feedback</h3>
 	</div>
 	<div class="about-box">
 		<h3 class="box-title">Donate</h3>
-		<i class="fa fa-coffee"></i> <a href="https://qr.alipay.com/ap27zqsxo3v5q61z1f" title="求咖灰~~~" target="_blank">Buy me a coffee!</a> (੭ु๑‾᷄ ⁻̫ ‾᷅)੭ु⁾⁾
+		<i class="fa fa-coffee"></i> <a href="https://qr.alipay.com/ap27zqsxo3v5q61z1f" title="求咖灰~~~" target="_blank">Buy me a coffee!</a><span class="qrcode-donate"></span> (੭ु๑‾᷄ ⁻̫ ‾᷅)੭ु⁾⁾
 	</div>
 </div>
diff --git a/app/styles/main.css b/app/styles/main.css
@@ -244,10 +244,14 @@ i { font-style: normal; }
 /* About */
 .about-box { padding: 30px 0; }
 .about-box .box-title { padding: 10px 0; font-size: 28px; font-family: Microsoft Yahei, sans-serif; }
+.about-box .build-stamp { margin-left: 0.2em; line-height: 1em; font-size: 0.4em; font-weight: 100; color: #BBB; }
 .about-box p { padding: 10px 0; line-height: 1.5; font-size: 14px; }
 .about-box .about-qrcode-download { height: 200px; background: url(../images/qrcode-download.png) no-repeat -10px -10px; background-size: 200px auto; }
 .env-ctqa .about-box .about-qrcode-download { background-image: url(../images/qrcode-ctqa.png); }
 .about-box a { color: #014eb6; }
+.about-box .qrcode-donate { position: absolute; -webkit-transform: translate(-114px,-120px); transform: translate(-114px,-120px); opacity: 0; width: 120px; height: 120px; background: url(../images/qrcode-donate.png) no-repeat; background-size: contain; transition: all 200ms ease-in; }
+.about-box a:hover + .qrcode-donate { opacity: 1; }
+
 
 /* Notification */
 .notify { position: fixed; top: 0; left: 50%; margin: 10px -120px; min-width: 320px; z-index: 999; }

diff --git a/gulpfile.js b/gulpfile.js
@@ -69,7 +69,7 @@ gulp.task('server:home', function () {
 gulp.task('server:dist', function () {
   var servers = createServers('./dist', LOCAL_PORT, LIVERELOAD_PORT);
   gulp.watch(['./dist' + '/**.*'], servers.onchange);
-  open('http://localhost:9999');
+  open('http://localhost:9999/home');
 });
 
 /**