Merge branch 'master' into feature/unauthenticated_tickets

Conflicts:
	help/app/views/tickets/_comment.html.haml
	help/app/views/tickets/_new_comment.html.haml

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
+//