Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'MDL-37771-M24' of git://github.com/lazydaisy/moodle int…

…o MOODLE_24_STABLE
  • Loading branch information...
commit a22f7cb864e8b4cd8e2bacc9ae679aedb5e9f118 2 parents 2f286d7 + 89bcfc4
@damyon damyon authored
View
3  theme/anomaly/style/general.css
@@ -306,7 +306,6 @@ h1.headermain {
margin-right: auto;
width: 100%;
}
-#categoryquestions th,
.user th,
.user th.header,
.group th.header,
@@ -318,14 +317,12 @@ h1.headermain {
border-bottom-color: #111;
}
.user th a:link,
-#categoryquestions th a:link,
.group th a:link,
.admin table tr th a:link {
color: #FFF;
text-decoration: none;
}
.user th a:visited,
-#categoryquestions th a:visited,
.group th a:visited,
.admin table tr th a:visited {
color: #FFF;
View
3  theme/base/style/question.css
@@ -99,6 +99,9 @@
#page-question-preview #techinfo {
margin: 1em 0;
}
+#page-mod-quiz-edit #categoryquestions .header {
+ background: none;
+}
/** Overide for RTL layout **/
.dir-rtl #qtypechoicecontainer #chooseqtype .instruction,
View
4 theme/magazine/style/core.css
@@ -1139,7 +1139,9 @@ div.questionbankwindow.block div.header {
background: #eee !important;
}
-div.questionbankwindow.block div.header a {
+#page-mod-quiz-edit .questionbankwindow.block div.header div.title h2,
+#page-mod-quiz-edit .questionbankwindow a#showbankcmd,
+#page-mod-quiz-edit .questionbankwindow a#hidebankcmd {
color: #333333 !important;
font-size: 11px;
}
View
6 theme/serenity/style/core.css
@@ -304,3 +304,9 @@ body.has_dock {
-moz-box-shadow: 0px 1px 3px #ccc;
box-shadow: 0px 1px 3px #ccc;
}
+/* Question Bank Window
+-------------------------*/
+#page-mod-quiz-edit .questionbankwindow.block div.header {
+ background-color: #9EB1BF;
+ padding-top: 0;
+}
View
6 theme/splash/style/blue.css
@@ -59,11 +59,9 @@ body.splash-blue {
.splash-blue .coursebox{
border-bottom: 1px dashed #cbd3d6;
}
-.splash-blue #categoryquestions tr th{
- background:#3d6276;
-}
.splash-blue .path-mod-quiz .qnbutton {
- background:#3d6276; color:#fff;
+ background:#3d6276;
+ color:#fff;
}
.splash-blue .path-mod-quiz .qnbutton.open {
background:#3d6276;
View
6 theme/splash/style/green.css
@@ -57,11 +57,9 @@ body.splash-green { background:url([[pix:theme|bggreen]]) top left repeat-x;
.splash-green .coursebox{
border-bottom: 1px dashed #dae0dc;
}
-.splash-green #categoryquestions tr th{
- background:#446e4c;color:#fff;
-}
.splash-green .path-mod-quiz .qnbutton{
- background:#446e4c;color:#fff;
+ background:#446e4c;
+ color:#fff;
}
.splash-green .path-mod-quiz .qnbutton.open{
background:#446e4c;
View
6 theme/splash/style/orange.css
@@ -50,7 +50,8 @@ body.splash-orange {
color:#cb8f47;
}
.splash-orange .tabtree .tabrow0 .here a:hover{
- background:#fff;color: #5f564c;
+ background:#fff;
+ color: #5f564c;
}
.splash-orange .tabtree .here ul .here a.nolink:hover{
color:#cb8f47;
@@ -58,9 +59,6 @@ body.splash-orange {
.splash-orange .coursebox{
border-bottom:1px dashed #f0e7de;
}
-.splash-orange #categoryquestions tr th{
- background:#cb8f47;
-}
.splash-orange .path-mod-quiz .qnbutton{
background:#cb8f47;
}
View
51 theme/splash/style/pagelayout.css
@@ -299,6 +299,11 @@ h2.main,h3.main,h4.main,h5.main,h6.main{
font-style:italic;
padding:10px 30px;
}
+.generalbox{
+ display:block;
+ margin-top:2px;
+ width:98%;
+}
.generalbox ul{
padding:0 0 0 20px;
}
@@ -639,61 +644,57 @@ input[type=text],textarea,select,input[type=password]{
font-weight:700;
padding-top:12px;
}
+table.quizreviewsummary {
+ margin:10px 0 10px 30px;
+ width:90%;
+}
#page-mod-quiz-attempt .submitbtns,
#page-mod-quiz-review .submitbtns,
#page-mod-quiz-summary .submitbtns{
padding:10px;
}
-
#page-mod-quiz-edit .questionbankwindow div.header {
font-size:1em;
margin:0;
padding:0;
}
-
-#page-mod-quiz-edit #region-main .questionbankwindow h2{
+#page-mod-quiz-edit #region-main .questionbankwindow h2 {
background:none;
font-size:1em;
font-weight:700;
margin:0;
padding:10px 0 10px 10px;
}
-
-#page-mod-quiz-edit .questionbankwindow div.header a{
+#page-mod-quiz-edit .questionbankwindow div.header a {
font-weight:400;
}
-
-#page-mod-quiz-edit div.quizpage .pagecontent .pagestatus
-{
+#page-mod-quiz-edit div.quizpage .pagecontent .pagestatus {
font-weight:700;
}
-
-#page-mod-quiz-edit div.quizpage span.pagetitle{
+#page-mod-quiz-edit div.quizpage span.pagetitle {
font-weight:700;
margin-top:10px;
}
-#page-mod-quiz-edit .editq div.question div.qnum{
+#page-mod-quiz-edit .editq div.question div.qnum {
font-size:1.2em;
font-weight:700;
padding-top:3px;
}
-table.quizreviewsummary{
- margin:10px 0 10px 30px;
- width:90%;
+#page-mod-quiz-edit .questionbank div.categoryquestionscontainer,
+#page-mod-quiz-edit .questionbank .categorysortopotionscontainer,
+#page-mod-quiz-edit .questionbank .categorypagingbarcontainer,
+#page-mod-quiz-edit .questionbank .categoryselectallcontainer {
+ padding: 0;
+ margin: 0 0.3em;
}
-#categoryquestions tr th{
- border-bottom:0 none;
+#page-mod-quiz-edit form#displayoptions fieldset.invisiblefieldset div {
+ margin: 0.3em;
}
-.questioncategories{
- margin-bottom:10px;
+#page-mod-quiz-edit div.container div.generalbox {
+ width: 100%;
}
-.questionbank input[type=submit]{
- margin:5px;
-}
-.generalbox{
- display:block;
- margin-top:2px;
- width:98%;
+#page-mod-quiz-edit #categoryquestions .header {
+ background: 0 none;
}
#page-admin-plugins #plugins-control-panel{
display:block;
View
6 theme/splash/style/red.css
@@ -71,11 +71,11 @@ a:hover {
color:#853650;
}
.path-mod-quiz .qnbutton {
- background:#853650;color:#fff;
+ background:#853650;
+ color:#fff;
}
.path-mod-quiz .qnbutton.open {
- background:#853650;}
-#categoryquestions tr th{background:#853650;
+ background:#853650;
}
.pagelayout-redirect {
border-top: 1px solid #6d1523;
Please sign in to comment.
Something went wrong with that request. Please try again.