Merge branch 'tip_deal'
This commit is contained in:
commit
23f07094bf
|
@ -25,6 +25,11 @@
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.blog-over {
|
||||||
|
margin-bottom: 1rem;
|
||||||
|
margin-top: 2rem;
|
||||||
|
}
|
||||||
|
|
||||||
.recent-title {
|
.recent-title {
|
||||||
border-bottom: 1px solid #dddddd;
|
border-bottom: 1px solid #dddddd;
|
||||||
margin-bottom: 1rem;
|
margin-bottom: 1rem;
|
||||||
|
@ -63,6 +68,13 @@
|
||||||
.qrcode-wrapper {
|
.qrcode-wrapper {
|
||||||
float: right;
|
float: right;
|
||||||
margin-top: -2rem;
|
margin-top: -2rem;
|
||||||
|
text-align: right;
|
||||||
|
table {
|
||||||
|
float: right;
|
||||||
|
}
|
||||||
|
p {
|
||||||
|
clear: both;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.subscribe-ul {
|
.subscribe-ul {
|
||||||
|
|
|
@ -12,6 +12,7 @@ p.ptag
|
||||||
p.ptag
|
p.ptag
|
||||||
| 发表于:
|
| 发表于:
|
||||||
span #{format_date(post.created_at)}
|
span #{format_date(post.created_at)}
|
||||||
|
hr.blog-over
|
||||||
p ng-controller="LikesController"
|
p ng-controller="LikesController"
|
||||||
button.like-button ng-show="! is_liked " ng-click="submit()"
|
button.like-button ng-show="! is_liked " ng-click="submit()"
|
||||||
|{{ count }}
|
|{{ count }}
|
||||||
|
@ -21,9 +22,10 @@ p ng-controller="LikesController"
|
||||||
span Liked
|
span Liked
|
||||||
div ng-controller = "QRCodesController"
|
div ng-controller = "QRCodesController"
|
||||||
.qrcode
|
.qrcode
|
||||||
span.has-tip data-tooltip="" title="使用手机继续阅读 or 帮我分享至微信朋友圈"
|
a href="#" ng-model="qrcode" ng-init="qrcode=false" ng-click="show()"
|
||||||
i.fi-link
|
i.fi-link
|
||||||
a href="#" ng-model="qrcode" ng-init="qrcode=false" ng-click="show()" 二维码
|
| 二维码
|
||||||
|
|
||||||
.social-share ng-show='qrcode'
|
.social-share ng-show='qrcode'
|
||||||
.qrcode-wrapper
|
.qrcode-wrapper
|
||||||
= render partial: "qrcode", locals: { str: blog_url(post) }
|
= render partial: "qrcode", locals: { str: blog_url(post) }
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
.qrcode-image
|
.qrcode-image
|
||||||
- qr = RQRCode::QRCode.new(str)
|
- qr = RQRCode::QRCode.new(str)
|
||||||
== qr.as_html
|
== qr.as_html
|
||||||
|
p 使用手机继续阅读 or 帮我分享至微信朋友圈
|
||||||
|
|
Loading…
Reference in New Issue