Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move Darkfish css files under ./css directory #335

Merged
merged 1 commit into from Dec 7, 2014
Merged

Move Darkfish css files under ./css directory #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Manifest.txt
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions lib/rdoc/generator/darkfish.rb
View file
Open in desktop
Expand Up @@ -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
]

##
Expand Down
4 changes: 2 additions & 2 deletions lib/rdoc/generator/template/darkfish/_head.rhtml
View file
Open in desktop
Expand Up @@ -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">
Expand Down
0 ...doc/generator/template/darkfish/fonts.css → ...generator/template/darkfish/css/fonts.css
View file
Open in desktop
File renamed without changes.
0 ...rdoc/generator/template/darkfish/rdoc.css → .../generator/template/darkfish/css/rdoc.css
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions test/test_rdoc_generator_darkfish.rb
View file
Open in desktop
Expand Up @@ -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'
Expand Down