Merge branch 'MDL-38874_master' of git://github.com/lazydaisy/moodle

Conflicts: theme/bootstrap/style/generated.css
moodle · Apr 21, 2013 · 9fdb1c1 · 9fdb1c1
2 parents 16d795a + 232affc
commit 9fdb1c1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/theme/bootstrap/less/moodle/forms.less b/theme/bootstrap/less/moodle/forms.less
@@ -11,6 +11,12 @@ form {
 .mform fieldset .advancedbutton {
     text-align: right;
 }
+.jsenabled .mform .containsadvancedelements .advanced {
+	display: none;
+}
+.mform .containsadvancedelements .advanced.show {
+	display: block;
+}
 .mform fieldset.group {
     margin-bottom: 0
 }
@@ -169,9 +175,8 @@ div.backup-section + form,
     padding-left: 0;
 }
 .path-admin .buttons,
-.form-buttons {
+.form-buttons { // Add back the padding it would usually get from being inside a .form-horizontal.
     padding-left: @horizontalComponentOffset;
-    // Add back the padding it would usually get from being inside a .form-horizontal.
 }
 
 .form-item .form-setting .form-checkbox.defaultsnext {
@@ -317,5 +322,7 @@ input[type="checkbox"] {
     margin-top: 5px;
 }
 div#dateselector-calendar-panel {
-    z-index: 3100; /* Set higher than the z-index of the filemanager - see MDL-39047. */
+    z-index: 3100; /* Set higher than the z-index of the filemanager - see MDL-39047.
+    */
 }
+
diff --git a/theme/bootstrap/style/generated.css b/theme/bootstrap/style/generated.css