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

Conflicts: theme/bootstrapbase/style/moodle.css
moodle · Nov 4, 2013 · 466fa36 · 466fa36
2 parents f6015bb + f660649
commit 466fa36
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 6 deletions.
diff --git a/theme/bootstrapbase/less/moodle/core.less b/theme/bootstrapbase/less/moodle/core.less
@@ -1286,8 +1286,11 @@ audio.mediaplugin_html5audio {
 .core_media_preview.pagelayout-embedded #maincontent {
     height: 0;
 }
-.core_media_preview.pagelayout-embedded .mediaplugin {
+body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
+    padding: 0;
     margin: 0;
+    min-width: 0;
+    background: none;
 }
 /** Fix YUI 2 Treeview for Right to left languages **/
 .dir-rtl .ygtvtn,

diff --git a/theme/bootstrapbase/less/moodle/responsive.less b/theme/bootstrapbase/less/moodle/responsive.less
@@ -434,7 +434,7 @@
     margin-left: 0;
   }
   div[role=main] {
-      margin-bottom: 2em;
+      margin-bottom: 1em;
   }
 }
 

diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
diff --git a/theme/boxxie/style/core.css b/theme/boxxie/style/core.css
@@ -1063,4 +1063,11 @@ td.eventskey {
     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;
+}
diff --git a/theme/brick/style/pagelayout.css b/theme/brick/style/pagelayout.css
@@ -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;
+}
+
diff --git a/theme/formal_white/style/pagelayout.css b/theme/formal_white/style/pagelayout.css
@@ -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 */

diff --git a/theme/splash/style/pagelayout.css b/theme/splash/style/pagelayout.css
@@ -779,3 +779,15 @@ 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;
+}