Skip to content
Browse files

Merge branch 'develop' of http://github.com/Th0ar/zjforum into develop

  • Loading branch information...
2 parents 801e3a0 + d272f61 commit f7288adcbbd500492112127da8888468abf3ebe5 @ranxian committed
Showing with 10 additions and 3 deletions.
  1. +8 −1 app/views/home/index.html.slim
  2. +2 −2 app/views/posts/show.html.slim
View
9 app/views/home/index.html.slim
@@ -6,6 +6,7 @@
padding: 5px;
background-color: #FFFFFF;
box-shadow: 0px 1px 4px #555;
+ position: relative;
.carousel-caption {
padding: 10px 15px;
h4 {
@@ -26,6 +27,11 @@
}
}
}
+ .manage {
+ position: absolute;
+ right: 5px;
+ bottom: 5px;
+ }
}
.red-block {
.red-ribbon {
@@ -100,8 +106,9 @@
p = pic.description
a.carousel-control.left href="#Carousel" data-slide="prev" ‹
a.carousel-control.right href="#Carousel" data-slide="next" ›
+ = link_to bigpics_path, class: 'manage' do
+ i.icon-pencil
- = link_to "管理首页大图", bigpics_path
.row
.span5.red-block
.red-ribbon
View
4 app/views/posts/show.html.slim
@@ -75,12 +75,12 @@ ul.comments.unstyled
= image_tag comment.author.avatar, width: '50', height: '50', class: 'pull-left' if comment.author
div style="margin-left: 60px;"
p
- small.author = comment.author.name
+ small.author = comment.author.name
|   
small.time = beautify_time(comment.created_at) if comment.created_at
== comment.content
li.comment.cmt-form
- = image_tag(current_user.avatar, width: '50', height: '50', class: 'pull-left')
+ = image_tag(current_user.avatar, width: '50', height: '50', class: 'pull-left') if current_user
= form_for @comment, url: comment_post_path do |f|
= f.text_area :content, rows: 3, placeholder: '回复'
button type="submit" class="btn btn-primar-0-y" 回复

0 comments on commit f7288ad

Please sign in to comment.
Something went wrong with that request. Please try again.