mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-39773_b' of git://github.com/rwijaya/moodle

Browse Source 
Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Dan Poltawski 2013-06-12 09:33:23 +08:00
commit 1899145c50
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
theme/base/style/core.css
View File

@ -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; }

5
theme/bootstrapbase/less/moodle/modules.less
View File

@ -132,3 +132,8 @@ div#dock {
min-width: 280px;
width: 60%;
}
.path-mod-lesson .centerpadded {
padding: 5px;
text-align: center;
}

2
theme/bootstrapbase/style/moodle.css
View File

File diff suppressed because one or more lines are too long

4
theme/standard/style/modules.css
View File

@ -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;}