Permalink
Browse files

Merge branch 'MDL-39773_b_m25' of git://github.com/rwijaya/moodle int…

…o MOODLE_25_STABLE

Conflicts:
	theme/bootstrapbase/style/moodle.css
  • Loading branch information...
2 parents 6930385 + 9db4dcb commit 6117c578e4c534de6316ff769a165270ab4c6827 @danpoltawski danpoltawski committed Jun 12, 2013
@@ -1380,3 +1380,5 @@ div.badge .expireimage { width: 100px; height: 100px; left: 20px; top: 0px; }
div#dateselector-calendar-panel {
z-index: 3100; /* Set higher than the z-index of the filemanager - see MDL-39047. */
}
+
+.path-mod-lesson .centerpadded { padding: 5px; text-align: center; }
@@ -132,3 +132,8 @@ div#dock {
min-width: 280px;
width: 60%;
}
+
+.path-mod-lesson .centerpadded {
+ padding: 5px;
+ text-align: center;
+}

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -159,13 +159,11 @@ table.mod_index {width:90%;margin:1em auto;}
#page-mod-lesson-essay .sent {color:#006600;}
#page-mod-lesson-essay .ungraded {color:#999999;}
#page-mod-lesson-essay .gradetable {margin-bottom: 20px;}
-.path-mod-lesson .branchbuttoncontainer.vertical .lessonbutton,
-.path-mod-lesson .centerpadded {padding:5px;}
+.path-mod-lesson .branchbuttoncontainer.vertical .lessonbutton {padding:5px;}
#page-mod-lesson-essay .buttons,
.path-mod-lesson .center,
.path-mod-lesson .firstpageoptions,
.path-mod-lesson .clock .content,
-.path-mod-lesson .centerpadded,
#page-mod-lesson-view .password-form,
.path-mod-lesson .edit_pages_box .addlinks {text-align:center;}

0 comments on commit 6117c57

Please sign in to comment.