Skip to content

Commit

Permalink
MDL-45290 rubric: visual fixups
Browse files Browse the repository at this point in the history
Fixed up visual issues with rubric editor on Clean.
  • Loading branch information
Jetha Chan committed May 2, 2014
1 parent 030b907 commit b9323d7
Show file tree
Hide file tree
Showing 3 changed files with 151 additions and 2 deletions.
2 changes: 1 addition & 1 deletion grade/grading/form/rubric/js/rubriceditor.js
Expand Up @@ -109,7 +109,7 @@ M.gradingform_rubriceditor.editmode = function(el, editmode, focustb) {
height
if (el.hasClass('level')) height = parseFloat(el.getComputedStyle('height')) - parseFloat(el.one('.score').getComputedStyle('height'))
else height = parseFloat(ta.get('parentNode').getComputedStyle('height'))
ta.setStyle('width', Math.max(width,50)+'px')
ta.setStyle('width', Math.max(width-16,50)+'px')
ta.setStyle('height', Math.max(height,20)+'px')
}
catch (err) {
Expand Down
149 changes: 149 additions & 0 deletions theme/bootstrapbase/less/moodle/grade.less
Expand Up @@ -564,6 +564,7 @@ table#user-grades tr.controls td,
text-align:right;
}
}

.path-grade-report-grader .usersuspended a:link,
.path-grade-report-grader .usersuspended a:visited {
.muted
Expand Down Expand Up @@ -616,3 +617,151 @@ table#user-grades tr.controls td,
.gradingform_rubric.editor .criteria .scorevalue input {
float: left;
}

// Rubrics
#page-grade-grading-manage {
#activemethodselector {
label {
display: inline-block;
}
.helptooltip {
margin-right: 0.5em;
}
}
.actions {
display: block;
text-align: center;
margin-bottom: 1em;
.action {
.btn();
.btn-large();
display: inline-block;
position: relative;
width: 150px;
text-align: center;
overflow: hidden;
margin: 0.5em;
padding: 1em;
border: 1px solid #aaa;
.action-icon {
display: inline-block;
position: relative;
height: 64px;
width: 64px;
}
.action-text {
position: relative;
top: 0.4em;
font-size:16px;
}
}
}
}

#page-grade-grading-form-rubric-edit {
.gradingform_rubric_editform .status {
font-size: 70%;
}
}

#rubric-rubric {
&.gradingform_rubric {
#rubric-criteria {
margin-bottom: 1em;
@rubricPadding: 6px;
.criterion {
.description {
vertical-align: top;
padding: @rubricPadding;
textarea {
margin-bottom: 0px;
height: 115px;
}
}
.definition {
textarea {
width: 80%;
margin-bottom: 0px;
}
}
.score {
position: relative;
float: left;
margin-right: 28px;
input {
margin-bottom: 0px;
}
}
.level {
vertical-align: top;
padding: @rubricPadding;
.delete {
position:relative;
width: 32px;
float:right;
input {
display: block;
position: absolute;
right: 0;
bottom: 0;
height: 24px;
width: 24px;
margin: 0;
&:hover {
background-color: #ddd;
}
}
}
}
.scorevalue {
input {
width: 20%;
}
}
.addlevel {
vertical-align: middle;
input {
.btn();
background-position: 0px 0px;
height: 30px;
margin-right: 5px;
}
}
}
}
.addcriterion {
margin-left: 5px;
.btn();
padding: 0;
input {
margin: 0;
color: inherit;
text-shadow: inherit;
border: 0px none;
line-height: inherit;
background: transparent url([[pix:t/add]]) no-repeat 7px 8px;
padding-left: 26px;
}
margin-bottom: 1em;
}
.options {
clear: both;
.option {
label {
margin: 0;
padding: 0;
font-size: inherit;
font-weight: normal;
line-height: 2em;
color: inherit;
text-shadow: none;
background-color: transparent;
}
input {
margin-left: 5px;
margin-right: 12px;
}
}
}
}
}
2 changes: 1 addition & 1 deletion theme/bootstrapbase/style/moodle.css

Large diffs are not rendered by default.

0 comments on commit b9323d7

Please sign in to comment.