diff options
| author | Azul <azul@leap.se> | 2013-01-14 20:11:49 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2013-01-14 20:11:49 +0100 |
| commit | 8445e6b1a026c8f15fffae7544b84407e9bbce1b (patch) | |
| tree | 859adf3bac117389595460916f45cfeab49f58cb /app/assets | |
| parent | f75005e1bc15101f37d377b7ed06f877dc206ee0 (diff) | |
| parent | ee2ea4ac8f4c6b0c3b09be6ed49e7a1faec7a9c1 (diff) | |
Merge branch 'master' into feature/fixing-routes-with-api
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/stylesheets/application.scss | 17 | ||||
| -rw-r--r-- | app/assets/stylesheets/head.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/tail.scss | 3 |
3 files changed, 19 insertions, 4 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index cb5fa1b..bb3b8bc 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,16 +1,25 @@ +// +// import custom scss, content to be set in deployment. +// +@import "tail"; + +// +// import bootstrap. +// @import "bootstrap"; body { padding: 40px; } @import "bootstrap-responsive"; - - table.table-hover .btn { opacity: 0; } - table.table-hover tr:hover .btn { opacity: 1; } +@import "bootstrap-editable"; -@import "bootstrap-editable";
\ No newline at end of file +// +// import custom scss, content to be set in deployment. +// +@import "tail"; diff --git a/app/assets/stylesheets/head.scss b/app/assets/stylesheets/head.scss new file mode 100644 index 0000000..431565f --- /dev/null +++ b/app/assets/stylesheets/head.scss @@ -0,0 +1,3 @@ +// +// put custom scss here that goes before all the others +// diff --git a/app/assets/stylesheets/tail.scss b/app/assets/stylesheets/tail.scss new file mode 100644 index 0000000..541c2df --- /dev/null +++ b/app/assets/stylesheets/tail.scss @@ -0,0 +1,3 @@ +// +// put custom scss here that goes after all the others +// |