Browse files

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

  • Loading branch information...
2 parents 07cafd4 + f7288ad commit c5099f7495d1f0306ad0d1574f57e0b87ad08f47 @liudangyi liudangyi committed Oct 28, 2012
Showing with 3 additions and 3 deletions.
  1. +1 −1 app/controllers/posts_controller.rb
  2. +2 −2 app/views/posts/show.html.slim
View
2 app/controllers/posts_controller.rb
@@ -1,5 +1,5 @@
class PostsController < ApplicationController
- before_filter :ensure_admin!, only: [:destroy, :delete_comment]
+ before_filter :ensure_admin!
# GET /posts
# GET /posts.json
def index
View
4 app/views/posts/show.html.slim
@@ -18,9 +18,9 @@
right: 0px;
}
.floor {
- font-family: 'Courier New', Times, serif;
+ font-family: sans-serif, Times, serif;
font-size: 16px;
- font-weight: bold;
+ font-weight: 0;
position: absolute;
top: 10px;
right: 25px;

0 comments on commit c5099f7

Please sign in to comment.