Merge branch 'MDL-50004-M30' of git://github.com/lazydaisy/moodle

moodle · Jun 18, 2015 · c13b7bc · c13b7bc
2 parents 51a09cb + f6218c4
commit c13b7bc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/theme/bootstrapbase/less/moodle/course.less b/theme/bootstrapbase/less/moodle/course.less
@@ -538,26 +538,28 @@ span.editinstructions {
 }
 
 .coursebox > .info > .coursename a {
-    display:block;
+    display: block;
     background-image:url([[pix:moodle|i/course]]);
     background-repeat: no-repeat;
-    padding-left:21px;
-    background-position: left 0.5em;
+    padding-left: 21px;
+    background-position: left 0.2em;
 }
 .dir-rtl .coursebox > .info > .coursename a {
     padding-left: 0;
     padding-right: 21px;
-    background-position: right;
+    background-position: right 0.2em;
 }
-.coursebox.remotehost > .info > .categoryname a {
-    background-image:url([[pix:moodle|i/mnethost]]);
+.coursebox > .info > .coursename,
+.coursebox .content .teachers,
+.coursebox .content .courseimage,
+.coursebox .content .coursefile {
+    float: left;
+    clear: left;
 }
 .coursebox .content .teachers,
 .coursebox .content .courseimage,
 .coursebox .content .coursefile {
-    float:left;
-    width:40%;
-    clear:left;
+    width: 40%;
 }
 .dir-rtl .coursebox > .info > .coursename,
 .dir-rtl .coursebox .teachers,
@@ -568,6 +570,7 @@ span.editinstructions {
 }
 .coursebox > .info > h3.coursename {
     margin: 5px;
+    line-height: 1;
 }
 .coursebox > .info > .coursename {
     margin: 5px;
@@ -620,6 +623,10 @@ span.editinstructions {
     padding:0;
 }
 
+.coursebox.remotehost > .info > .categoryname a {
+    background-image:url([[pix:moodle|i/mnethost]]);
+}
+
 .dir-rtl .coursebox > .info > .categoryname a {
     padding-left:0;
     padding-right:21px;

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