summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorjessib <jessib@leap.se>2013-01-14 11:50:54 -0800
committerjessib <jessib@leap.se>2013-01-14 11:50:54 -0800
commitc2f232d994b3ee01ff9d50da1e4f3798df2136f3 (patch)
tree5b7a11e9aed58357d2a38b248b965cd936de6888 /app/assets/stylesheets
parentd81bf00ecd8bdfcddf50e4881428c917253326fe (diff)
parentee2ea4ac8f4c6b0c3b09be6ed49e7a1faec7a9c1 (diff)
Merge branch 'master' into feature/show_user. Added new tests.
Conflicts: users/test/functional/users_controller_test.rb
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/application.scss17
-rw-r--r--app/assets/stylesheets/head.scss3
-rw-r--r--app/assets/stylesheets/tail.scss3
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
+//