diff options
| author | mo k <mo@mokhan.ca> | 2012-08-25 18:27:03 -0600 |
|---|---|---|
| committer | mo k <mo@mokhan.ca> | 2012-08-25 18:27:03 -0600 |
| commit | a127eef9ee5631ece89268629512060c2176bbb8 (patch) | |
| tree | 5a462b5bf518eab2998a14e2bb98df8ab7ae5600 | |
| parent | 0cefbfee9d12cf2bdb5f99e5f49b47d2971bc6d2 (diff) | |
add bootswatch styles to application.css
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.css | 13 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.css.scss | 5 |
3 files changed, 6 insertions, 13 deletions
@@ -13,3 +13,4 @@ # Ignore all logfiles and tempfiles. /log/*.log /tmp +.sass-cache diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css deleted file mode 100644 index 3192ec8..0000000 --- a/app/assets/stylesheets/application.css +++ /dev/null @@ -1,13 +0,0 @@ -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, - * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. - * - * 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_tree . - */ diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss new file mode 100644 index 0000000..081c605 --- /dev/null +++ b/app/assets/stylesheets/application.css.scss @@ -0,0 +1,5 @@ +@import "bootswatch/cerulean/variables"; +@import "bootstrap"; +body { padding-top: 60px; } +@import "bootstrap-responsive"; +@import "bootswatch/cerulean/bootswatch"; |