diff options
Diffstat (limited to 'railties')
-rw-r--r-- | railties/guides/assets/stylesheets/main.css | 12 | ||||
-rw-r--r-- | railties/guides/assets/stylesheets/syntaxhighlighter/shThemeRailsGuides.css | 13 | ||||
-rw-r--r-- | railties/guides/rails_guides/generator.rb | 4 |
3 files changed, 16 insertions, 13 deletions
diff --git a/railties/guides/assets/stylesheets/main.css b/railties/guides/assets/stylesheets/main.css index 611fb6b7e0..932ee402c4 100644 --- a/railties/guides/assets/stylesheets/main.css +++ b/railties/guides/assets/stylesheets/main.css @@ -23,8 +23,12 @@ dl { margin: 0 0 1.5em 0; } dl dt { font-weight: bold; } dd { margin-left: 1.5em;} -pre,code { margin: 1.5em 0; overflow: auto; color: #333;} -pre,code,tt { font: 1em 'Anonymous Pro', 'Inconsolata', 'Menlo', 'Consolas', 'Andale Mono', 'Lucida Console', monospace; line-height: 1.5; } +pre,code { margin: 1.5em 0; overflow: auto; color: #222;} +pre,code,tt { + font-size: 1em; + font-family: "Anonymous Pro", "Inconsolata", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace; + line-height: 1.5; +} abbr, acronym { border-bottom: 1px dotted #666; } address { margin: 0 0 1.5em; font-style: italic; } @@ -361,10 +365,6 @@ h6 { font-weight: normal; } -tt { - font-family: monaco, "Bitstream Vera Sans Mono", "Courier New", courier, monospace; -} - div.code_container { background: #EEE url(../images/tab_grey.gif) no-repeat left top; padding: 0.25em 1em 0.5em 48px; diff --git a/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeRailsGuides.css b/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeRailsGuides.css index c36a4bd2ba..6d2edb2eb8 100644 --- a/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeRailsGuides.css +++ b/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeRailsGuides.css @@ -3,6 +3,9 @@ */ .syntaxhighlighter { background-color: #eee !important; + font-family: "Anonymous Pro", "Inconsolata", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace !important; + overflow-y: hidden !important; + overflow-x: auto !important; } .syntaxhighlighter .line.alt1 { background-color: #eee !important; @@ -17,7 +20,7 @@ color: #eee !important; } .syntaxhighlighter table caption { - color: #333 !important; + color: #222 !important; } .syntaxhighlighter .gutter { color: #787878 !important; @@ -58,7 +61,7 @@ color: red !important; } .syntaxhighlighter .plain, .syntaxhighlighter .plain a { - color: #333 !important; + color: #222 !important; } .syntaxhighlighter .comments, .syntaxhighlighter .comments a { color: #708090 !important; @@ -74,7 +77,7 @@ color: #646464 !important; } .syntaxhighlighter .variable { - color: #333 !important; + color: #222 !important; } .syntaxhighlighter .value { color: #009900 !important; @@ -86,14 +89,14 @@ color: #0066cc !important; } .syntaxhighlighter .script { - color: #333 !important; + color: #222 !important; background-color: none !important; } .syntaxhighlighter .color1, .syntaxhighlighter .color1 a { color: gray !important; } .syntaxhighlighter .color2, .syntaxhighlighter .color2 a { - color: #333 !important; + color: #222 !important; font-weight: bold !important; } .syntaxhighlighter .color3, .syntaxhighlighter .color3 a { diff --git a/railties/guides/rails_guides/generator.rb b/railties/guides/rails_guides/generator.rb index 22d402ad21..0a2170a09e 100644 --- a/railties/guides/rails_guides/generator.rb +++ b/railties/guides/rails_guides/generator.rb @@ -223,8 +223,8 @@ module RailsGuides code_blocks.push(<<HTML) <notextile> <div class="code_container"> -<pre class="brush: #{brush}; gutter: false"> -#{ERB::Util.h($2).chomp} +<pre class="brush: #{brush}; gutter: false; toolbar: false"> +#{ERB::Util.h($2).strip} </pre> </div> </notextile> |