moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'm28_MDL-46250' of https://github.com/totara/moodle

Browse source
This commit is contained in:
Dan Poltawski 2014-07-14 13:12:43 +01:00
commit d3181cc8b5
5 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/form/filemanager.js
View file

@ -111,7 +111,7 @@ M.form_filemanager.init = function(Y, options) {
var labelid = 'fm-dialog-label_'+ this.selectnode.get('id'); var labelid = 'fm-dialog-label_'+ this.selectnode.get('id');
this.selectui = new M.core.dialogue({ this.selectui = new M.core.dialogue({
draggable : true, draggable : true,
headerContent: '<span id="' + labelid +'">' + M.str.moodle.edit + '</span>', headerContent: '<h3 id="' + labelid +'">' + M.str.moodle.edit + '</h3>',
bodyContent : this.selectnode, bodyContent : this.selectnode,
centered : true, centered : true,
width : '480px', width : '480px',

4
repository/filepicker.js
View file

@ -1301,7 +1301,7 @@ M.core_filepicker.init = function(Y, options) {
extraClasses : ['filepicker'], extraClasses : ['filepicker'],
draggable : true, draggable : true,
bodyContent : this.fpnode, bodyContent : this.fpnode,
headerContent: '<span id="'+ labelid +'">'+ M.str.repository.filepicker +'</span>', headerContent: '<h3 id="'+ labelid +'">'+ M.str.repository.filepicker +'</h3>',
centered : true, centered : true,
modal : true, modal : true,
visible : false, visible : false,
@ -1319,7 +1319,7 @@ M.core_filepicker.init = function(Y, options) {
var fplabel = 'fp-file_label_'+ client_id; var fplabel = 'fp-file_label_'+ client_id;
this.selectui = new M.core.dialogue({ this.selectui = new M.core.dialogue({
headerContent: '<span id="' + fplabel +'">'+M.str.repository.select+'</span>', headerContent: '<h3 id="' + fplabel +'">'+M.str.repository.select+'</h3>',
draggable : true, draggable : true,
width : '450px', width : '450px',
bodyContent : this.selectnode, bodyContent : this.selectnode,

5
theme/base/style/core.css
View file

@ -1203,7 +1203,10 @@ sup {vertical-align: super;}
-moz-box-shadow: 5px 5px 20px 0px #666666; -moz-box-shadow: 5px 5px 20px 0px #666666;
overflow: hidden; overflow: hidden;
} }
.moodle-dialogue-base h3 {
margin: 0;
line-height: 20px;
}
.moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd, .moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd,
.moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd.yui3-widget-hd { .moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd.yui3-widget-hd {
margin:0; margin:0;

6
theme/bootstrapbase/less/moodle/filemanager.less
View file

@ -69,6 +69,12 @@
.box-shadow(2px 2px 3px .1px #999); .box-shadow(2px 2px 3px .1px #999);
} }
.moodle-dialogue h3 {
font-size: 14px;
margin: 0;
line-height: 20px;
}
.moodle-dialogue-base .filepicker .moodle-dialogue-wrap .moodle-dialogue-bd { .moodle-dialogue-base .filepicker .moodle-dialogue-wrap .moodle-dialogue-bd {
padding: 0px; padding: 0px;
} }

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

File diff suppressed because one or more lines are too long