Merge branch 'master' of gitproxy:rails/rails

2026-04-26 03:00:59 -04:00 · 2010-04-10 10:55:19 +02:00
parent cd79a46174 5087b831a0
commit 2f79c5b485
2 changed files with 414 additions and 457 deletions
--- a/railties/guides/assets/stylesheets/main.css
+++ b/railties/guides/assets/stylesheets/main.css
@@ -437,7 +437,7 @@ div.code_container, div.important, div.caution, div.warning, div.note, div.info
 /* Remove bottom margin of paragraphs in special boxes, otherwise they get a
 spurious blank area below with the box background. */
 div.important p, div.caution p, div.warning p, div.note p, div.info p {
-    margin-bottom: 0px;
+    margin-bottom: 1em;
 }

 /* Edge Badge
--- a/railties/guides/source/routing.textile
+++ b/railties/guides/source/routing.textile