diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css.erb similarity index 64% rename from app/assets/stylesheets/application.css rename to app/assets/stylesheets/application.css.erb index 4e3e0d4..07d62bd 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css.erb @@ -2,9 +2,10 @@ * This is a manifest file that'll automatically include all the stylesheets available in this directory * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at * the top of the compiled file, but it's generally better to create a new file per style scope. - *= require_self - *= require web_app_theme + *= require web-app-theme/base + *= require web-app-theme/themes/default/style.css *= require active_scaffold + *= require_self */ #main .block .content h2 { @@ -14,3 +15,9 @@ #main .block .content .active-scaffold-header h2 { font-size: 200%; } + +.flash .alert { + border: 1px solid #bb9004; + background: #f9c006 url("<%= asset_path("web-app-theme/themes/default/images/messages/warning.png") %>") no-repeat 10px center; +} + diff --git a/app/assets/stylesheets/web_app_theme.css b/app/assets/stylesheets/web_app_theme.css deleted file mode 100644 index 19b7668..0000000 --- a/app/assets/stylesheets/web_app_theme.css +++ /dev/null @@ -1,14 +0,0 @@ -/* - * This css will include all web-app-theme css you need - * - *= require web-app-theme/base - *= require web-app-theme/themes/default/style.css - *= require_self - */ - -/* Write here your css for overriding the theme's rules */ - -.flash .alert { - border: 1px solid #e0d300; - background-color: #ffffcc; -}