diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-10-24 19:28:28 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-10-24 19:28:28 +0200 |
| commit | cdce5fc8860982afa63bfa82f6a752972e7f7d19 (patch) | |
| tree | 20872a3e1eebcd147198bbafca7f78fcc13cb52d | |
| parent | 5e0e77fc12445c7dddc6a2b3c2fa4a26929ec398 (diff) | |
| download | rails-cdce5fc8860982afa63bfa82f6a752972e7f7d19.tar.gz rails-cdce5fc8860982afa63bfa82f6a752972e7f7d19.tar.bz2 rails-cdce5fc8860982afa63bfa82f6a752972e7f7d19.zip | |
ensures that no browser shows a vertical scrollbar in the code blocks of guides, thanks to Marcelino Llano for a hint to fix this
| -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> |