Merge branch 'tip_deal'

This commit is contained in:
yafeilee 2014-04-01 13:32:59 +08:00
commit 23f07094bf
3 changed files with 18 additions and 3 deletions

View File

@ -25,6 +25,11 @@
text-align: right;
}
.blog-over {
margin-bottom: 1rem;
margin-top: 2rem;
}
.recent-title {
border-bottom: 1px solid #dddddd;
margin-bottom: 1rem;
@ -63,6 +68,13 @@
.qrcode-wrapper {
float: right;
margin-top: -2rem;
text-align: right;
table {
float: right;
}
p {
clear: both;
}
}
.subscribe-ul {

View File

@ -12,6 +12,7 @@ p.ptag
p.ptag
| 发表于:
span #{format_date(post.created_at)}
hr.blog-over
p ng-controller="LikesController"
button.like-button ng-show="! is_liked " ng-click="submit()"
|{{ count }}
@ -21,9 +22,10 @@ p ng-controller="LikesController"
span Liked
div ng-controller = "QRCodesController"
.qrcode
span.has-tip data-tooltip="" title="使用手机继续阅读 or 帮我分享至微信朋友圈"
i.fi-link
a href="#" ng-model="qrcode" ng-init="qrcode=false" ng-click="show()" 二维码
a href="#" ng-model="qrcode" ng-init="qrcode=false" ng-click="show()"
i.fi-link
| 二维码
.social-share ng-show='qrcode'
.qrcode-wrapper
= render partial: "qrcode", locals: { str: blog_url(post) }

View File

@ -1,3 +1,4 @@
.qrcode-image
- qr = RQRCode::QRCode.new(str)
== qr.as_html
p 使用手机继续阅读 or 帮我分享至微信朋友圈