mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 20:42:22 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-42340-master' of git://github.com/andrewnicols/moodle

Browse Source 
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Dan Poltawski 2013-10-22 15:16:08 +08:00 committed by Eloy Lafuente (stronk7)
commit 6f4747d7b4
7 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-debug.js vendored
View File

@ -260,7 +260,6 @@ Y.extend(DIALOGUE, Y.Panel, {
'bottom' : null});
content = Y.one('#' + this.get('id') + ' .' + CSS.BODY);
content.setStyle('overflow', 'auto');
} else {
if (this.get('responsive')) {
// We must reset any of the fullscreen changes.
@ -268,8 +267,6 @@ Y.extend(DIALOGUE, Y.Panel, {
.setStyles({'width' : this.get('width'),
'height' : this.get('height')});
content = Y.one('#' + this.get('id') + ' .' + CSS.BODY);
content.setStyle('overflow', 'inherit');
}
}
},

2
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js vendored
View File

File diff suppressed because one or more lines are too long

3
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue.js vendored
View File

@ -260,7 +260,6 @@ Y.extend(DIALOGUE, Y.Panel, {
'bottom' : null});
content = Y.one('#' + this.get('id') + ' .' + CSS.BODY);
content.setStyle('overflow', 'auto');
} else {
if (this.get('responsive')) {
// We must reset any of the fullscreen changes.
@ -268,8 +267,6 @@ Y.extend(DIALOGUE, Y.Panel, {
.setStyles({'width' : this.get('width'),
'height' : this.get('height')});
content = Y.one('#' + this.get('id') + ' .' + CSS.BODY);
content.setStyle('overflow', 'inherit');
}
}
},

3
lib/yui/src/notification/js/dialogue.js vendored
View File

@ -229,7 +229,6 @@ Y.extend(DIALOGUE, Y.Panel, {
'bottom' : null});
content = Y.one('#' + this.get('id') + ' .' + CSS.BODY);
content.setStyle('overflow', 'auto');
} else {
if (this.get('responsive')) {
// We must reset any of the fullscreen changes.
@ -237,8 +236,6 @@ Y.extend(DIALOGUE, Y.Panel, {
.setStyles({'width' : this.get('width'),
'height' : this.get('height')});
content = Y.one('#' + this.get('id') + ' .' + CSS.BODY);
content.setStyle('overflow', 'inherit');
}
}
},

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

@ -949,6 +949,9 @@ sup {vertical-align: super;}
bottom: -50px;
position: fixed;
}
.moodle-dialogue-base .moodle-dialogue-fullscreen .moodle-dialogue-content {
overflow: auto;
}
.moodle-dialogue-base .moodle-dialogue-fullscreen .closebutton {
width: 28px;
height: 16px;

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

@ -1421,6 +1421,9 @@ audio.mediaplugin_html5audio {
bottom: -50px;
position: fixed;
}
.moodle-dialogue-base .moodle-dialogue-fullscreen .moodle-dialogue-content {
overflow: auto;
}
.moodle-dialogue-base .moodle-dialogue-fullscreen .closebutton {
width: 28px;
height: 16px;

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

File diff suppressed because one or more lines are too long