Merge branch 'MDL-43062-26' of git://github.com/mouneyrac/moodle into…

… MOODLE_26_STABLE Conflicts: theme/bootstrapbase/style/moodle.css
moodle · Dec 16, 2013 · e9623e5 · e9623e5
2 parents be7a37d + 834f172
commit e9623e5
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 1 deletion.
diff --git a/theme/base/style/core.css b/theme/base/style/core.css
@@ -799,6 +799,7 @@ body.tag .managelink {padding: 5px;}
 .corelightbox img {position:fixed;top:50%; left: 50%;}
 
 .mod-indent {display:table-cell;}
+.label .mod-indent {float:left; padding-top:20px}
 .mod-indent-1    {width:30px;}
 .mod-indent-2    {width:60px;}
 .mod-indent-3    {width:90px;}

diff --git a/theme/base/style/course.css b/theme/base/style/course.css
@@ -45,6 +45,11 @@
     padding-left: 24px;
 }
 
+.section .label .mod-indent-outer {
+    padding-left: 24px;
+    display: block;
+}
+
 .dir-rtl .section .activity .mod-indent-outer {
     padding-left: auto;
     padding-right: 24px;
@@ -91,6 +96,16 @@
     padding-right: 32px;
     height: 2em;
     display: table-cell;
+
+}
+
+.sitetopic .section .label .activityinstance,
+.course-content .section .label .activityinstance,
+.sitetopic .section .label .contentwithoutlink,
+.course-content .section .label .contentwithoutlink {
+    padding-right: 32px;
+    display: block;
+    height: inherit;
 }
 
 .dir-rtl .sitetopic .section .activity .activityinstance,

diff --git a/theme/bootstrapbase/less/moodle/core.less b/theme/bootstrapbase/less/moodle/core.less
@@ -1169,6 +1169,10 @@ body.tag .managelink {
 .mod-indent {
     display: table-cell;
 }
+.label .mod-indent {
+  float:left;
+  padding-top:20px
+}
 .mod-indent-1 {
     width: 30px;
 }

diff --git a/theme/bootstrapbase/less/moodle/course.less b/theme/bootstrapbase/less/moodle/course.less
@@ -90,6 +90,19 @@
             }
         }
     }
+    .label {
+      .contentwithoutlink,
+      .activityinstance {
+        padding-right: 32px;
+        display: block;
+        height: inherit;
+      }
+
+      .mod-indent-outer {
+        padding-left: 24px;
+        display: block;
+      }
+    }
 
     .filler {
         width: 16px;

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