Merge branch 'MDL-40082_master' of https://github.com/nadavkav/moodle

Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Eloy Lafuente (stronk7) 2013-07-23 12:16:11 +02:00
commit 3b117e79ce
3 changed files with 8 additions and 3 deletions

View file

@ -1331,7 +1331,7 @@ audio.mediaplugin_html5audio {
background-position: 0 -8866px;
}
.dir-rtl.yui-skin-sam .yui-panel .hd {
text-align: left;
text-align: right;
}
.dir-rtl .yui-skin-sam .yui-layout .yui-layout-unit div.yui-layout-bd {
text-align: right;

View file

@ -26,6 +26,10 @@
#chooseqtype .qtypename img {
padding: 0 0.3em;
}
#chooseqtype .qtypename {
display: inline-table;
width: 16em;
}
#chooseqtype .qtypesummary {
display: block;
margin: 0 2em;
@ -60,7 +64,7 @@
}
//#qtypechoicecontainer
#chooseqtype {
width: 35em;
width: 40em;
}
#chooseqtypehead h3 {
margin: 0;
@ -95,6 +99,7 @@
margin: 0;
padding: 1.5em 1.6em;
background-color: #fff;
overflow-y: auto;
}
#chooseqtype .instruction,
#chooseqtype .selected .qtypesummary {

File diff suppressed because one or more lines are too long