diff options
| author | azul <azul@riseup.net> | 2013-07-06 07:51:54 -0700 |
|---|---|---|
| committer | azul <azul@riseup.net> | 2013-07-06 07:51:54 -0700 |
| commit | a18efa42ddc1cf8692d55f76ca3e92792913f40d (patch) | |
| tree | 00527737a38bdafcd2e175bb6caf5e30b3360de1 /app/assets/stylesheets/application.scss | |
| parent | d03e82b4df5075f796f56fb9568992b0ba0d7c07 (diff) | |
| parent | dc98ad8c6445182d60b3f1909e0260ace6fbfca5 (diff) | |
Merge pull request #55 from elijh/feature/new-ui
Feature/new ui
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. |