summaryrefslogtreecommitdiffstats
path: root/lib/rdoc/generators
diff options
context:
space:
mode:
authordave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-05-26 05:02:55 +0000
committerdave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-05-26 05:02:55 +0000
commit954f6463f9691f024de02b32744441309eb451b5 (patch)
tree54f5fcc84da211510a05d89feb26afd3924fbf9d /lib/rdoc/generators
parent8798fe586c9732c3375a60dc2fe1638354f16ac7 (diff)
downloadruby-954f6463f9691f024de02b32744441309eb451b5.tar.gz
ruby-954f6463f9691f024de02b32744441309eb451b5.tar.xz
ruby-954f6463f9691f024de02b32744441309eb451b5.zip
Allow "do" after "for". Fix up css for standalone code window
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6407 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc/generators')
-rw-r--r--lib/rdoc/generators/html_generator.rb2
-rw-r--r--lib/rdoc/generators/template/html/html.rb13
2 files changed, 6 insertions, 9 deletions
diff --git a/lib/rdoc/generators/html_generator.rb b/lib/rdoc/generators/html_generator.rb
index ef0895106..754deb9f7 100644
--- a/lib/rdoc/generators/html_generator.rb
+++ b/lib/rdoc/generators/html_generator.rb
@@ -964,7 +964,7 @@ module Generators
values = {
'title' => CGI.escapeHTML(index_name),
'code' => code_body,
- 'style_url' => style_url(path, @options.css),
+ 'style_url' => style_url(file_path, @options.css),
'charset' => @options.charset
}
template.write_html_on(f, values)
diff --git a/lib/rdoc/generators/template/html/html.rb b/lib/rdoc/generators/template/html/html.rb
index 41f9f4b27..e0a888000 100644
--- a/lib/rdoc/generators/template/html/html.rb
+++ b/lib/rdoc/generators/template/html/html.rb
@@ -187,7 +187,9 @@ div.method-source-code {
div.method-source-code pre { color: #ffdead; overflow: hidden; }
/* --- Ruby keyword styles --------------------- */
-/* (requires a hacked html_generator.rb to add more class-types) */
+
+.standalone-code { background: #221111; color: #ffdead; overflow: hidden; }
+
.ruby-constant { color: #7fffd4; background: transparent; }
.ruby-keyword { color: #00ffff; background: transparent; }
.ruby-ivar { color: #eedd82; background: transparent; }
@@ -561,18 +563,13 @@ BODY = HEADER + %{
#####################################################################
SRC_PAGE = XHTML_PREAMBLE + %{
-<!--
-
- %title%
-
- -->
<html>
<head>
<title>%title%</title>
<meta http-equiv="Content-Type" content="text/html; charset=%charset%" />
- <link rel="stylesheet" href="http://www.FaerieMUD.org/stylesheets/rdoc.css" type="text/css" />
+ <link rel="stylesheet" href="%style_url%" type="text/css" media="screen" />
</head>
-<body>
+<body class="standalone-code">
<pre>%code%</pre>
</body>
</html>