mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 16:32:18 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-39355-m-2' of git://github.com/andrewnicols/moodle

Browse Source 
Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Damyon Wiese 2013-05-02 13:54:59 +08:00
commit f85fba3eeb
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1340,8 +1340,7 @@ audio.mediaplugin_html5audio {
margin: 0;
background: none;
border: none;
/* Override the z-index set incorrectly by the YUI dialogue */
z-index: 600!important;
z-index: 600;
}
.moodle-dialogue-base .moodle-dialogue-wrap {
margin-top: -3px;
@ -1498,7 +1497,7 @@ audio.mediaplugin_html5audio {
max-height: 300px;
}
+.moodle-dialogue-base .moodle-dialogue.moodle-dialogue-tooltip {
.moodle-dialogue-base .moodle-dialogue.moodle-dialogue-tooltip {
z-index: 3001;
}

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

File diff suppressed because one or more lines are too long