diff options
| author | wycats <wycats@gmail.com> | 2010-03-10 13:28:52 -0800 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-03-10 13:28:52 -0800 |
| commit | 4745b53bcda400cf2e8cb4f2c0bf068f6d13c0e5 (patch) | |
| tree | 6f080f704435d22dbfee6ffd454529c12e5bb505 /railties | |
| parent | 7b622786fcc5046a06989ec7a3cbf46f92e04dea (diff) | |
| parent | 84f6da45a19d335be320991cab44f492f61dc5c7 (diff) | |
| download | rails-4745b53bcda400cf2e8cb4f2c0bf068f6d13c0e5.tar.gz rails-4745b53bcda400cf2e8cb4f2c0bf068f6d13c0e5.tar.bz2 rails-4745b53bcda400cf2e8cb4f2c0bf068f6d13c0e5.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/generators/erb/scaffold/templates/layout.html.erb | 1 | ||||
| -rw-r--r-- | railties/lib/generators/rails/stylesheets/templates/scaffold.css | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/railties/lib/generators/erb/scaffold/templates/layout.html.erb b/railties/lib/generators/erb/scaffold/templates/layout.html.erb index 420d17f33c..3f64be0c45 100644 --- a/railties/lib/generators/erb/scaffold/templates/layout.html.erb +++ b/railties/lib/generators/erb/scaffold/templates/layout.html.erb @@ -9,6 +9,7 @@ <body> <p class="notice"><%%= notice %></p> +<p class="alert"><%%= alert %></p> <%%= yield %> diff --git a/railties/lib/generators/rails/stylesheets/templates/scaffold.css b/railties/lib/generators/rails/stylesheets/templates/scaffold.css index de6669ad9e..ea3dc9b8b5 100644 --- a/railties/lib/generators/rails/stylesheets/templates/scaffold.css +++ b/railties/lib/generators/rails/stylesheets/templates/scaffold.css @@ -24,6 +24,10 @@ div.field, div.actions { color: green; } +.alert { + color: red; +} + .fieldWithErrors { padding: 2px; background-color: red; |