Skip to content

Commit

Permalink
Merge branch 'MDL-35423-master' of git://github.com/andrewnicols/moodle
Browse files Browse the repository at this point in the history
Conflicts:
	course/yui/build/moodle-course-modchooser/moodle-course-modchooser-min.js
	course/yui/dragdrop/dragdrop.js
  • Loading branch information
Damyon Wiese committed Jan 14, 2014
2 parents 49ca1e7 + 5b9e2cc commit f8a60df
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
Expand Up @@ -7,7 +7,7 @@ YUI.add('moodle-course-modchooser', function (Y, NAME) {
*/

var CSS = {
PAGECONTENT : 'div#page-content',
PAGECONTENT : 'body',
SECTION : 'li.section',
SECTIONMODCHOOSER : 'span.section-modchooser-link',
SITEMENU : 'div.block_site_main_menu',
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Expand Up @@ -7,7 +7,7 @@ YUI.add('moodle-course-modchooser', function (Y, NAME) {
*/

var CSS = {
PAGECONTENT : 'div#page-content',
PAGECONTENT : 'body',
SECTION : 'li.section',
SECTIONMODCHOOSER : 'span.section-modchooser-link',
SITEMENU : 'div.block_site_main_menu',
Expand Down
Expand Up @@ -49,7 +49,7 @@ var CSS = {
INSTANCENAME : 'span.instancename',
MODINDENTDIV : '.mod-indent',
MODINDENTOUTER : '.mod-indent-outer',
PAGECONTENT : 'div#page-content',
PAGECONTENT : 'body',
SECTIONLI : 'li.section',
SHOW : 'a.'+CSS.SHOW,
SHOWHIDE : 'a.editing_showhide'
Expand Down

Large diffs are not rendered by default.

Expand Up @@ -49,7 +49,7 @@ var CSS = {
INSTANCENAME : 'span.instancename',
MODINDENTDIV : '.mod-indent',
MODINDENTOUTER : '.mod-indent-outer',
PAGECONTENT : 'div#page-content',
PAGECONTENT : 'body',
SECTIONLI : 'li.section',
SHOW : 'a.'+CSS.SHOW,
SHOWHIDE : 'a.editing_showhide'
Expand Down
2 changes: 1 addition & 1 deletion course/yui/src/modchooser/js/modchooser.js
Expand Up @@ -5,7 +5,7 @@
*/

var CSS = {
PAGECONTENT : 'div#page-content',
PAGECONTENT : 'body',
SECTION : 'li.section',
SECTIONMODCHOOSER : 'span.section-modchooser-link',
SITEMENU : 'div.block_site_main_menu',
Expand Down
2 changes: 1 addition & 1 deletion course/yui/src/toolboxes/js/toolbox.js
Expand Up @@ -47,7 +47,7 @@ var CSS = {
INSTANCENAME : 'span.instancename',
MODINDENTDIV : '.mod-indent',
MODINDENTOUTER : '.mod-indent-outer',
PAGECONTENT : 'div#page-content',
PAGECONTENT : 'body',
SECTIONLI : 'li.section',
SHOW : 'a.'+CSS.SHOW,
SHOWHIDE : 'a.editing_showhide'
Expand Down

0 comments on commit f8a60df

Please sign in to comment.