diff options
| author | jessib <jessib@leap.se> | 2013-07-08 11:30:35 -0700 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2013-07-08 11:30:35 -0700 |
| commit | fc3c5994df61de04b8b17b495a638efc0d760126 (patch) | |
| tree | 644aa93dfd0a6da2ed9b20ba688712fb9082f425 /app/assets/stylesheets/application.scss | |
| parent | cfb9e1d4c2e954222b77c4dd11e06ae3a0092be5 (diff) | |
| parent | 3113f8b814417a896ad5340fda88927733f8ab22 (diff) | |
Merge branch 'master' into feature/disable_account
Conflicts:
users/app/controllers/users_controller.rb
users/app/helpers/users_helper.rb
users/app/views/users/edit.html.haml
users/app/views/users/show.html.haml
users/config/locales/en.yml
Diffstat (limited to 'app/assets/stylesheets/application.scss')
| -rw-r--r-- | app/assets/stylesheets/application.scss | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 25e854e..28206b1 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,29 +1,24 @@ // // import custom scss, content to be set in deployment. // -@import "tail"; +@import "head"; // First import journal variables -@import "bootswatch/cerulean/variables"; +// @import "bootswatch/cerulean/variables"; // // import bootstrap. // @import "bootstrap"; -body { padding-top: 60px; } - @import "bootstrap-responsive"; -table.table-hover .btn { - opacity: 0; -} -table.table-hover tr:hover .btn { - opacity: 1; -} -@import "bootstrap-editable"; +// +// LEAP web app specific overrides +// +@import "leap"; // And finally bootswatch style itself -@import "bootswatch/cerulean/bootswatch"; +// @import "bootswatch/cerulean/bootswatch"; // // import custom scss, content to be set in deployment. |