Merge branch 'MDL-45076-25' of git://github.com/FMCorz/moodle into MO…

…ODLE_25_STABLE Conflicts: theme/bootstrapbase/style/moodle.css
moodle · Apr 16, 2014 · 58eea2b · 58eea2b
2 parents 0f2e18f + e969f5f
commit 58eea2b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/theme/bootstrapbase/less/moodle/user.less b/theme/bootstrapbase/less/moodle/user.less
@@ -54,18 +54,23 @@
     text-align: left;
     padding: 4px;
 }
-.userlist table.controls {
-    width: 100%;
-}
-.userlist table.controls tr {
-    vertical-align: top;
-}
-.userlist table.controls td.right,
-.userlist table.controls td.left {
-    padding: 4px;
-}
-.userlist table.controls .right {
-    text-align: right;
+.userlist {
+    table.controls {
+        width: 100%;
+        tr {
+            vertical-align: top;
+        }
+        .right {
+            text-align: right;
+        }
+        .groupselector {
+            margin-bottom: 0;
+            margin-top: 0;
+            label {
+                display: block;
+            }
+        }
+    }
 }
 .userinfobox {
     width: 100%;

diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css