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

Conflicts: theme/bootstrapbase/style/moodle.css
2013-11-04 15:32:34 +08:00
parent f6015bbf02 f6606495e4
commit 466fa368b5
7 changed files with 57 additions and 6 deletions
@@ -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,
@@ -434,7 +434,7 @@
    margin-left: 0;
  }
  div[role=main] {
-      margin-bottom: 2em;
+      margin-bottom: 1em;
  }
 }