Merge branch 'master' into pocorate

2015-02-03 11:19:50 -08:00
parent 4362aa4c26 44af22b968
commit 448af7458f
3 changed files with 6734 additions and 6596 deletions
@@ -2078,6 +2078,13 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
 	background-color: $item_colour;
 }

+nav ul li .undefined, 
+nav ul li .notify-seen,
+nav ul li .notify-unseen
+ {
+    max-height: 3rem;
+}
+
 /* bootstrap overrides */

 blockquote {