summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-12-07 08:28:23 +0100
committerAzul <azul@leap.se>2012-12-07 08:28:23 +0100
commit1ec55c4f562a4fdd57c50077ff286ef08e9978a1 (patch)
tree16203d2ca4f32e24d38fef6062aa9534cecb3bfe /app/assets
parenteffa6b0f84cfe954cc9dd73f592663b743b0d857 (diff)
parenta3dce077881c7e97090e5e560b1fb004952d5b23 (diff)
Merge branch 'develop'
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/application.js3
-rw-r--r--app/assets/stylesheets/application.scss13
2 files changed, 16 insertions, 0 deletions
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index a0b89db..f7ca1ec 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -15,3 +15,6 @@
//= require srp
//= require users
//= require_tree .
+//= require bootstrap
+//= require rails.validations
+//= require rails.validations.simple_form
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index cbd46a7..8dec07d 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -1 +1,14 @@
@import "bootstrap";
+body {
+ padding: 40px;
+}
+@import "bootstrap-responsive";
+
+
+table.table-hover .btn {
+ opacity: 0;
+}
+
+table.table-hover tr:hover .btn {
+ opacity: 1;
+}