diff options
| -rw-r--r-- | railties/guides/assets/stylesheets/syntaxhighlighter/shThemeRailsGuides.css | 2 | ||||
| -rw-r--r-- | railties/guides/rails_guides/generator.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeRailsGuides.css b/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeRailsGuides.css index d8d998136f..6d2edb2eb8 100644 --- a/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeRailsGuides.css +++ b/railties/guides/assets/stylesheets/syntaxhighlighter/shThemeRailsGuides.css @@ -4,6 +4,8 @@ .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; diff --git a/railties/guides/rails_guides/generator.rb b/railties/guides/rails_guides/generator.rb index 03d23976a0..0a2170a09e 100644 --- a/railties/guides/rails_guides/generator.rb +++ b/railties/guides/rails_guides/generator.rb @@ -224,7 +224,7 @@ module RailsGuides <notextile> <div class="code_container"> <pre class="brush: #{brush}; gutter: false; toolbar: false"> -#{ERB::Util.h($2).chomp} +#{ERB::Util.h($2).strip} </pre> </div> </notextile> |