Skip to content

Commit

Permalink
Merge branch 'wip-MDL-33521-m23' of git://github.com/samhemelryk/mood…
Browse files Browse the repository at this point in the history
…le into MOODLE_23_STABLE
  • Loading branch information
stronk7 committed Jul 2, 2012
2 parents 18c2647 + abfc9e2 commit cf5b51a
Show file tree
Hide file tree
Showing 12 changed files with 24 additions and 25 deletions.
8 changes: 4 additions & 4 deletions admin/tool/health/styles.css
Expand Up @@ -3,7 +3,7 @@
width: 60%;
margin: auto;
padding: 1em;
border: 1px black solid;
border: 1px solid black;
-moz-border-radius: 6px;
}
.path-admin-tool-health dl.healthissues {
Expand Down Expand Up @@ -35,15 +35,15 @@
.path-admin-tool-health dl.healthissues dd {
margin: 0px;
padding: 1em;
border: 1px black solid;
border: 1px solid black;
}
.path-admin-tool-health dl.healthissues dt {
font-weight: bold;
border-bottom: none;
border-bottom: 0;
padding-bottom: 0.5em;
}
.path-admin-tool-health dl.healthissues dd {
border-top: none;
border-top: 0;
padding-top: 0.5em;
margin-bottom: 10px;
}
Expand Down
2 changes: 1 addition & 1 deletion blocks/community/styles.css
Expand Up @@ -173,7 +173,7 @@
bottom:0;
right:0;
opacity:0.35;
filter:alpha(opacity:35);
filter:alpha(opacity=35);
background:#000;
}

Expand Down
8 changes: 4 additions & 4 deletions grade/report/grader/styles.css
Expand Up @@ -185,7 +185,7 @@ margin-right:10px;
}

table#user-grades .quickfeedback {
border:#000 1px dashed;
border:1px dashed #000;
}

.path-grade-report-grader #siteconfiglink {
Expand Down Expand Up @@ -262,7 +262,7 @@ border-width:0 1px 1px;
}

.path-grade-report-grader table td.topleft {
border-bottom:none;
border-bottom:0;
}

table#user-grades td.topleft {
Expand Down Expand Up @@ -325,12 +325,12 @@ margin: 10px 10px 0px 10px;
}

.path-grade-report-grader table#quick_edit td.fullname {
border-left:none;
border-left:0;
padding-left:5px;
}

.path-grade-report-grader table#quick_edit td.picture {
border-right:none;
border-right:0;
}

.path-grade-report-grader table#quick_edit td.finalgrade input {
Expand Down
6 changes: 3 additions & 3 deletions mod/quiz/styles.css
Expand Up @@ -48,7 +48,7 @@ body.jsenabled .questionflagcheckbox {display: none;}
.path-mod-quiz .qnbutton.incorrect .trafficlight {border-top: 3px solid #800;}

.path-mod-quiz .qnbutton.free:hover {text-decoration: underline;}
.path-mod-quiz .qnbutton.free span {cursor: pointer; cursor: hand;}
.path-mod-quiz .qnbutton.free span {cursor: pointer;}

.path-mod-quiz .othernav {clear: both; margin: 0.5em 0;}
.path-mod-quiz .othernav a,
Expand Down Expand Up @@ -192,7 +192,7 @@ table#categoryquestions {width: 100%;overflow: hidden;table-layout: fixed;}
#page-mod-quiz-edit div.quizwhenbankcollapsed {width:100%;}
#page-mod-quiz-edit div.quizpage {display:block;clear:both;width:100%;}
#page-mod-quiz-edit div.quizpage span.pagetitle {margin-top:0.3em;float:left;display:block;color:#006;}
#page-mod-quiz-edit div.quizpage .pagecontent {margin-top:0.3em;display:block;float:left;position:relative;margin-left:0.3em;margin-bottom:0.2em;border-left:solid #777 thin;line-height:1.3em;-webkit-border-radius:0.6em;-webkit-border-radius-bottomleft:0;-webkit-border-radius-topleft:0;border-radius:0.6em;border-radius-bottomleft:0;border-radius-topleft:0;width:88%;padding:0.15em 0 0.3em;background-color:#d6d6d6;}
#page-mod-quiz-edit div.quizpage .pagecontent {margin-top:0.3em;display:block;float:left;position:relative;margin-left:0.3em;margin-bottom:0.2em;border-left:thin solid #777;line-height:1.3em;-webkit-border-radius:0.6em;-webkit-border-radius-bottomleft:0;-webkit-border-radius-topleft:0;border-radius:0.6em;border-radius-bottomleft:0;border-radius-topleft:0;width:88%;padding:0.15em 0 0.3em;background-color:#d6d6d6;}
#page-mod-quiz-edit div.quizpage .pagecontent .pagestatus {-webkit-border-radius-bottomright:0.3em;-webkit-border-radius-topright:0.3em;border-radius-bottomright:0.3em;border-radius-topright:0.3em;margin:0.3em;padding:0.1em 0.1em 0.1em 0.3em;background-color:#eee;font-weight:bold;}
#page-mod-quiz-edit div.quizpage .pagecontent form#addquestion{background-color:#fff;}
#page-mod-quiz-edit div.quizpage .pagecontent form.randomquestionform div {/* it is a mystery why this has to be inline-table but otherwise the layout gets screwed, even if it is "inline" */display: inline-table;}
Expand Down Expand Up @@ -237,7 +237,7 @@ table#categoryquestions {width: 100%;overflow: hidden;table-layout: fixed;}
#page-mod-quiz-edit div.question div.qnum {display:block;float:left;width:1.4em;padding-right:0.3em;padding-left:0;z-index:99;text-align:right;color:#333;}
#page-mod-quiz-edit div.question div.questioncontainer{background-color:#ffc;}
#page-mod-quiz-edit div.editq div.question div.content{width:87%;float:left;position:relative;-webkit-border-radius:0.6em;-webkit-border-radius-bottomleft:0;-webkit-border-radius-topleft:0;border-radius:0.6em;border-radius-bottomleft:0;border-radius-topleft:0;line-height:1.4em;padding:0.5em;}
#page-mod-quiz-edit div.question div.content div.points{top:0.5em;border-left:#FFF solid 0.4em;width:8.5em;padding:0.2em;line-height:1em;max-width:30%;position:absolute;right:50px;-webkit-border-radius:0.2em;-webkit-border-radius-bottomleft:0;-webkit-border-radius-topleft:0;border-radius:0.2em;border-radius-bottomleft:0;border-radius-topleft:0;z-index:900;display:block;margin:0;background-color:#ddf;}
#page-mod-quiz-edit div.question div.content div.points{top:0.5em;border-left:0.4em solid #FFF;width:8.5em;padding:0.2em;line-height:1em;max-width:30%;position:absolute;right:50px;-webkit-border-radius:0.2em;-webkit-border-radius-bottomleft:0;-webkit-border-radius-topleft:0;border-radius:0.2em;border-radius-bottomleft:0;border-radius-topleft:0;z-index:900;display:block;margin:0;background-color:#ddf;}
#page-mod-quiz-edit div.question div.content div.points input{width:2em;padding:0;}
#page-mod-quiz-edit div.question div.content div.points input.pointssubmitbutton{width:auto;}
#page-mod-quiz-edit div.question div.content div.qorder {line-height:1em;max-width:30%;position:absolute;right:50px;-webkit-border-radius:0.2em;-webkit-border-radius-bottomleft:0;-webkit-border-radius-topleft:0;border-radius:0.2em;border-radius-bottomleft:0;border-radius-topleft:0;z-index:900;display:block;margin:0;background-color:#ddf;}
Expand Down
2 changes: 1 addition & 1 deletion mod/wiki/styles.css
Expand Up @@ -142,7 +142,7 @@
}

.wiki_modifieduser img {
border: thin black solid;
border: thin solid black;
}

.wiki_restore_yes, .wiki_deletecomment_yes {
Expand Down
8 changes: 4 additions & 4 deletions mod/workshop/styles.css
Expand Up @@ -20,12 +20,12 @@

.path-mod-workshop .groupwidget {
text-align:center;
margin: 0.75 auto;
margin: 0.75em auto;
}

.path-mod-workshop .perpagewidget {
text-align:center;
margin: 0.75 auto;
margin: 0.75em auto;
}

/**
Expand Down Expand Up @@ -246,7 +246,7 @@
color: black;
font-size: 140%;
border: 1px solid #ddd;
border-bottom: none;
border-bottom: 0;
background: #e7f1c3;
}

Expand Down Expand Up @@ -276,7 +276,7 @@
}

.path-mod-workshop .userplan td.lastcol {
border-right: none;
border-right: 0;
}

.path-mod-workshop .userplan td.active {
Expand Down
4 changes: 2 additions & 2 deletions theme/base/style/admin.css
Expand Up @@ -157,7 +157,7 @@
#adminsettings fieldset.error legend {display: block;}
#adminsettings .form-item {clear: both;margin: 1em 0 2em 0;}
#adminsettings .form-item .form-label {display: block;float: left;width: 12.5em;text-align: right;}
#adminsettings .form-item .form-label .form-shortname {display:block;line-break: break;}
#adminsettings .form-item .form-label .form-shortname {display:block;}
#adminsettings .form-item .form-setting {display: block;margin-left: 13.5em;text-align: left;}
#adminsettings .form-item .form-setting .form-htmlarea {width: 640px;display:inline;}
#adminsettings .form-item .form-setting .form-htmlarea .htmlarea {width: 640px;display:block;}
Expand All @@ -181,7 +181,7 @@
.admin_colourpicker_preview {display:none;}
.jsenabled .admin_colourpicker_preview {display:inline;}
.jsenabled .admin_colourpicker {display:block;height:102px;width:410px;margin-bottom:10px;}
.admin_colourpicker .loadingicon {vertical-align:center;margin-left:auto;}
.admin_colourpicker .loadingicon {vertical-align:middle;margin-left:auto;}
.admin_colourpicker .colourdialogue {float:left;border:1px solid #000;}
.admin_colourpicker .previewcolour {border:1px solid #000;margin-left:301px;}
.admin_colourpicker .currentcolour {border:1px solid #000;margin-left:301px;border-top-width:0;}
Expand Down
2 changes: 1 addition & 1 deletion theme/base/style/course.css
Expand Up @@ -168,6 +168,6 @@ input.titleeditor {
/* Course drag and drop upload styles */
#dndupload-status {width:40%;margin:0 30%;padding:6px;border:1px solid #ddd;text-align:center;background:#ffc;position:absolute;z-index:9999;box-shadow:2px 2px 5px 1px #ccc;border-radius:0px 0px 8px 8px;z-index: 0;}
.dndupload-preview {color:#909090;border:1px dashed #909090;}
.dndupload-progress-outer {width:70px;border:solid black 1px;height:10px;display:inline-block;margin:0;padding:0;overflow:hidden;position:relative;}
.dndupload-progress-outer {width:70px;border:1px solid black;height:10px;display:inline-block;margin:0;padding:0;overflow:hidden;position:relative;}
.dndupload-progress-inner {width:0%;height:100%;background-color:green;display:inline-block;margin:0;padding:0;float:left;}
.dndupload-hidden {display:none;}
3 changes: 1 addition & 2 deletions theme/base/style/filemanager.css
Expand Up @@ -228,8 +228,7 @@ a.ygtvspacer:hover {color: transparent;text-decoration: none;}
/*
* Lazy loading on fp-content (File Picker only)
*/
.file-picker .fp-nextpage {clear:both;align:center;}
.file-picker .fp-nextpage .fp-nextpage-link {align:center;}
.file-picker .fp-nextpage {clear:both;}
.file-picker .fp-nextpage .fp-nextpage-loading {display:none;}
.file-picker .fp-nextpage.loading .fp-nextpage-link {display:none;}
.file-picker .fp-nextpage.loading .fp-nextpage-loading {display:block;text-align: center;height: 100px;padding-top: 50px;}
Expand Down
2 changes: 1 addition & 1 deletion theme/base/style/message.css
Expand Up @@ -43,7 +43,7 @@ table.message .searchresults td {padding:5px;}
.message .messagearea .messagehistory .left {padding-bottom:10px;width:50%;float:left;clear:both;}
.message .messagearea .messagehistory .right {padding-bottom:10px;width:50%;float:right;clear:both;}
.message .messagearea .messagehistory .notification {padding:10px;background-color:#EEEEEE;margin-top:5px;}
.message .messagearea .messagesend {padding-top:20px;float:center;clear:both;}
.message .messagearea .messagesend {padding-top:20px;clear:both;}
.message .messagearea .messagesend .messagesendbox {width:100%}
.message .messagearea .messagesend fieldset {padding:0px;margin:0;} /** bring the message send button closer to the message box */

Expand Down
2 changes: 1 addition & 1 deletion theme/standard/style/grade.css
Expand Up @@ -29,7 +29,7 @@ td.grade div.overridden {background-color: #DDDDDD;}
.gradetreebox tr.category th.cell.rowspan {border-width:0; border-left:1px solid #AAA;}
.gradetreebox tr.category th.cell.rowspan:hover {background-color: #EEE;}
.gradetreebox td.name {border-left: 0px;}
.gradetreebox td.colspan {border-left: 1px solid #AAA;border-bottom: 1px solid #AAA;border-top: none;background-color: #DDD;}
.gradetreebox td.colspan {border-left: 1px solid #AAA;border-bottom: 1px solid #AAA;border-top: 0;background-color: #DDD;}
.gradetreebox tr .cell.level1 {background-color: #F3DFD0; width: 10px;}
.gradetreebox tr .cell.level2 {background-color: #D0DBD3; width: 10px;}
.gradetreebox tr .cell.level3 {background-color: #D0F3D6; width: 10px;}
Expand Down
2 changes: 1 addition & 1 deletion theme/standard/style/modules.css
Expand Up @@ -131,7 +131,7 @@ table.mod_index {width:90%;margin:1em auto;}
#page-mod-glossary-import table.glossaryimportexport {text-align: center;}
.path-mod-glossary .glossarydisplay {width: 90%;text-align:center;}
.path-mod-glossary .entrybox {border-width: 0px 1px 1px 1px;border-style: solid;border-color: #BBB;}
.path-mod-glossary .entrybox hr {border-left:none;border-right:none;}
.path-mod-glossary .entrybox hr {border-left:0;border-right:0;}
#page-mod-glossary-report table tr.teacher {background: #F0F0F0;}
#page-mod-glossary-view table.glossarycategoryheader {background-color: #DDD;}
#page-mod-glossary-view table.glossarycategoryheader h2 {font-size: 1em;margin: 0;}
Expand Down

0 comments on commit cf5b51a

Please sign in to comment.