moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-40975-overflow' of git://github.com/andrewnicols/moodle

Browse source 
Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Damyon Wiese 2013-11-07 12:23:25 +08:00
commit 81b07e655c
12 changed files with 177 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

48
theme/base/style/core.css
View file

@ -736,39 +736,23 @@ body.tag .managelink {padding: 5px;}
.corelightbox {background-color:#CCC;position:absolute;top:0;left:0;width:100%;height:100%;text-align:center;}
.corelightbox img {position:fixed;top:50%; left: 50%;}
.mod-indent-1 {margin-left:30px;}
.mod-indent-2 {margin-left:60px;}
.mod-indent-3 {margin-left:90px;}
.mod-indent-4 {margin-left:120px;}
.mod-indent-5 {margin-left:150px;}
.mod-indent-6 {margin-left:180px;}
.mod-indent-7 {margin-left:210px;}
.mod-indent-8 {margin-left:240px;}
.mod-indent-9 {margin-left:270px;}
.mod-indent-10 {margin-left:300px;}
.mod-indent-11 {margin-left:330px;}
.mod-indent-12 {margin-left:360px;}
.mod-indent-13 {margin-left:390px;}
.mod-indent-14 {margin-left:420px;}
.mod-indent {display:table-cell;}
.mod-indent-1 {width:30px;}
.mod-indent-2 {width:60px;}
.mod-indent-3 {width:90px;}
.mod-indent-4 {width:120px;}
.mod-indent-5 {width:150px;}
.mod-indent-6 {width:180px;}
.mod-indent-7 {width:210px;}
.mod-indent-8 {width:240px;}
.mod-indent-9 {width:270px;}
.mod-indent-10 {width:300px;}
.mod-indent-11 {width:330px;}
.mod-indent-12 {width:360px;}
.mod-indent-13 {width:390px;}
.mod-indent-14 {width:420px;}
.mod-indent-15,
.mod-indent-huge {margin-left:420px;}
.dir-rtl .mod-indent-1 {margin-right:30px;margin-left:0;}
.dir-rtl .mod-indent-2 {margin-right:60px;margin-left:0;}
.dir-rtl .mod-indent-3 {margin-right:90px;margin-left:0;}
.dir-rtl .mod-indent-4 {margin-right:120px;margin-left:0;}
.dir-rtl .mod-indent-5 {margin-right:150px;margin-left:0;}
.dir-rtl .mod-indent-6 {margin-right:180px;margin-left:0;}
.dir-rtl .mod-indent-7 {margin-right:210px;margin-left:0;}
.dir-rtl .mod-indent-8 {margin-right:240px;margin-left:0;}
.dir-rtl .mod-indent-9 {margin-right:270px;margin-left:0;}
.dir-rtl .mod-indent-10 {margin-right:300px;margin-left:0;}
.dir-rtl .mod-indent-11 {margin-right:330px;margin-left:0;}
.dir-rtl .mod-indent-12 {margin-right:360px;margin-left:0;}
.dir-rtl .mod-indent-13 {margin-right:390px;margin-left:0;}
.dir-rtl .mod-indent-14 {margin-right:420px;margin-left:0;}
.dir-rtl .mod-indent-15,
.dir-rtl .mod-indent-huge {margin-right:420px;margin-left:0;}
.mod-indent-huge {width:420px;}
.dir-rtl .mform .fitem .felement {margin-right: 16%;margin-left:auto;text-align: right;}
.dir-rtl .mform .fitem .felement input[name=email],

36
theme/base/style/course.css
View file

@ -40,11 +40,12 @@
right: 0;
}
.section .activity .mod-indent {
.section .activity .mod-indent-outer {
display: table;
padding-left: 24px;
}
.dir-rtl .section .activity .mod-indent {
.dir-rtl .section .activity .mod-indent-outer {
padding-left: auto;
padding-right: 24px;
}
@ -69,16 +70,35 @@
}
.editing .sitetopic .section .activity .activityinstance,
.editing .course-content .section .activity .activityinstance {
.editing .course-content .section .activity .activityinstance,
.editing .sitetopic .section .activity .contentwithoutlink,
.editing .course-content .section .activity .contentwithoutlink {
padding-right: 200px;
}
.dir-rtl.editing .sitetopic .section .activity .activityinstance,
.dir-rtl.editing .course-content .section .activity .activityinstance,
.dir-rtl.editing .sitetopic .section .activity .contentwithoutlink,
.dir-rtl.editing .course-content .section .activity .contentwithoutlink {
padding-left: 200px;
padding-right: initial;
}
.sitetopic .section .activity .activityinstance,
.course-content .section .activity .activityinstance,
.sitetopic .section .activity .contentwithoutlink,
.course-content .section .activity .contentwithoutlink {
padding-right: 32px;
height: 2em;
display: table-cell;
}
.dir-rtl.editing .sitetopic .section .activity .activityinstance,
.dir-rtl.editing .course-content .section .activity .activityinstance {
padding-left: 200px;
padding-right: auto;
.dir-rtl .sitetopic .section .activity .activityinstance,
.dir-rtl .course-content .section .activity .activityinstance,
.dir-rtl .sitetopic .section .activity .contentwithoutlink,
.dir-rtl .course-content .section .activity .contentwithoutlink {
padding-left: 32px;
padding-right: initial;
}
.course-content .section .activity .filler {
@ -132,7 +152,7 @@
.sitetopic .section .activity .availabilityinfo,
.sitetopic .section .activity .contentafterlink,
.course-content .section .activity .availabilityinfo,
.course-content .section .activity .contentafterlink { margin-top: 0.5em; margin-left: 30px;}
.course-content .section .activity .contentafterlink { margin-top: 0.5em;}
.dir-rtl .sitetopic .section .activity .availabilityinfo,
.dir-rtl .sitetopic .section .activity .contentafterlink,
.dir-rtl .course-content .section .activity .availabilityinfo,

99
theme/bootstrapbase/less/moodle/core.less
View file

@ -1153,113 +1153,60 @@ body.tag .managelink {
top: 50%;
left: 50%;
}
.mod-indent-outer {
display: table;
}
.mod-indent {
display: table-cell;
}
.mod-indent-1 {
margin-left: 30px;
width: 30px;
}
.mod-indent-2 {
margin-left: 60px;
width: 60px;
}
.mod-indent-3 {
margin-left: 90px;
width: 90px;
}
.mod-indent-4 {
margin-left: 120px;
width: 120px;
}
.mod-indent-5 {
margin-left: 150px;
width: 150px;
}
.mod-indent-6 {
margin-left: 180px;
width: 180px;
}
.mod-indent-7 {
margin-left: 210px;
width: 210px;
}
.mod-indent-8 {
margin-left: 240px;
width: 240px;
}
.mod-indent-9 {
margin-left: 270px;
width: 270px;
}
.mod-indent-10 {
margin-left: 300px;
width: 300px;
}
.mod-indent-11 {
margin-left: 330px;
width: 330px;
}
.mod-indent-12 {
margin-left: 360px;
width: 360px;
}
.mod-indent-13 {
margin-left: 390px;
width: 390px;
}
.mod-indent-14 {
margin-left: 420px;
width: 420px;
}
.mod-indent-15,
.mod-indent-huge {
margin-left: 420px;
}
.dir-rtl .mod-indent-1 {
margin-right: 30px;
margin-left: 0;
}
.dir-rtl .mod-indent-2 {
margin-right: 60px;
margin-left: 0;
}
.dir-rtl .mod-indent-3 {
margin-right: 90px;
margin-left: 0;
}
.dir-rtl .mod-indent-4 {
margin-right: 120px;
margin-left: 0;
}
.dir-rtl .mod-indent-5 {
margin-right: 150px;
margin-left: 0;
}
.dir-rtl .mod-indent-6 {
margin-right: 180px;
margin-left: 0;
}
.dir-rtl .mod-indent-7 {
margin-right: 210px;
margin-left: 0;
}
.dir-rtl .mod-indent-8 {
margin-right: 240px;
margin-left: 0;
}
.dir-rtl .mod-indent-9 {
margin-right: 270px;
margin-left: 0;
}
.dir-rtl .mod-indent-10 {
margin-right: 300px;
margin-left: 0;
}
.dir-rtl .mod-indent-11 {
margin-right: 330px;
margin-left: 0;
}
.dir-rtl .mod-indent-12 {
margin-right: 360px;
margin-left: 0;
}
.dir-rtl .mod-indent-13 {
margin-right: 390px;
margin-left: 0;
}
.dir-rtl .mod-indent-14 {
margin-right: 420px;
margin-left: 0;
}
.dir-rtl .mod-indent-15,
.dir-rtl .mod-indent-huge {
margin-right: 420px;
margin-left: 0;
width: 420px;
}
/* Audio player size in 'block' mode (can only change width, height is hardcoded in JS) */
.resourcecontent .mediaplugin_mp3 object {
height: 25px;

28
theme/bootstrapbase/less/moodle/course.less
View file

@ -57,7 +57,7 @@
top: 0;
}
.mod-indent {
.mod-indent-outer {
/**
* Add appropriate padding such that nothing overlaps the
* absolute positioned move icon.
@ -72,7 +72,14 @@
top: 0;
}
.contentwithoutlink,
.activityinstance {
min-width: 40%;
display: table-cell;
padding-right: 4px;
min-height: 2em;
.dimmed {
img.activityicon {
opacity: 0.5;
@ -114,12 +121,12 @@
right: 100%;
}
.mod-indent {
.mod-indent-outer {
/**
* Add appropriate padding such that nothing overlaps the
* absolute positioned move icon.
*/
padding-left: auto;
padding-left: initial;
padding-right: 32px;
}
@ -128,6 +135,12 @@
left: 0;
right: auto;
}
.contentwithoutlink,
.activityinstance {
padding-left: 4px;
padding-right: initial;
}
}
}
@ -162,11 +175,9 @@
.editing {
.section {
.activity {
.contentwithoutlink,
.activityinstance {
min-width: 40%;
display: table-cell;
padding-right: 200px;
min-height: 2em;
}
}
}
@ -175,6 +186,7 @@
.dir-rtl.editing {
.section {
.activity {
.contentwithoutlink,
.activityinstance {
padding-left: 200px;
padding-right: 0;
@ -192,10 +204,6 @@
white-space: nowrap;
display: inline;
}
.section .activity.modtype_label .commands {
margin-left: 40%;
padding-left: .2em;
}
.section .activity.modtype_label.label {
font-weight: normal;
padding: .2em;

2
theme/bootstrapbase/style/moodle.css
View file

File diff suppressed because one or more lines are too long