Merge branch 'MDL-40975-overflow' of git://github.com/andrewnicols/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css

theme/bootstrapbase/less/moodle/core.less

@@ -1153,113 +1153,60 @@ body.tag .managelink {
     top: 50%;
     left: 50%;
 }
+
+.mod-indent-outer {
+    display: table;
+}
+.mod-indent {
+    display: table-cell;
+}
 .mod-indent-1 {
-    margin-left: 30px;
+    width: 30px;
 }
 .mod-indent-2 {
-    margin-left: 60px;
+    width: 60px;
 }
 .mod-indent-3 {
-    margin-left: 90px;
+    width: 90px;
 }
 .mod-indent-4 {
-    margin-left: 120px;
+    width: 120px;
 }
 .mod-indent-5 {
-    margin-left: 150px;
+    width: 150px;
 }
 .mod-indent-6 {
-    margin-left: 180px;
+    width: 180px;
 }
 .mod-indent-7 {
-    margin-left: 210px;
+    width: 210px;
 }
 .mod-indent-8 {
-    margin-left: 240px;
+    width: 240px;
 }
 .mod-indent-9 {
-    margin-left: 270px;
+    width: 270px;
 }
 .mod-indent-10 {
-    margin-left: 300px;
+    width: 300px;
 }
 .mod-indent-11 {
-    margin-left: 330px;
+    width: 330px;
 }
 .mod-indent-12 {
-    margin-left: 360px;
+    width: 360px;
 }
 .mod-indent-13 {
-    margin-left: 390px;
+    width: 390px;
 }
 .mod-indent-14 {
-    margin-left: 420px;
+    width: 420px;
 }
 .mod-indent-15,
 .mod-indent-huge {
-    margin-left: 420px;
-}
-.dir-rtl .mod-indent-1 {
-    margin-right: 30px;
-    margin-left: 0;
-}
-.dir-rtl .mod-indent-2 {
-    margin-right: 60px;
-    margin-left: 0;
-}
-.dir-rtl .mod-indent-3 {
-    margin-right: 90px;
-    margin-left: 0;
-}
-.dir-rtl .mod-indent-4 {
-    margin-right: 120px;
-    margin-left: 0;
-}
-.dir-rtl .mod-indent-5 {
-    margin-right: 150px;
-    margin-left: 0;
-}
-.dir-rtl .mod-indent-6 {
-    margin-right: 180px;
-    margin-left: 0;
-}
-.dir-rtl .mod-indent-7 {
-    margin-right: 210px;
-    margin-left: 0;
-}
-.dir-rtl .mod-indent-8 {
-    margin-right: 240px;
-    margin-left: 0;
-}
-.dir-rtl .mod-indent-9 {
-    margin-right: 270px;
-    margin-left: 0;
-}
-.dir-rtl .mod-indent-10 {
-    margin-right: 300px;
-    margin-left: 0;
-}
-.dir-rtl .mod-indent-11 {
-    margin-right: 330px;
-    margin-left: 0;
-}
-.dir-rtl .mod-indent-12 {
-    margin-right: 360px;
-    margin-left: 0;
-}
-.dir-rtl .mod-indent-13 {
-    margin-right: 390px;
-    margin-left: 0;
-}
-.dir-rtl .mod-indent-14 {
-    margin-right: 420px;
-    margin-left: 0;
-}
-.dir-rtl .mod-indent-15,
-.dir-rtl .mod-indent-huge {
-    margin-right: 420px;
-    margin-left: 0;
+    width: 420px;
 }
+
 /* Audio player size in 'block' mode (can only change width, height is hardcoded in JS) */
 .resourcecontent .mediaplugin_mp3 object {
     height: 25px;

theme/bootstrapbase/less/moodle/course.less

@@ -57,7 +57,7 @@
             top: 0;
         }
 
-        .mod-indent {
+        .mod-indent-outer {
             /**
              * Add appropriate padding such that nothing overlaps the
              * absolute positioned move icon.
@@ -72,7 +72,14 @@
             top: 0;
         }
 
+        .contentwithoutlink,
         .activityinstance {
+
+            min-width: 40%;
+            display: table-cell;
+            padding-right: 4px;
+            min-height: 2em;
+
             .dimmed {
                 img.activityicon {
                   opacity: 0.5;
@@ -114,12 +121,12 @@
             right: 100%;
         }
 
-        .mod-indent {
+        .mod-indent-outer {
             /**
              * Add appropriate padding such that nothing overlaps the
              * absolute positioned move icon.
              */
-            padding-left: auto;
+            padding-left: initial;
             padding-right: 32px;
         }
 
@@ -128,6 +135,12 @@
             left: 0;
             right: auto;
         }
+
+        .contentwithoutlink,
+        .activityinstance {
+            padding-left: 4px;
+            padding-right: initial;
+        }
     }
 }
 
@@ -162,11 +175,9 @@
 .editing {
     .section {
         .activity {
+            .contentwithoutlink,
             .activityinstance {
-                min-width: 40%;
-                display: table-cell;
                 padding-right: 200px;
-                min-height: 2em;
             }
         }
     }
@@ -175,6 +186,7 @@
 .dir-rtl.editing {
     .section {
         .activity {
+            .contentwithoutlink,
             .activityinstance {
                 padding-left: 200px;
                 padding-right: 0;
@@ -192,10 +204,6 @@
     white-space: nowrap;
     display: inline;
 }
-.section .activity.modtype_label .commands {
-    margin-left: 40%;
-    padding-left: .2em;
-}
 .section .activity.modtype_label.label {
     font-weight: normal;
     padding: .2em;