Merge branch 'MDL-54654-master' of git://github.com/danpoltawski/moodle

This commit is contained in:
Andrew Nicols 2016-06-21 09:58:18 +08:00
commit 62d34a4af2
6 changed files with 179 additions and 48 deletions

View File

@ -279,7 +279,6 @@ ul.assignfeedback_editpdf_menu {
.dir-rtl .assignfeedback_editpdf_widget .commentdrawable a {
float: left;
left: none;
right: -17px;
border-left: 0px;
border-right: 1px solid #ccc;

View File

@ -1,4 +1,4 @@
/*csslint important:false */
#page-mod-book-print {
color: #000;
background-color: #fff;

View File

@ -1,61 +1,194 @@
.path-mod-choice .results {border-collapse: separate;}
.path-mod-choice .results .data {vertical-align:top;white-space: nowrap;}
.path-mod-choice .button {text-align:center;}
.path-mod-choice .attemptcell {width:5px;white-space: nowrap;}
.path-mod-choice .anonymous,
.path-mod-choice .names {margin-left:auto;margin-right:auto; width:80%;}
.path-mod-choice .downloadreport {border-width:0;margin-left:10%;}
.path-mod-choice .choiceresponse {width:100%;}
.path-mod-choice .choiceresponse .picture {width:10px;white-space: nowrap;}
.path-mod-choice .choiceresponse .fullname {width:100%;white-space: nowrap;}
.path-mod-choice .results {
border-collapse: separate;
}
.path-mod-choice .responseheader {width: 100%; text-align: center; margin-top: 10px;}
.path-mod-choice .choices .option label {vertical-align: top;}
.path-mod-choice .choices .option input {vertical-align: middle;}
.path-mod-choice .results .data {
vertical-align: top;
white-space: nowrap;
}
.path-mod-choice .button {
text-align: center;
}
.path-mod-choice .attemptcell {
width: 5px;
white-space: nowrap;
}
.path-mod-choice .anonymous,
.path-mod-choice .names {
margin-left: auto;
margin-right: auto;
width: 80%;
}
.path-mod-choice .downloadreport {
border-width: 0;
margin-left: 10%;
}
.path-mod-choice .choiceresponse {
width: 100%;
}
.path-mod-choice .choiceresponse .picture {
width: 10px;
white-space: nowrap;
}
.path-mod-choice .choiceresponse .fullname {
width: 100%;
white-space: nowrap;
}
.path-mod-choice .responseheader {
width: 100%;
text-align: center;
margin-top: 10px;
}
.path-mod-choice .choices .option label {
vertical-align: top;
}
.path-mod-choice .choices .option input {
vertical-align: middle;
}
.path-mod-choice .horizontal,
.path-mod-choice .vertical {margin-left: 10%;margin-right: 10%;}
.path-mod-choice .horizontal .choices .option {padding-right: 20px; display: inline-block; white-space: normal;}
.path-mod-choice .horizontal .choices .button {margin-top: 10px;}
.path-mod-choice ul.choices li {list-style:none;}
.path-mod-choice .results { text-align: center;}
.path-mod-choice .results.anonymous .graph.horizontal {vertical-align: middle;text-align: left;width:70%;}
.path-mod-choice .vertical {
margin-left: 10%;
margin-right: 10%;
}
.path-mod-choice .horizontal .choices .option {
padding-right: 20px;
display: inline-block;
white-space: normal;
}
.path-mod-choice .horizontal .choices .button {
margin-top: 10px;
}
.path-mod-choice ul.choices li {
list-style: none;
}
.path-mod-choice .results {
text-align: center;
}
.path-mod-choice .results.anonymous .graph.horizontal {
vertical-align: middle;
text-align: left;
width: 70%;
}
.path-mod-choice .results.anonymous .graph.vertical,
.path-mod-choice .cell {vertical-align: bottom; text-align: center; }
.path-mod-choice .results.anonymous th.header {border: 1px solid inherit;}
.path-mod-choice .cell {
vertical-align: bottom;
text-align: center;
}
.path-mod-choice .results.names .header {
width: 10%;
white-space: normal;
}
.path-mod-choice .results.names .cell {
vertical-align: top;
text-align: left;
}
.path-mod-choice .results.names .header{width:10%; white-space: normal;}
.path-mod-choice .results.names .cell{vertical-align: top; text-align: left;}
.path-mod-choice .results.names .user,
.path-mod-choice #yourselection {padding: 5px;}
.path-mod-choice #yourselection {
padding: 5px;
}
.path-mod-choice .results.names .user .attemptaction,
.path-mod-choice .results.names .user .image,
.path-mod-choice .results.names .user .fullname{float:left;}
.path-mod-choice .results.names .user .fullname{padding-left: 5px;}
.path-mod-choice .results .data.header {width: 10%;}
.path-mod-choice .responseaction {text-align: center;}
.path-mod-choice .results .option {white-space: normal;}
.path-mod-choice .response {overflow: auto;}
.path-mod-choice .results.names .user .fullname {
float: left;
}
.path-mod-choice .results.names .user .fullname {
padding-left: 5px;
}
.path-mod-choice .results .data.header {
width: 10%;
}
.path-mod-choice .responseaction {
text-align: center;
}
.path-mod-choice .results .option {
white-space: normal;
}
.path-mod-choice .response {
overflow: auto;
}
.path-mod-choice .results .option,
.path-mod-choice .results .numberofuser,
.path-mod-choice .results .percentage {font-weight: bold; font-size: 108%;}
.path-mod-choice .results .percentage {
font-weight: bold;
font-size: 108%;
}
#page-mod-choice-report .downloadreport ul li {list-style:none;padding: 0 20px; display: inline;float: left; }
.path-mod-choice .clearfloat {float:none; clear:both;}
#page-mod-choice-report .downloadreport ul li {
list-style: none;
padding: 0 20px;
float: left;
}
.path-mod-choice .clearfloat {
float: none;
clear: both;
}
/**
* Override for RTL layout
*/
.path-mod-choice.dir-rtl .horizontal .choices .option {padding-right:0px; padding-left: 20px; float:right;}
.path-mod-choice.dir-rtl .results.anonymous .graph.horizontal {text-align: right;}
.path-mod-choice.dir-rtl .results.anonymous { text-align: center; }
.path-mod-choice.dir-rtl .results.names .cell{text-align: right;}
.path-mod-choice.dir-rtl .horizontal .choices .option {
padding-right: 0px;
padding-left: 20px;
float: right;
}
.path-mod-choice.dir-rtl .results.anonymous .graph.horizontal {
text-align: right;
}
.path-mod-choice.dir-rtl .results.anonymous {
text-align: center;
}
.path-mod-choice.dir-rtl .results.names .cell {
text-align: right;
}
.path-mod-choice.dir-rtl .results.names .user .attemptaction,
.path-mod-choice.dir-rtl .results.names .user .image,
.path-mod-choice.dir-rtl .results.names .user .fullname,
.path-mod-choice.dir-rtl .results.names .user .fullname{padding-left: 0px; padding-right: 5px;}
.path-mod-choice.dir-rtl .downloadreport {margin-left:0;margin-right: 25%;}
.path-mod-choice.dir-rtl .results.names .user .fullname {
padding-left: 0px;
padding-right: 5px;
}
#page-mod-choice-report.dir-rtl .downloadreport ul li{float:right;}
#page-mod-choice-view.dir-rtl .reportlink {text-align: left;}
.path-mod-choice.dir-rtl .downloadreport {
margin-left: 0;
margin-right: 25%;
}
#page-mod-choice-report.dir-rtl .downloadreport ul li {
float: right;
}
#page-mod-choice-view.dir-rtl .reportlink {
text-align: left;
}

View File

@ -22,8 +22,8 @@
.picturediv {
display: inline;
width: 150px;
height: 200px;
max-width: 150px;
max-height: 200px;
}
.inline {
@ -39,4 +39,4 @@
#singleimage img {
width: 700px;
height: auto;
}
}

View File

@ -87,7 +87,6 @@
#page-mod-forum-discuss .discussioncontrol.exporttoportfolio {text-align:left;}
#page-mod-forum-discuss .discussioncontrol.displaymode {padding-right:10px;}
#page-mod-forum-discuss .discussioncontrol.movediscussion {padding-right:10px;}
#page-mod-forum-discuss .discussioncontrol.movediscussion .movediscussionoption {}
/** Styles for view.php **/
#page-mod-forum-view .forumaddnew {margin-bottom: 20px;}

View File

@ -85,7 +85,7 @@
}
#page-mod-scorm-player #scormpage .scoframe {
frameborder: 0;
border: 0;
}
#page-mod-scorm-player #scormpage #scorm_object {