From 501380a96dbad0a4ff993fd37482e67ab5f3f04e Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Wed, 28 Nov 2012 16:57:16 +0800 Subject: [PATCH] MDL-36632 usability: Grading methods icons and CSS --- grade/grading/form/guide/pix/icon.png | Bin 205 -> 160 bytes grade/grading/form/guide/pix/icon.svg | 15 +++++++++++++++ grade/grading/form/guide/styles.css | 4 ++-- grade/grading/form/rubric/pix/icon.png | Bin 205 -> 160 bytes grade/grading/form/rubric/pix/icon.svg | 15 +++++++++++++++ grade/grading/form/rubric/styles.css | 13 +++++++------ theme/upgrade.txt | 1 + 7 files changed, 40 insertions(+), 8 deletions(-) create mode 100644 grade/grading/form/guide/pix/icon.svg create mode 100644 grade/grading/form/rubric/pix/icon.svg diff --git a/grade/grading/form/guide/pix/icon.png b/grade/grading/form/guide/pix/icon.png index f1af82f25125c3d1082c6cc1e65cde81b46d2857..df0483db96b1fa0ddf666bb806e40057899393df 100644 GIT binary patch delta 131 zcmX@hxPWnjN{wWRYeY$Kep*R+Vo@rCV@iHfs)A>3VtQ&&YGO)d;mK4R1_lNvPZ!6K zid#u@EQ_C2v$3%;vVA(huEu53+`u5r+?pUEae$$x^}j-oznr*qi)I<4vfXX>y#^tB j7>W+EbA732;4omA@9B`dsxR$1&@={5S3j3^P6GZx^prw85kJYlDyqr7>XF~Fxc5IzNrrs;VkfoEM{Qf76xHP zhFNnYfP(BLp1!W^w>f3`rFk|?%Ki)#^7V9a46!(!oRX06zopr0HG^6M*si- diff --git a/grade/grading/form/guide/pix/icon.svg b/grade/grading/form/guide/pix/icon.svg new file mode 100644 index 00000000000..9e367fa5e68 --- /dev/null +++ b/grade/grading/form/guide/pix/icon.svg @@ -0,0 +1,15 @@ + + + +]> + + + + + diff --git a/grade/grading/form/guide/styles.css b/grade/grading/form/guide/styles.css index 9a18aea84a7..8ea947c67ff 100644 --- a/grade/grading/form/guide/styles.css +++ b/grade/grading/form/guide/styles.css @@ -35,12 +35,12 @@ .gradingform_guide.editor .delete input, .gradingform_guide.editor .moveup input, .gradingform_guide.editor .movedown input{text-indent: -1000em;cursor:pointer;border:none;} -.gradingform_guide.editor .criterion .controls .delete input {width:20px;height:16px;background: transparent url([[pix:i/cross_red_big]]) no-repeat center top;} +.gradingform_guide.editor .criterion .controls .delete input {width:20px;height:16px;background: transparent url([[pix:t/delete]]) no-repeat center top;margin-top:4px;} .gradingform_guide.editor .moveup input {width:20px;height:15px;background: transparent url([[pix:t/up]]) no-repeat center top;margin-top:4px;} .gradingform_guide.editor .movedown input {width:20px;height:15px;background: transparent url([[pix:t/down]]) no-repeat center top;margin-top:4px;} .gradingform_guide.editor .addcriterion input, -.gradingform_guide.editor .addcomment input {background: transparent url([[pix:t/addgreen]]) no-repeat;display:block;color:#555555;font-weight:bold;text-decoration:none;} +.gradingform_guide.editor .addcomment input {background: transparent url([[pix:t/add]]) no-repeat;display:block;color:#555555;font-weight:bold;text-decoration:none;} .gradingform_guide.editor .addcriterion input, .gradingform_guide.editor .addcomment input {background-position: 5px 8px;height:30px;line-height:29px;margin-bottom:14px;padding-left:20px;padding-right:10px;} diff --git a/grade/grading/form/rubric/pix/icon.png b/grade/grading/form/rubric/pix/icon.png index f1af82f25125c3d1082c6cc1e65cde81b46d2857..df0483db96b1fa0ddf666bb806e40057899393df 100644 GIT binary patch delta 131 zcmX@hxPWnjN{wWRYeY$Kep*R+Vo@rCV@iHfs)A>3VtQ&&YGO)d;mK4R1_lNvPZ!6K zid#u@EQ_C2v$3%;vVA(huEu53+`u5r+?pUEae$$x^}j-oznr*qi)I<4vfXX>y#^tB j7>W+EbA732;4omA@9B`dsxR$1&@={5S3j3^P6GZx^prw85kJYlDyqr7>XF~Fxc5IzNrrs;VkfoEM{Qf76xHP zhFNnYfP(BLp1!W^w>f3`rFk|?%Ki)#^7V9a46!(!oRX06zopr0HG^6M*si- diff --git a/grade/grading/form/rubric/pix/icon.svg b/grade/grading/form/rubric/pix/icon.svg new file mode 100644 index 00000000000..9e367fa5e68 --- /dev/null +++ b/grade/grading/form/rubric/pix/icon.svg @@ -0,0 +1,15 @@ + + + +]> + + + + + diff --git a/grade/grading/form/rubric/styles.css b/grade/grading/form/rubric/styles.css index 4d8e705424c..50a6b37df51 100644 --- a/grade/grading/form/rubric/styles.css +++ b/grade/grading/form/rubric/styles.css @@ -97,15 +97,16 @@ .gradingform_rubric.editor .delete input, .gradingform_rubric.editor .moveup input, .gradingform_rubric.editor .movedown input{text-indent: -1000em;cursor:pointer;border:none;} -.gradingform_rubric.editor .criterion .controls .delete input {width:20px;height:16px;background: transparent url([[pix:i/cross_red_big]]) no-repeat center top;} -.gradingform_rubric.editor .levels .level .delete input {width:20px;height:16px;background: transparent url([[pix:i/cross_red_small]]) no-repeat center top;} -.gradingform_rubric.editor .moveup input {width:20px;height:15px;background: transparent url([[pix:t/up]]) no-repeat center top;margin-top:4px;} -.gradingform_rubric.editor .movedown input {width:20px;height:15px;background: transparent url([[pix:t/down]]) no-repeat center top;margin-top:4px;} +.gradingform_rubric.editor .criterion .controls .delete input {width:12px;height:12px;background: transparent url([[pix:t/delete]]) no-repeat center top; margin: .3em .3em 0 .3em;} +.gradingform_rubric.editor .levels .level .delete input {width:12px;height:16px;background: transparent url([[pix:t/delete]]) no-repeat center center; } +.dir-rtl .gradingform_rubric.editor .levels .level .delete input { margin-right: .45em; margin-left: 0; } +.gradingform_rubric.editor .moveup input {width:12px;height:12px;background: transparent url([[pix:t/up]]) no-repeat center top; margin: .3em .3em 0 .3em; } +.gradingform_rubric.editor .movedown input {width:12px;height:12px;background: transparent url([[pix:t/down]]) no-repeat center top; margin: .3em .3em 0 .3em; } .gradingform_rubric.editor .addcriterion input, -.gradingform_rubric.editor .addlevel input {background: transparent url([[pix:t/addgreen]]) no-repeat;display:block;color:#555555;font-weight:bold;text-decoration:none;} +.gradingform_rubric.editor .addlevel input {background: transparent url([[pix:t/add]]) no-repeat top left ;display:block;color:#555555;font-weight:bold;text-decoration:none;} .gradingform_rubric.editor .addcriterion input {background-position: 5px 8px;height:30px;line-height:29px;margin-bottom:14px;padding-left:20px;padding-right:10px;} -.gradingform_rubric.editor .addlevel input {background-position: 5px 6px;height:25px;line-height:24px;margin-bottom:10px;padding-left:18px;padding-right:8px;} +.gradingform_rubric.editor .addlevel input {background-position: 5px 5px;height:25px;line-height:24px;margin-bottom:10px;padding-left:18px;padding-right:8px;} .gradingform_rubric .options .optionsheading {font-weight:bold;font-size:1.1em;padding-bottom:5px;} .gradingform_rubric .options .option {padding-bottom:2px;} diff --git a/theme/upgrade.txt b/theme/upgrade.txt index 0c3cc5fbb2e..0c57b65f2ec 100644 --- a/theme/upgrade.txt +++ b/theme/upgrade.txt @@ -21,6 +21,7 @@ deprecation: * i/tick_green_big: Use i/valid or i/grade_correct * i/tick_amber_big: Use i/caution or i/grade_partiallycorrect * No more small versions of i/cross_red_small, i/tick_green_small and i/tick_amber_small, use their big equivalent. +* t/addgreen: Use t/add instead. optional changes: * new optional boolean parameter $withlinks for public function login_info() in lib/outputrenderers.php (MDL-31365)