Merge remote-tracking branch 'upstream/master' into ribbons

2014-03-13 06:36:39 -07:00
parent 55eb408d18 1c91ac9062
commit 196a9b11c2
77 changed files with 1575 additions and 1480 deletions
@@ -330,6 +330,10 @@ h1 .imageLink {
    height: 30px;
 }

+.activeDevicesCollapsible .ui-collapsible-content {
+    padding: .5em .5em !important;
+}
+
@media all and (min-width: 450px) {

    .currentUsername {