update with changes from Production branch

2014-02-17 12:05:39 -05:00
parent 5b640cf9d8
commit a4937fb2e5
384 changed files with 14690 additions and 2242 deletions
--- a/app/assets/stylesheets/sidebar.css
+++ b/app/assets/stylesheets/sidebar.css
@@ -0,0 +1,28 @@
+.affix-top,.affix{
+	position: static;
+}
+
+#bootstrap-sidebar {
+  background-color: #eee;
+  border: 1px solid #bbb;
+  border-radius: 5px;
+  padding: 2px 0;
+}
+
+#bootstrap-sidebar li a:hover {
+  background-color: #fafafa;
+}
+
+#bootstrap-sidebar li.active {
+  border:0 #666 solid;
+  border-right-width:4px;
+}
+
+@media (min-width: 979px) {
+  #bootstrap-sidebar.affix-top, #bootstrap-sidebar.affix {
+    position: fixed;
+    top:90px;
+    width:228px;
+  }
+}
+