Skip to content

Commit

Permalink
Merge branch 'MDL-42887-master' of git://github.com/damyon/moodle
Browse files Browse the repository at this point in the history 
Conflicts:
	theme/bootstrapbase/style/moodle.css
  • Loading branch information
@marinaglancy
marinaglancy committed Nov 15, 2013
2 parents 9a36c7d + d8383b2 commit 2b6344c
Show file tree
Hide file tree
Showing 7 changed files with 116 additions and 63 deletions.
1 change: 1 addition & 0 deletions lib/editor/tinymce/plugins/pdw/readme_moodle.txt
View file
Expand Up @@ -17,3 +17,4 @@ Upgrade procedure:
after "DOM.setStyle(ifr, 'height',DOM.getSize(ifr).h + dy); // Resize iframe"
7/ reimplement patch in MDL-42481
8/ reimplement patch in MDL-42684
9/ reimplement patch in MDL-42887
9 changes: 4 additions & 5 deletions lib/editor/tinymce/plugins/pdw/tinymce/editor_plugin.js
View file
Expand Up @@ -155,7 +155,6 @@
// Resizes the iframe by a relative height value
_resizeIframe : function(ed, tb_id, dy) {
var ifr = ed.getContentAreaContainer().firstChild;
var ultcon = ed.getContainer().parentNode; //Ultimate parent container
var parcon = ed.getContainer(); //Parent container
var tablecon = ed.getContainer().childNodes[1]; // Table container
var textarea = DOM.get(ed.id);
Expand All @@ -178,10 +177,10 @@
}

// Set all the containers to the same width
DOM.setStyle(textarea, 'width',DOM.getSize(ultcon).w);
DOM.setStyle(parcon, 'width',DOM.getSize(ultcon).w);
DOM.setStyle(tablecon, 'width',DOM.getSize(ultcon).w);
DOM.setStyle(ifr, 'width',DOM.getSize(ultcon).w);
DOM.setStyle(textarea, 'width','100%');
DOM.setStyle(parcon, 'width','100%');
DOM.setStyle(tablecon, 'width','100%');
DOM.setStyle(ifr, 'width','100%');


if (collapsedContainer) {
Expand Down
66 changes: 39 additions & 27 deletions theme/base/style/core.css
View file
Expand Up @@ -329,36 +329,48 @@ input#id_externalurl {direction:ltr;}
#portfolio-add-button {display:inline;}

/**
* Show the labels above text editors and file managers.
* Show the labels above text editors and file managers except on wide screens.
*/
#adminsettings #admin-summary .form-label,
.mform .fcontainer .fitem_ffilemanager .fitemtitle,
.mform .fcontainer .fitem_feditor .fitemtitle {
display: block;
margin-top: 4px;
margin-bottom: 4px;
text-align: left;
width: 100%;
}
.dir-rtl #adminsettings #admin-summary .form-label,
.dir-rtl .mform .fcontainer .fitem_ffilemanager .fitemtitle,
.dir-rtl .mform .fcontainer .fitem_feditor .fitemtitle {
text-align: right;
.mform .fcontainer .fitem .fitemtitle label {
font-weight: bold;
}
@media (max-width: 1199px) {
.mform .fcontainer .fitem .fitemtitle {
display: block;
margin-top: 4px;
margin-bottom: 4px;
text-align: left;
width: 100%;
}
.dir-rtl .mform .fcontainer .fitem .fitemtitle {
text-align: right;
}

#adminsettings #admin-summary .form-setting,
#adminsettings #admin-summary .form-description,
.mform .fcontainer .fitem_ffilemanager .ffilemanager,
.mform .fcontainer .fitem_feditor .feditor {
margin-left: 0%;
width: 100%;
float: left;
}
.dir-rtl #adminsettings #admin-summary .form-setting,
.dir-rtl #adminsettings #admin-summary .form-description,
.dir-rtl .mform .fcontainer .fitem_ffilemanager .ffilemanager,
.dir-rtl .mform .fcontainer .fitem_feditor .feditor {
margin-right: 0%;
.mform .fcontainer .fitem .felement {
margin-left: 0;
width: 100%;
float: left;
margin-bottom: 6px;
padding-left: 0;
padding-right: 0;
}
.dir-rtl .mform .fcontainer .fitem .felement {
margin-right: 0;
float: right;
padding-right: 0;
padding-left: 0;
}
.mform .fcontainer .fitem_fcheckbox .fitemtitle,
.mform .fcontainer .fitem_fcheckbox .felement {
display: inline-block;
width: auto;
}
.dir-rtl .mform .fcontainer .fitem_fcheckbox .felement {
float: right;
}
.mform .fcontainer .fitem_fcheckbox .felement {
padding: 6px;
}
}

/**
Expand Down
23 changes: 22 additions & 1 deletion theme/base/style/question.css
View file
Expand Up @@ -130,7 +130,28 @@ body.path-question-type .fitem_fgroup .accesshide {font: inherit;left: 0;positio
background: none;
}

/* Add a little padding to the answer sections of edit question forms. */
.path-question-type.editing #id_answerhdr .fitem .fitemtitle,
.path-question-type.editing #id_answerhdr .fitem .felement {
margin-left: 6px;
margin-right: 6px;
}
.path-question-type.editing #id_answerhdr .fitem_feditor .felement {
margin-left: 0px;
margin-right: 0px;
}
@media (min-width: 1200px) {
.path-question-type.editing #id_answerhdr .fitem_feditor .felement {
margin-left: 16%;
margin-right: 0px;
}
.dir-rtl .path-question-type.editing #id_answerhdr .fitem_feditor .felement {
margin-right: 16%;
margin-left: 0px;
}
}

/** Overide for RTL layout **/
.dir-rtl #qtypechoicecontainer #chooseqtype .instruction,
.dir-rtl #qtypechoicecontainer #chooseqtype .qtypesummary {right: 60%;left: 0%; border-left:0;border-right: 1px solid grey;}
#qtypechoicecontainer #chooseqtype .qtypeoption {padding-right: 0.3em;}
#qtypechoicecontainer #chooseqtype .qtypeoption {padding-right: 0.3em;}
66 changes: 38 additions & 28 deletions theme/bootstrapbase/less/moodle/forms.less
View file
Expand Up @@ -384,34 +384,44 @@ fieldset.coursesearchbox label {
}

/**
* Show the labels above text editors and file managers.
* Show the labels above text editors and file managers except on wide screens.
*/
#adminsettings #admin-summary .form-label,
.mform .fcontainer .fitem_ffilemanager .fitemtitle,
.mform .fcontainer .fitem_feditor .fitemtitle {
display: block;
margin-top: 4px;
margin-bottom: 4px;
text-align: left;
width: 100%;
}
.dir-rtl #adminsettings #admin-summary .form-label,
.dir-rtl .mform .fcontainer .fitem_ffilemanager .fitemtitle,
.dir-rtl .mform .fcontainer .fitem_feditor .fitemtitle {
text-align: right;
}
.mform .fcontainer .fitem .fitemtitle label {
font-weight: bold;
}
@media (max-width: 1199px) {
.mform .fcontainer .fitem .fitemtitle {
display: block;
margin-top: 4px;
margin-bottom: 4px;
text-align: left;
width: 100%;
}
.dir-rtl .mform .fcontainer .fitem .fitemtitle {
text-align: right;
}

#adminsettings #admin-summary .form-setting,
#adminsettings #admin-summary .form-description,
.mform .fcontainer .fitem_ffilemanager .ffilemanager,
.mform .fcontainer .fitem_feditor .feditor {
margin-left: 0%;
width: 100%;
float: left;
}
.dir-rtl #adminsettings #admin-summary .form-setting,
.dir-rtl #adminsettings #admin-summary .form-description,
.dir-rtl .mform .fcontainer .fitem_ffilemanager .ffilemanager,
.dir-rtl .mform .fcontainer .fitem_feditor .feditor {
margin-right: 0%;
.mform .fcontainer .fitem .felement {
margin-left: 0;
width: 100%;
float: left;
padding-left: 0;
padding-right: 0;
}
.dir-rtl .mform .fcontainer .fitem .felement {
margin-right: 0;
padding-left: 0;
padding-right: 0;
}
.mform .fcontainer .fitem_fcheckbox .fitemtitle,
.mform .fcontainer .fitem_fcheckbox .felement {
display: inline-block;
width: auto;
}
.dir-rtl .mform .fcontainer .fitem_fcheckbox .felement {
float: right;
}
.mform .fcontainer .fitem_fcheckbox .felement {
padding: 6px;
}
}
10 changes: 10 additions & 0 deletions theme/bootstrapbase/less/moodle/question.less
View file
Expand Up @@ -461,3 +461,13 @@ a#hidebankcmd {
display: inline;
}

/* Add a little padding to the answer sections of edit question forms. */
.path-question-type.editing #id_answerhdr .fitem .fitemtitle,
.path-question-type.editing #id_answerhdr .fitem .felement {
margin-left: 6px;
margin-right: 6px;
}
.path-question-type.editing #id_answerhdr .fitem_feditor .felement {
margin-left: 0px;
margin-right: 0px;
}
4 changes: 2 additions & 2 deletions theme/bootstrapbase/style/moodle.css
View file

Large diffs are not rendered by default.

0 comments on commit 2b6344c

Please sign in to comment.