L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Sam Hemelryk
2013-12-02 13:44:05 +13:00
parent f2d7e2dca9 e94d023225
commit 12539749f4
4 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
question/type/multichoice/styles.css
+14
View File
@@ -42,6 +42,20 @@ body#page-question-type-multichoice div[id^=fitem_id_][id*=answer_] .fitemtitle
font-weight: bold;
}
body#page-question-type-multichoice div[id^=fitem_id_] .fitemtitle{
margin-left: 0px;
margin-right: 0px;
padding-left: 6px;
padding-right: 0px;
}
body.dir-rtl#page-question-type-multichoice div[id^=fitem_id_] .fitemtitle {
margin-left: 0px;
margin-right: 0px;
padding-left: 0px;
padding-right: 6px;
}
body#page-question-type-multichoice div[id^=fitem_id_][id*=fraction_] {
background: #EEE;
margin-bottom: 0;
theme/base/style/question.css
+10 -7
View File
@@ -130,12 +130,6 @@ body.path-question-type .fitem_fgroup .accesshide {font: inherit;left: 0;positio
background: none;
}
/* Add a little padding to the answer sections of edit question forms. */
.path-question-type #id_answerhdr .fitem .fitemtitle,
.path-question-type #id_answerhdr .fitem .felement {
margin-left: 6px;
margin-right: 6px;
}
.path-question-type #id_answerhdr .fitem_feditor .felement {
margin-left: 0px;
margin-right: 0px;
@@ -145,10 +139,19 @@ body.path-question-type .fitem_fgroup .accesshide {font: inherit;left: 0;positio
margin-left: 16%;
margin-right: 0px;
}
.dir-rtl .path-question-type #id_answerhdr .fitem_feditor .felement {
body#page-question-type-multichoice div[id^=fitem_id_] .fitemtitle {
padding-left: 0;
padding-right: 0;
}
.dir-rtl.path-question-type #id_answerhdr .fitem_feditor .felement {
margin-right: 16%;
margin-left: 0px;
}
body.dir-rtl#page-question-type-multichoice div[id^=fitem_id_] .fitemtitle {
padding-left: 0;
padding-right: 0;
}
}
/** Overide for RTL layout **/
theme/bootstrapbase/less/moodle/question.less
-11
View File
@@ -460,14 +460,3 @@ a#hidebankcmd {
.que label {
display: inline;
}
/* Add a little padding to the answer sections of edit question forms. */
.path-question-type #id_answerhdr .fitem .fitemtitle,
.path-question-type #id_answerhdr .fitem .felement {
margin-left: 6px;
margin-right: 6px;
}
.path-question-type #id_answerhdr .fitem_feditor .felement {
margin-left: 0px;
margin-right: 0px;
}
theme/bootstrapbase/style/moodle.css
+1 -1
View File
File diff suppressed because one or more lines are too long