Merge branch 'MDL-42111_m24' of git://github.com/rwijaya/moodle into MOODLE_24_STABLE

This commit is contained in:
Dan Poltawski
2013-11-04 15:31:37 +08:00
4 changed files with 48 additions and 1 deletions
+7
View File
@@ -1057,4 +1057,11 @@ h2.headingblock {
margin-right: 3px;
padding: 2px; /* adds padding to icon */
width: 12px;
}
.core_media_preview #page-wrapper {
min-width: 0;
background: none;
margin: 0;
padding: 0 5px;
}
+18 -1
View File
@@ -116,4 +116,21 @@ body {
}
.pagelayout-report #page-content #region-main {overflow:auto;}
.pagelayout-report #page-content #region-main .region-content {overflow:visible;}
.pagelayout-report #page-content #region-main .region-content {overflow:visible;}
.core_media_preview #page {
width: 100%;
min-width: 0;
margin: 0;
padding: 0;
}
body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
width: 422px;
padding: 0px;
background: none;
}
.core_media_preview.pagelayout-embedded .mediaplugin {
margin: 5px;
}
+12
View File
@@ -62,6 +62,18 @@
background-color:#FFF;
}
.core_media_preview #page-content #region-post-box {
margin-left: 0;
}
.core_media_preview #page-content #region-main-wrap {
width: 100%;
}
.core_media_preview #page-content #region-main {
margin-left: 30px;
}
#page-content #region-post-box {
margin-left:[[calculated:minusdoubleblockcolumnwidth]];
/* arrotonadamento angolo in basso a dx */
+11
View File
@@ -779,3 +779,14 @@ table.quizreviewsummary {
left:0;
padding-top:10px;
}
body#page-lib-editor-tinymce-plugins-moodlemedia-preview #page {
width: 100%;
}
body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
min-height: 100%;
margin-bottom: 0;
}
body#page-lib-editor-tinymce-plugins-moodlemedia-preview .mediaplugin {
padding-top: 10px;
}