L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dan Poltawski
2013-10-28 11:10:43 +08:00
parent 042e6a47fd 79ad49af63
commit 4baf482daa
8 changed files with 78 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/yui/build/moodle-core-blocks/moodle-core-blocks-debug.js
Vendored
+1 -1
View File
@@ -115,7 +115,7 @@ Y.extend(DRAGBLOCK, M.core.dragdrop, {
blocklist.each(function(blocknode) {
var move = blocknode.one('a.'+CSS.EDITINGMOVE);
if (move) {
move.replace(this.get_drag_handle(move.getAttribute('title'), '', 'icon', true));
move.replace(this.get_drag_handle(move.getAttribute('title'), '', 'iconsmall', true));
blocknode.one('.'+CSS.HEADER).setStyle('cursor', 'move');
}
}, this);
lib/yui/build/moodle-core-blocks/moodle-core-blocks-min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
lib/yui/build/moodle-core-blocks/moodle-core-blocks.js
Vendored
+1 -1
View File
@@ -115,7 +115,7 @@ Y.extend(DRAGBLOCK, M.core.dragdrop, {
blocklist.each(function(blocknode) {
var move = blocknode.one('a.'+CSS.EDITINGMOVE);
if (move) {
move.replace(this.get_drag_handle(move.getAttribute('title'), '', 'icon', true));
move.replace(this.get_drag_handle(move.getAttribute('title'), '', 'iconsmall', true));
blocknode.one('.'+CSS.HEADER).setStyle('cursor', 'move');
}
}, this);
lib/yui/src/blocks/js/blocks.js
Vendored
+1 -1
View File
@@ -113,7 +113,7 @@ Y.extend(DRAGBLOCK, M.core.dragdrop, {
blocklist.each(function(blocknode) {
var move = blocknode.one('a.'+CSS.EDITINGMOVE);
if (move) {
move.replace(this.get_drag_handle(move.getAttribute('title'), '', 'icon', true));
move.replace(this.get_drag_handle(move.getAttribute('title'), '', 'iconsmall', true));
blocknode.one('.'+CSS.HEADER).setStyle('cursor', 'move');
}
}, this);
theme/base/style/core.css
+25 -17
View File
@@ -1466,7 +1466,7 @@ img#persona_signin { cursor: pointer; }
.moodle-actionmenu > ul,
.moodle-actionmenu > ul > li {display: inline-block;}
.moodle-actionmenu ul {padding: 0;margin: 0;list-style-type: none;}
.moodle-actionmenu a.hidden {display: none;}
#page .moodle-actionmenu a.hidden {display: none;}
.moodle-actionmenu .toggle-display,
.moodle-actionmenu .menu-action-text {display: none;}
@@ -1495,22 +1495,30 @@ img#persona_signin { cursor: pointer; }
.dir-rtl .moodle-actionmenu[data-enhanced].show .menu {text-align: right;right: auto;left: 0;}
.dir-rtl .moodle-actionmenu[data-enhanced].show .menu .iconsmall {margin-right: 0;margin-left: 8px;}
.menu.align-tl-bl {top: 100%;left: 0;margin-top: 4px;}
.menu.align-tr-bl {top: 100%;right: 100%;}
.menu.align-bl-bl {bottom: 100%;left: 0;}
.menu.align-br-bl {right: 100%;bottom: 100%;}
.menu.align-tl-br {top: 100%;left: 100%;}
.menu.align-tr-br {top: 100%;right: 0;margin-top: 4px;}
.menu.align-bl-br {bottom: 100%;left: 100%;}
.menu.align-br-br {right: 0;bottom: 100%;}
.menu.align-tl-tl {top: 0;left: 0;}
.menu.align-tr-tl {top: 0;right: 100%;margin-right: 4px;}
.menu.align-bl-tl {bottom: 100%;left: 0;margin-bottom: 4px;}
.menu.align-br-tl {right: 100%;bottom: 100%;}
.menu.align-tl-tr {top: 0;left: 100%;margin-left: 4px;}
.menu.align-tr-tr {top: 0;right: 0;}
.menu.align-bl-tr {bottom: 100%;left: 100%;}
.menu.align-br-tr {right: 0;bottom: 100%;margin-bottom: 4px;}
.jsenabled .moodle-actionmenu[data-enhanced] .menu.align-tl-bl {top: 100%;left: 0;margin-top: 4px;}
.jsenabled .moodle-actionmenu[data-enhanced] .menu.align-tr-bl {top: 100%;right: 100%;}
.jsenabled .moodle-actionmenu[data-enhanced] .menu.align-bl-bl {bottom: 100%;left: 0;}
.jsenabled .moodle-actionmenu[data-enhanced] .menu.align-br-bl {right: 100%;bottom: 100%;}
.jsenabled .moodle-actionmenu[data-enhanced] .menu.align-tl-br {top: 100%;left: 100%;}
.jsenabled .moodle-actionmenu[data-enhanced] .menu.align-tr-br {top: 100%;right: 0;margin-top: 4px;}
.jsenabled .moodle-actionmenu[data-enhanced] .menu.align-bl-br {bottom: 100%;left: 100%;}
.jsenabled .moodle-actionmenu[data-enhanced] .menu.align-br-br {right: 0;bottom: 100%;}
.jsenabled .moodle-actionmenu[data-enhanced] .menu.align-tl-tl {top: 0;left: 0;}
.jsenabled .moodle-actionmenu[data-enhanced] .menu.align-tr-tl {top: 0;right: 100%;margin-right: 4px;}
.jsenabled .moodle-actionmenu[data-enhanced] .menu.align-bl-tl {bottom: 100%;left: 0;margin-bottom: 4px;}
.jsenabled .moodle-actionmenu[data-enhanced] .menu.align-br-tl {right: 100%;bottom: 100%;}
.jsenabled .moodle-actionmenu[data-enhanced] .menu.align-tl-tr {top: 0;left: 100%;margin-left: 4px;}
.jsenabled .moodle-actionmenu[data-enhanced] .menu.align-tr-tr {top: 0;right: 0;}
.jsenabled .moodle-actionmenu[data-enhanced] .menu.align-bl-tr {bottom: 100%;left: 100%;}
.jsenabled .moodle-actionmenu[data-enhanced] .menu.align-br-tr {right: 0;bottom: 100%;margin-bottom: 4px;}
.moodle-actionmenu > ul > li[role="menuitem"] {
display: none;
}
.jsenabled .moodle-actionmenu[data-enhance="moodle-core-actionmenu"] > ul > li[role="menuitem"] {
display: inline-block;
}
.dir-rtl .menu.align-tl-bl {right: 0;left: auto;}
.dir-rtl .menu.align-tr-bl {right: auto;left: 100%;}
theme/base/style/course.css
+36 -9
View File
@@ -15,22 +15,49 @@
.site-topic ul.section,
.course-content ul.section { margin: 1em;}
.sitetopic .section .activity img.activityicon,
.course-content .section .activity img.activityicon {vertical-align:text-bottom;margin-right: 6px;}
.dir-rtl .sitetopic .section .activity img.activityicon,
.dir-rtl .course-content .section .activity img.activityicon {margin-left: 6px; margin-right: 0;}
.course-content .section .activity img.activityicon {
vertical-align: middle;
margin-right: 3px;
margin-left: 3px;
width: 24px;
height: 24px;
}
.section .activity .activityinstance .instancename {
vertical-align: bottom;
}
.sitetopic .section .activity .activityinstance,
.course-content .section .activity .activityinstance,
.sitetopic .section .activity .activityinstance div,
.course-content .section .activity .activityinstance div { display: inline;}
.sitetopic .section .activity .activityinstance,
.course-content .section .activity .activityinstance { padding-right: 3em; }
.course-content .section .activity .activityinstance { padding-right: 1em; }
.dir-rtl .sitetopic .section .activity .activityinstance,
.dir-rtl .course-content .section .activity .activityinstance { padding-right: 0; padding-left: 3em;}
.sitetopic .section .activity .commands,
.course-content .section .activity .commands { white-space: nowrap; display: inline-block; }
.section .activity .moodle-actionmenu .menubar > li > * {display:inline-block;min-height:16px;padding: 0.2em;}
.section .activity .moodle-actionmenu .menubar > li > img {margin: 0.2em;vertical-align: text-bottom;padding:0 3px 0 0;}
.section .activity .moodle-actionmenu .iconsmall {vertical-align: baseline;width:16px;height:16px;}
.course-content .section .activity .commands { white-space: nowrap; display: inline-block; padding: 0 3em 0 0;}
.dir-rtl .sitetopic .section .activity .commands,
.dir-rtl .course-content .section .activity .commands { padding: 0 0 0 3em;}
.section .activity .moodle-actionmenu .menu > li > *,
.section .activity .moodle-actionmenu .menubar > li > * {
display: inline-block;
min-height: 16px;
}
.section .activity .moodle-actionmenu[data-enhanced] .menu > li > * {
display: block;
}
.section .activity .moodle-actionmenu .menubar > li > img {
margin-right: 5px;
vertical-align: text-bottom;
padding:0 3px 0 0;
}
.section .activity .moodle-actionmenu[data-enhanced] .menu {margin-left: -2.8em;}
.section img.iconsmall {
vertical-align: middle;
width: 16px;
height: 16px;
margin: 4px;
}
.single-section h3.sectionname {text-align:center;clear:both;}
.sitetopic .section li.activity,
.course-content .section li.activity {padding: .2em;}
@@ -190,7 +217,7 @@ li.section.hidden span.commands a.editing_show {cursor:default;}
/* Quick edit of module name */
.sitetopic .section .activity form.activityinstance,
.course-content .section .activity form.activityinstance { display: inline; vertical-align: bottom; }
.course-content .section .activity form.activityinstance { display: inline; vertical-align: middle; }
span.editinstructions {
position: absolute;
top: 0px;
theme/bootstrapbase/less/moodle/course.less
+11 -2
View File
@@ -239,10 +239,21 @@
.path-site li.activity > div,
.path-course-view li.activity > div {
position: relative;
padding: 0 16px 0 0; /* to accommodate the floated completion icon with highlighting */
}
.dir-rtl.path-site li.activity > div,
.dir-rtl.path-course-view li.activity > div {
position: relative;
padding: 0 0 0 16px;
}
.path-course-view li.activity span.autocompletion,
.path-course-view li.activity form.togglecompletion {
float: right;
width: 0; /* Reduce the width of the control to 0 and rely on natural overflow */
}
.path-course-view li.activity span.autocompletion img,
.path-course-view li.activity form.togglecompletion img {
max-width: none; /* The width is 0 so ensure we don't end up with a relative max-width */
}
.path-course-view li.activity form.togglecompletion .ajaxworking {
width: 16px;
@@ -606,8 +617,6 @@ span.editinstructions {
max-width: none !important; /** reset sets 100% !important which breaks on IE8 without this !important */
width:16px;
height:16px;
width:1rem;
height:1rem;
padding:0.3em;
}
theme/bootstrapbase/style/moodle.css
+1 -1
View File
File diff suppressed because one or more lines are too long