Merge branch 'MDL-40975-master-fixes' of git://github.com/andrewnicol…

…s/moodle Conflicts: theme/bootstrapbase/style/moodle.css
moodle · Nov 6, 2013 · dcd02d8 · dcd02d8
2 parents 30e736c + 13a73a1
commit dcd02d8
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 21 deletions.
diff --git a/course/yui/toolboxes/toolboxes.js b/course/yui/toolboxes/toolboxes.js
@@ -344,11 +344,6 @@ YUI.add('moodle-course-toolboxes', function(Y) {
                 'id'    : Y.Moodle.core_course.util.cm.getId(activity)
             };
             var spinner = this.add_spinner(activity);
-            if (BODY.hasClass('dir-ltr')) {
-                spinner.setStyle('left', '100%');
-            }  else {
-                spinner.setStyle('right', '100%');
-            }
             this.send_request(data, spinner);
 
             // Handle removal/addition of the moveleft button.
@@ -665,6 +660,16 @@ YUI.add('moodle-course-toolboxes', function(Y) {
                 anchor.replace(editform);
                 activity.one('div').appendChild(editinstructions);
 
+                // Force the editing instruction to match the mod-indent position.
+                var padside = 'left';
+                if (right_to_left()) {
+                    padside = 'right';
+                }
+                var mi = activity.one('.mod-indent'),
+                    instructionpad = parseInt(mi.getStyle('padding-' + padside), 10) +
+                            parseInt(mi.getStyle('margin-' + padside), 10);
+                editinstructions.setStyle('margin-' + padside, instructionpad + 'px');
+
                 // We hide various components whilst editing:
                 activity.addClass(CSS.EDITINGTITLE);
 

diff --git a/theme/base/style/core.css b/theme/base/style/core.css
@@ -1595,8 +1595,13 @@ a.disabled {
     width: 0;
     height: 0;
     vertical-align: top;
-    border-top: 4px solid #000;
+    border-top: 4px solid #777;
     border-right: 4px solid transparent;
     border-left: 4px solid transparent;
     content: "";
 }
+
+a:focus .caret,
+a:hover .caret {
+    border-top-color: #555;
+}
diff --git a/theme/base/style/course.css b/theme/base/style/course.css
@@ -283,6 +283,13 @@ li.section.hidden span.commands a.editing_show {cursor:default;}
 }
 .section .activity .spinner {
     margin: 4px;
+    left: 100%;
+    position: absolute;
+}
+
+.dir-rtl .section .activity .spinner {
+    left: auto;
+    right: 100%;
 }
 
 /* Quick edit of module name */
@@ -308,7 +315,10 @@ span.editinstructions {
 .dir-rtl span.editinstructions { left: auto; right: 32px;}
 input.titleeditor { vertical-align: text-bottom; }
 .editing .course-content .section .activity.editor_displayed .activityinstance {
-    padding: initial;
+    padding-right: initial;
+}
+.dir-rtl.editing .course-content .section .activity.editor_displayed .activityinstance {
+    padding-left: initial;
 }
 
 /* Course drag and drop upload styles */

diff --git a/theme/bootstrapbase/less/moodle/core.less b/theme/bootstrapbase/less/moodle/core.less
@@ -2045,6 +2045,11 @@ img#persona_signin {
             .caret {
                 margin-top: 8px;
                 margin-left: 2px;
+                border-top-color: @navbarLinkColor;
+                &:hover,
+                &:active {
+                    border-top-color: @navbarLinkColorActive;
+                }
             }
         }
     }
@@ -2054,7 +2059,6 @@ img#persona_signin {
         }
         .menu-action-text  {
             display:inline;
-            vertical-align: middle;
         }
     }
 }

diff --git a/theme/bootstrapbase/less/moodle/course.less b/theme/bootstrapbase/less/moodle/course.less
@@ -45,9 +45,9 @@
     }
     .activity {
         .spinner {
-            margin: 4px;
-            left: 0;
+            left: 100%;
             position: absolute;
+            vertical-align: text-bottom;
         }
 
         .editing_move {
@@ -95,7 +95,7 @@
             display: none;
         }
         div.activityinstance {
-            padding: initial;
+            padding-right: initial;
 
             input {
                 margin-bottom: initial;
@@ -110,13 +110,8 @@
 .dir-rtl .section {
     .activity {
         .spinner {
-            left: 0;
-        }
-
-        .editing_move {
-            /* Move the move icon to the start of the line */
             left: auto;
-            right: 0;
+            right: 100%;
         }
 
         .mod-indent {
@@ -136,6 +131,22 @@
     }
 }
 
+.dir-rtl.editing .section {
+    .activity {
+        .editing_move {
+            /* Move the move icon to the start of the line */
+            left: auto;
+            right: 0;
+        }
+
+        &.editor_displayed {
+            div.activityinstance {
+                padding-left: initial;
+            }
+        }
+    }
+}
+
 .activity img.activityicon {
     margin-right: 6px;
     vertical-align: text-bottom;
@@ -413,7 +424,6 @@ input.titleeditor {
 span.editinstructions {
     position: absolute;
     top: 0;
-    left: 0;
     margin-top: -22px;
     margin-left: 30px;
     line-height: 16px;
@@ -427,8 +437,6 @@ span.editinstructions {
     border: 1px solid @infoBorder;
 }
 .dir-rtl span.editinstructions {
-    left: auto;
-    right: 32px;
 }
 
 /* Course drag and drop upload styles */
@@ -727,6 +735,7 @@ span.editinstructions {
 }
 
 .section {
+    .summary,
     .activity {
         .iconsmall {
             width: 16px;

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