mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-03 15:29:08 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Dan Poltawski 2013-11-04 15:32:34 +08:00
commit 466fa368b5
7 changed files with 57 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
theme/bootstrapbase/less/moodle/core.less
View File

@ -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,

2
theme/bootstrapbase/less/moodle/responsive.less
View File

@ -434,7 +434,7 @@
margin-left: 0;
}
div[role=main] {
margin-bottom: 2em;
margin-bottom: 1em;
}
}

4
theme/bootstrapbase/style/moodle.css
View File

File diff suppressed because one or more lines are too long

9
theme/boxxie/style/core.css
View File

@ -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;
}

19
theme/brick/style/pagelayout.css
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
theme/formal_white/style/pagelayout.css
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 */

12
theme/splash/style/pagelayout.css
View File

@ -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;
}