Merge pull request #79 from ruedap/staging

Clean-up assets
ruedap · Jan 6, 2015 · 375dede · 375dede
2 parents 1e6b269 + 903e0b0
commit 375dede
Show file tree

Hide file tree

Showing 42 changed files with 4 additions and 14 deletions.
diff --git a/app/assets/images/favicon-000.ico b/app/assets/images/favicon-000.ico
diff --git a/app/assets/images/favicon-020.ico b/app/assets/images/favicon-020.ico
diff --git a/app/assets/images/favicon-040.ico b/app/assets/images/favicon-040.ico
diff --git a/app/assets/images/favicon-060.ico b/app/assets/images/favicon-060.ico
diff --git a/app/assets/images/favicon-080.ico b/app/assets/images/favicon-080.ico
diff --git a/app/assets/images/favicon-100.ico b/app/assets/images/favicon-100.ico
diff --git a/app/assets/images/favicon-120.ico b/app/assets/images/favicon-120.ico
diff --git a/app/assets/images/favicon-140.ico b/app/assets/images/favicon-140.ico
diff --git a/app/assets/images/favicon-160.ico b/app/assets/images/favicon-160.ico
diff --git a/app/assets/images/favicon-180.ico b/app/assets/images/favicon-180.ico
diff --git a/app/assets/images/favicon-220.ico b/app/assets/images/favicon-220.ico
diff --git a/app/assets/images/favicon-240.ico b/app/assets/images/favicon-240.ico
diff --git a/app/assets/images/favicon-260.ico b/app/assets/images/favicon-260.ico
diff --git a/app/assets/images/favicon-280.ico b/app/assets/images/favicon-280.ico
diff --git a/app/assets/images/favicon-300.ico b/app/assets/images/favicon-300.ico
diff --git a/app/assets/images/favicon-320.ico b/app/assets/images/favicon-320.ico
diff --git a/app/assets/images/favicon-340.ico b/app/assets/images/favicon-340.ico
diff --git a/app/assets/images/favicon-200.ico → app/assets/images/favicon.ico b/app/assets/images/favicon-200.ico → app/assets/images/favicon.ico
diff --git a/app/assets/images/ogp-000.png b/app/assets/images/ogp-000.png
diff --git a/app/assets/images/ogp-020.png b/app/assets/images/ogp-020.png
diff --git a/app/assets/images/ogp-040.png b/app/assets/images/ogp-040.png
diff --git a/app/assets/images/ogp-060.png b/app/assets/images/ogp-060.png
diff --git a/app/assets/images/ogp-080.png b/app/assets/images/ogp-080.png
diff --git a/app/assets/images/ogp-100.png b/app/assets/images/ogp-100.png
diff --git a/app/assets/images/ogp-120.png b/app/assets/images/ogp-120.png
diff --git a/app/assets/images/ogp-140.png b/app/assets/images/ogp-140.png
diff --git a/app/assets/images/ogp-160.png b/app/assets/images/ogp-160.png
diff --git a/app/assets/images/ogp-180.png b/app/assets/images/ogp-180.png
diff --git a/app/assets/images/ogp-220.png b/app/assets/images/ogp-220.png
diff --git a/app/assets/images/ogp-240.png b/app/assets/images/ogp-240.png
diff --git a/app/assets/images/ogp-260.png b/app/assets/images/ogp-260.png
diff --git a/app/assets/images/ogp-280.png b/app/assets/images/ogp-280.png
diff --git a/app/assets/images/ogp-300.png b/app/assets/images/ogp-300.png
diff --git a/app/assets/images/ogp-320.png b/app/assets/images/ogp-320.png
diff --git a/app/assets/images/ogp-340.png b/app/assets/images/ogp-340.png
diff --git a/app/assets/images/ogp-200.png → app/assets/images/ogp.png b/app/assets/images/ogp-200.png → app/assets/images/ogp.png
diff --git a/app/assets/images/ruedapcom-logo.svg b/app/assets/images/ruedapcom-logo.svg
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,11 +1,4 @@
 class ApplicationController < ActionController::Base
   include StagingGuard
   protect_from_forgery with: :exception
-  before_action :set_hue
-
-  private
-
-  def set_hue
-    @hue = "%03d" % (rand(18) * 20)
-  end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -20,7 +20,7 @@ def blog_author
   end
 
   def blog_ogp_image
-    image_url("ogp-#{@hue}.png")
+    image_url("ogp.png")
   end
 
   private

diff --git a/app/helpers/articles_helper.rb b/app/helpers/articles_helper.rb
@@ -1,5 +1,5 @@
 module ArticlesHelper
-  def generate_article_list(articles)
+  def article_list(articles)
     content_tag :ul, class: 'ArticleList' do
       article_year = ''
       articles.each do |a|

diff --git a/app/views/articles/index.html.slim b/app/views/articles/index.html.slim
@@ -1,6 +1,4 @@
 = content_for :itemtype
   = 'http://schema.org/WebPage'
-= content_for :gradient
-  == stylesheet_link_tag "gradient-#{@hue}", media: 'all'
 
-== generate_article_list(@articles)
+== article_list(@articles)
diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
@@ -12,7 +12,7 @@ html(lang='ja' itemscope itemtype="#{yield :itemtype}")
     == stylesheet_link_tag 'application', media: 'all'
     == javascript_include_tag 'application'
     == csrf_meta_tags
-    == favicon_link_tag "favicon-#{@hue}.ico"
+    == favicon_link_tag "favicon.ico"
     link rel='apple-touch-icon-precomposed' href="#{blog_ogp_image}"
     link rel='alternate' href='/feed' title="#{blog_title}" type='application/atom+xml'
     - if content_for? :canonical