Merge pull request #335 from zzak/darkfish-css-to-folder

Move Darkfish css files under ./css directory
ruby · Dec 7, 2014 · 185463f · 185463f
2 parents e4eac00 + adb5c5d
commit 185463f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/Manifest.txt b/Manifest.txt
@@ -55,7 +55,7 @@ lib/rdoc/generator/template/darkfish/_sidebar_search.rhtml
 lib/rdoc/generator/template/darkfish/_sidebar_sections.rhtml
 lib/rdoc/generator/template/darkfish/_sidebar_table_of_contents.rhtml
 lib/rdoc/generator/template/darkfish/class.rhtml
-lib/rdoc/generator/template/darkfish/fonts.css
+lib/rdoc/generator/template/darkfish/css/fonts.css
 lib/rdoc/generator/template/darkfish/fonts/Lato-Light.ttf
 lib/rdoc/generator/template/darkfish/fonts/Lato-LightItalic.ttf
 lib/rdoc/generator/template/darkfish/fonts/Lato-Regular.ttf
@@ -92,7 +92,7 @@ lib/rdoc/generator/template/darkfish/js/darkfish.js
 lib/rdoc/generator/template/darkfish/js/jquery.js
 lib/rdoc/generator/template/darkfish/js/search.js
 lib/rdoc/generator/template/darkfish/page.rhtml
-lib/rdoc/generator/template/darkfish/rdoc.css
+lib/rdoc/generator/template/darkfish/css/rdoc.css
 lib/rdoc/generator/template/darkfish/servlet_not_found.rhtml
 lib/rdoc/generator/template/darkfish/servlet_root.rhtml
 lib/rdoc/generator/template/darkfish/table_of_contents.rhtml

diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb
@@ -62,14 +62,14 @@ class RDoc::Generator::Darkfish
 
   BUILTIN_STYLE_ITEMS = # :nodoc:
     %w[
-      fonts.css
+      css/fonts.css
       fonts/Lato-Light.ttf
       fonts/Lato-LightItalic.ttf
       fonts/Lato-Regular.ttf
       fonts/Lato-RegularItalic.ttf
       fonts/SourceCodePro-Bold.ttf
       fonts/SourceCodePro-Regular.ttf
-      rdoc.css
+      css/rdoc.css
   ]
 
   ##

diff --git a/lib/rdoc/generator/template/darkfish/_head.rhtml b/lib/rdoc/generator/template/darkfish/_head.rhtml
@@ -9,8 +9,8 @@
 <script src="<%= asset_rel_prefix %>/js/jquery.js"></script>
 <script src="<%= asset_rel_prefix %>/js/darkfish.js"></script>
 
-<link href="<%= asset_rel_prefix %>/fonts.css" rel="stylesheet">
-<link href="<%= asset_rel_prefix %>/rdoc.css" rel="stylesheet">
+<link href="<%= asset_rel_prefix %>/css/fonts.css" rel="stylesheet">
+<link href="<%= asset_rel_prefix %>/css/rdoc.css" rel="stylesheet">
 <% if @options.template_stylesheets.flatten.any? then %>
 <%   @options.template_stylesheets.flatten.each do |stylesheet| %>
 <link href="<%= asset_rel_prefix %>/<%= File.basename stylesheet %>" rel="stylesheet">

diff --git a/...doc/generator/template/darkfish/fonts.css → ...generator/template/darkfish/css/fonts.css b/...doc/generator/template/darkfish/fonts.css → ...generator/template/darkfish/css/fonts.css
diff --git a/...rdoc/generator/template/darkfish/rdoc.css → .../generator/template/darkfish/css/rdoc.css b/...rdoc/generator/template/darkfish/rdoc.css → .../generator/template/darkfish/css/rdoc.css
diff --git a/test/test_rdoc_generator_darkfish.rb b/test/test_rdoc_generator_darkfish.rb
@@ -76,8 +76,8 @@ def test_generate
     assert_file 'table_of_contents.html'
     assert_file 'js/search_index.js'
 
-    assert_hard_link 'rdoc.css'
-    assert_hard_link 'fonts.css'
+    assert_hard_link 'css/rdoc.css'
+    assert_hard_link 'css/fonts.css'
 
     assert_hard_link 'fonts/SourceCodePro-Bold.ttf'
     assert_hard_link 'fonts/SourceCodePro-Regular.ttf'