mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 04:33:13 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-39047_master' of https://github.com/markn86/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2013-04-15 12:15:24 +01:00
commit 34ddaf7146
5 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/form/yui/dateselector/dateselector.js vendored
View File

@ -204,6 +204,7 @@ YUI.add('moodle-form-dateselector', function(Y) {
bodyContent : Y.Node.create('<div id="dateselector-calendar-content"></div>'),
id : 'dateselector-calendar-panel'
});
this.panel.removeAttr('zIndex'); // z-index is set by the theme.
this.panel.render(document.body);
this.panel.on('heightChange', this.fix_position, this);

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

@ -1369,3 +1369,10 @@ div.badge .expireimage { width: 100px; height: 100px; left: 20px; top: 0px; }
.statusbox.inactive { background-color: #FFEBA8; }
.activatebadge { margin: 0px; text-align: left; vertical-align: middle; }
.addcourse { float: right; }
/**
* The date selector popup.
*/
div#dateselector-calendar-panel {
z-index: 3100; /* Set higher than the z-index of the filemanager - see MDL-39047. */
}

3
theme/bootstrap/less/moodle/forms.less
View File

@ -316,3 +316,6 @@ input[type="checkbox"] {
.felement.ffilepicker {
margin-top: 5px;
}
div#dateselector-calendar-panel {
z-index: 3100; /* Set higher than the z-index of the filemanager - see MDL-39047. */
}

2
theme/bootstrap/style/generated.css
View File

File diff suppressed because one or more lines are too long

11
theme/upgrade.txt
View File

@ -1,11 +1,6 @@
This files describes API changes in /theme/* themes,
information provided here is intended especially for theme designer.
=== 2.6 ===
* re-wrote the table for the course completion status block to use html_table - added some CSS classes to the table in the process.
MDL-35608 - Blocks - Updating the Completion Status block to use HTML Writer
=== 2.5 ===
required changes:
@ -19,9 +14,13 @@ required changes:
DOM changes:
* changed the h1 title in the help popup to a h2.
* new setting $THEME->yuicssmodules = array('cssreset', 'cssfonts', 'cssgrids', 'cssbase'); which
allows themes to use different CSS reset normalisers such as cssnormalize YUI module
allows themes to use different CSS reset normalisers such as cssnormalize YUI module.
* Re-wrote the user profile views to definition lists.
* Re-wrote the table for the course completion status block to use html_table - added some CSS classes to
the table in the process (see MDL-35608).
* Cancel buttons have the class btn-cancel.
* Added a z-index for the div#dateselector-calendar-panel so that the calendar pop-up renders above
the filemanager when they overlap, ie. the course settings page (see MDL-39047).
Renderer changes:
* Mymobile theme changed to support more verbose move-block-here descriptions.