diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2010-11-27 11:31:17 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2010-11-27 11:31:17 +0000 |
| commit | 3a7f43ca6ecf1735e1a82d4a68ac8f62b5cf2fcf (patch) | |
| tree | 4960911c58f2c47ecaf4f4579167270ba9c257a7 /railties/guides/assets | |
| parent | 1bc90044b655572a4b8aa3b323905e26d37e0f2b (diff) | |
| parent | fd83f9d51583c080072dc9fd00f02ad742e265d4 (diff) | |
| download | rails-3a7f43ca6ecf1735e1a82d4a68ac8f62b5cf2fcf.tar.gz rails-3a7f43ca6ecf1735e1a82d4a68ac8f62b5cf2fcf.tar.bz2 rails-3a7f43ca6ecf1735e1a82d4a68ac8f62b5cf2fcf.zip | |
Merge branch 'master' into nested_has_many_through
Conflicts:
activerecord/CHANGELOG
activerecord/lib/active_record/associations.rb
Diffstat (limited to 'railties/guides/assets')
| -rw-r--r-- | railties/guides/assets/stylesheets/main.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/guides/assets/stylesheets/main.css b/railties/guides/assets/stylesheets/main.css index 932ee402c4..cf6e9e5cc8 100644 --- a/railties/guides/assets/stylesheets/main.css +++ b/railties/guides/assets/stylesheets/main.css @@ -333,7 +333,7 @@ h6 { padding: 0.125em 0 0.25em 28px;*/ } -#mainCol dd.ticket, #subCol dd.ticket { +#mainCol dd.work-in-progress, #subCol dd.work-in-progress { background: #fff9d8 url(../images/tab_yellow.gif) no-repeat left top; border: none; padding: 1.25em 1em 1.25em 48px; |