Merge branch 'favicon_feature'

This commit is contained in:
yafeilee 2014-04-02 15:43:56 +08:00
commit 4dfe7a4bdb
5 changed files with 4 additions and 2 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.3 KiB

View File

@ -6,10 +6,12 @@ html
= yield(:meta) = yield(:meta)
title title
= content_for?(:title) ? yield(:title) + " | #{ENV['SITE_NAME']}" : ENV['SITE_NAME'] = content_for?(:title) ? yield(:title) + " | #{ENV['SITE_NAME']}" : ENV['SITE_NAME']
= stylesheet_link_tag "application" = stylesheet_link_tag "application", media: 'all'
= javascript_include_tag "vendor/modernizr" = javascript_include_tag "vendor/modernizr"
= javascript_include_tag "application" = javascript_include_tag "application"
= csrf_meta_tags = csrf_meta_tags
/ 增加 favico 图标
link href="/favicon.png" type='image/png' rel="icon"
body body
.off-canvas-wrap .off-canvas-wrap
.inner-wrap .inner-wrap

View File

@ -30,5 +30,5 @@ WBlog::Application.routes.draw do
end end
get '/about' => 'home#index' get '/about' => 'home#index'
get '/:type' => 'archives#index' get '/:type' => 'archives#index', constraints: { type: /tech|life|creator/ }
end end

View File

BIN
public/favicon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.8 KiB