From aea8eaecde4124958020956f38da2e553329f0a5 Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Thu, 28 Jul 2016 15:37:38 +0100 Subject: [PATCH] MDL-55168 css: use shorthand colour props when possible --- admin/tool/assignmentupgrade/styles.css | 2 +- admin/tool/capability/styles.css | 4 +-- blocks/community/styles.css | 18 +++++----- filter/mediaplugin/styles.css | 2 +- grade/grading/form/guide/styles.css | 12 +++---- grade/grading/form/rubric/styles.css | 12 +++---- lib/editor/atto/styles.css | 4 +-- .../plugins/moodlemedia/tinymce/css/media.css | 2 +- mod/assign/feedback/editpdf/styles.css | 16 ++++----- mod/assign/styles.css | 8 ++--- mod/book/tool/exportimscp/imscp.css | 4 +-- mod/chat/gui_ajax/theme/bubble/chat.css | 2 +- mod/chat/gui_ajax/theme/compact/chat.css | 2 +- mod/data/styles.css | 2 +- mod/feedback/styles.css | 10 +++--- mod/imscp/styles.css | 2 +- mod/lti/styles.css | 2 +- mod/quiz/styles.css | 36 +++++++++---------- mod/scorm/styles.css | 2 +- mod/wiki/styles.css | 4 +-- mod/workshop/styles.css | 2 +- question/type/ddimageortext/styles.css | 4 +-- question/type/ddwtos/styles.css | 6 ++-- question/type/multianswer/styles.css | 2 +- 24 files changed, 80 insertions(+), 80 deletions(-) diff --git a/admin/tool/assignmentupgrade/styles.css b/admin/tool/assignmentupgrade/styles.css index 5025b1ceefe..bdb9fa5de57 100644 --- a/admin/tool/assignmentupgrade/styles.css +++ b/admin/tool/assignmentupgrade/styles.css @@ -11,7 +11,7 @@ */ #page-admin-tool-assignmentupgrade-listnotupgraded .tool_assignmentupgrade_upgradetable tr.selectedrow td { - background-color: #ffeecc; + background-color: #fec; } #page-admin-tool-assignmentupgrade-listnotupgraded .tool_assignmentupgrade_upgradetable tr.unselectedrow td { diff --git a/admin/tool/capability/styles.css b/admin/tool/capability/styles.css index 2e742c2829d..fe2b5a7eeac 100644 --- a/admin/tool/capability/styles.css +++ b/admin/tool/capability/styles.css @@ -56,7 +56,7 @@ } .path-admin-tool-capability .comparisontable .allow { - background-color: #006600; + background-color: #060; font-weight: bold; color: white; } @@ -68,7 +68,7 @@ } .path-admin-tool-capability .comparisontable .prohibit { - background-color: #880000; + background-color: #800; font-weight: bold; color: white; } \ No newline at end of file diff --git a/blocks/community/styles.css b/blocks/community/styles.css index 9b35c55d983..5145f34ae6a 100644 --- a/blocks/community/styles.css +++ b/blocks/community/styles.css @@ -41,7 +41,7 @@ } #page-blocks-community-communitycourse .hubadditionaldesc { - color: #666666; + color: #666; font-size: 90%; display: block; } @@ -64,12 +64,12 @@ #page-blocks-community-communitycourse .blockdescription { font-size: 80%; - color: #555555; + color: #555; } #page-blocks-community-communitycourse .trusted { font-size: 90%; - color: #006633; + color: #063; font-weight: normal; font-style: italic; } @@ -82,7 +82,7 @@ #page-blocks-community-communitycourse .comment-link { font-size: 80%; - color: #555555; + color: #555; } #page-blocks-community-communitycourse .coursescreenshot { @@ -124,7 +124,7 @@ #page-blocks-community-communitycourse .hubcourserating { padding-top: 3px; font-size: 80%; - color: #555555; + color: #555; } #page-blocks-community-communitycourse .coursedescription { @@ -141,7 +141,7 @@ } #page-blocks-community-communitycourse .hubcourseresult { - background: none repeat scroll 0 0 #ffffff; + background: none repeat scroll 0 0 #fff; clear: both; margin: 30px auto 0; z-index: 90; @@ -335,15 +335,15 @@ #page-blocks-community-communitycourse .moodle-dialogue-base .moodle-dialogue-wrap { -moz-border-radius: 12px 12px 0px 0px; -webkit-border-radius: 12px 12px 0px 0px; - background-color: #ffffff; - border: 1px solid #555555; + background-color: #fff; + border: 1px solid #555; } #page-blocks-community-communitycourse .moodle-dialogue-base .moodle-dialogue-hd { -moz-border-radius: 12px 12px 0 0; -webkit-border-radius: 12px 12px 0 0; background-color: #f6f6f6; - border: 1px solid #cccccc; + border: 1px solid #ccc; overflow: auto; padding: 7px 6px; } diff --git a/filter/mediaplugin/styles.css b/filter/mediaplugin/styles.css index 84c50ccbaff..c6c41de7fd1 100644 --- a/filter/mediaplugin/styles.css +++ b/filter/mediaplugin/styles.css @@ -22,5 +22,5 @@ * any property that ends with '...Color' is supported here. */ .mp3flowplayer_backgroundColor { - color: #000000; + color: #000; } diff --git a/grade/grading/form/guide/styles.css b/grade/grading/form/guide/styles.css index 18d22507ed5..9060d817e3a 100644 --- a/grade/grading/form/guide/styles.css +++ b/grade/grading/form/guide/styles.css @@ -1,13 +1,13 @@ .gradingform_guide-regrade { padding: 10px; - background: #ffdddd; + background: #fdd; border: 1px solid #f00; margin-bottom: 10px; } .gradingform_guide-restored { padding: 10px; - background: #ffffdd; + background: #ffd; border: 1px solid #ff0; margin-bottom: 10px; } @@ -27,12 +27,12 @@ .gradingform_guide_editform .status.ready { background-color: #e7f1c3; - border-color: #aaeeaa; + border-color: #aea; } .gradingform_guide_editform .status.draft { background-color: #f3f2aa; - border-color: #eeee22; + border-color: #ee2; } .gradingform_guide.editor .criterion .controls, @@ -128,7 +128,7 @@ .gradingform_guide.editor .addcomment input { background: transparent url([[pix:t/add]]) no-repeat; display: block; - color: #555555; + color: #555; font-weight: bold; text-decoration: none; } @@ -163,7 +163,7 @@ } .gradingform_guide .criterion .description.error { - background: #ffdddd; + background: #fdd; } /* special classes for elements created by guideeditor.js */ diff --git a/grade/grading/form/rubric/styles.css b/grade/grading/form/rubric/styles.css index 6a0244d5545..1aef803b318 100644 --- a/grade/grading/form/rubric/styles.css +++ b/grade/grading/form/rubric/styles.css @@ -55,12 +55,12 @@ .gradingform_rubric_editform .status.ready { background-color: #e7f1c3; - border-color: #aaeeaa; + border-color: #aea; } .gradingform_rubric_editform .status.draft { background-color: #f3f2aa; - border-color: #eeee22; + border-color: #ee2; } .gradingform_rubric { @@ -221,7 +221,7 @@ .gradingform_rubric.editor .addlevel input { background: transparent url([[pix:t/add]]) no-repeat top left; display: block; - color: #555555; + color: #555; font-weight: bold; text-decoration: none; } @@ -270,19 +270,19 @@ .gradingform_rubric .criterion .description.error, .gradingform_rubric .criterion .levels .level .definition.error, .gradingform_rubric .criterion .levels .level .score.error { - background: #ffdddd; + background: #fdd; } .gradingform_rubric-regrade { padding: 10px; - background: #ffdddd; + background: #fdd; border: 1px solid #f00; margin-bottom: 10px; } .gradingform_rubric-restored { padding: 10px; - background: #ffffdd; + background: #ffd; border: 1px solid #ff0; margin-bottom: 10px; } diff --git a/lib/editor/atto/styles.css b/lib/editor/atto/styles.css index ece7d7c86b0..74c49f82333 100644 --- a/lib/editor/atto/styles.css +++ b/lib/editor/atto/styles.css @@ -52,13 +52,13 @@ div.editor_atto_toolbar button[disabled] { } .editor_atto_toolbar button:hover { - background-image: radial-gradient(ellipse at center, #ffffff 60%, #dfdfdf 100%); + background-image: radial-gradient(ellipse at center, #fff 60%, #dfdfdf 100%); background-color: #ebebeb; } .editor_atto_toolbar button:active, .editor_atto_toolbar button.highlight { - background-image: radial-gradient(ellipse at center, #ffffff 40%, #dfdfdf 100%); + background-image: radial-gradient(ellipse at center, #fff 40%, #dfdfdf 100%); background-color: #dfdfdf; } diff --git a/lib/editor/tinymce/plugins/moodlemedia/tinymce/css/media.css b/lib/editor/tinymce/plugins/moodlemedia/tinymce/css/media.css index 894dca96465..c9eb2f11615 100644 --- a/lib/editor/tinymce/plugins/moodlemedia/tinymce/css/media.css +++ b/lib/editor/tinymce/plugins/moodlemedia/tinymce/css/media.css @@ -85,7 +85,7 @@ } .mceAddSelectValue { - background-color: #dddddd; + background-color: #ddd; } #qt_starttime, diff --git a/mod/assign/feedback/editpdf/styles.css b/mod/assign/feedback/editpdf/styles.css index 47f858332b3..86efb49da14 100644 --- a/mod/assign/feedback/editpdf/styles.css +++ b/mod/assign/feedback/editpdf/styles.css @@ -50,7 +50,7 @@ .assignfeedback_editpdf_widget .pageheader { background-color: #ebebeb; - border-bottom: 1px solid #cccccc; + border-bottom: 1px solid #ccc; padding: 0px; padding-left: 20px; padding-right: 20px; @@ -118,18 +118,18 @@ .assignfeedback_editpdf_widget .pageheader .toolbar button + button, .assignfeedback_editpdf_widget .pageheader .navigation select + button, .assignfeedback_editpdf_widget .pageheader .toolbar select + button { - border-left: 1px solid #cccccc; + border-left: 1px solid #ccc; border-right: 0px; } .assignfeedback_editpdf_widget .pageheader .navigation button { - border-right: 1px solid #cccccc; + border-right: 1px solid #ccc; } .assignfeedback_editpdf_widget .pageheader .toolbar, .assignfeedback_editpdf_widget .pageheader .navigation-search, .assignfeedback_editpdf_widget .pageheader .navigation { - border: 1px solid #cccccc; + border: 1px solid #ccc; border-bottom-color: #b3b3b3; border-radius: 4px; margin: 10px 4px; @@ -210,7 +210,7 @@ background: none; padding: 6px 7px; border-radius: 0px; - border-top: 1px solid #cccccc; + border-top: 1px solid #ccc; } .assignfeedback_editpdf_dropdown li:first-child button { @@ -250,7 +250,7 @@ .assignfeedback_editpdf_menu li:hover a, .assignfeedback_editpdf_menu li a:hover { background-color: #ebebeb; - background-image: radial-gradient(ellipse at center, #ffffff 60%, #dfdfdf 100%); + background-image: radial-gradient(ellipse at center, #fff 60%, #dfdfdf 100%); } ul.assignfeedback_editpdf_menu { @@ -274,13 +274,13 @@ ul.assignfeedback_editpdf_menu { .assignfeedback_editpdf_widget .pageheader button:hover { background-color: #ebebeb; - background-image: radial-gradient(ellipse at center, #ffffff 60%, #dfdfdf 100%); + background-image: radial-gradient(ellipse at center, #fff 60%, #dfdfdf 100%); } .assignfeedback_editpdf_widget .pageheader button.assignfeedback_editpdf_selectedbutton:hover, .assignfeedback_editpdf_widget .pageheader button.assignfeedback_editpdf_selectedbutton { background-color: #dfdfdf; - background-image: radial-gradient(ellipse at center, #ffffff 40%, #dfdfdf 100%); + background-image: radial-gradient(ellipse at center, #fff 40%, #dfdfdf 100%); } .assignfeedback_editpdf_widget .commentdrawable img { diff --git a/mod/assign/styles.css b/mod/assign/styles.css index 9b802267c5f..2189a4090f8 100644 --- a/mod/assign/styles.css +++ b/mod/assign/styles.css @@ -136,7 +136,7 @@ } .path-mod-assign .gradingtable tr.selectedrow td { - background-color: #ffeecc; + background-color: #fec; } .path-mod-assign .gradingtable tr.unselectedrow td { @@ -174,7 +174,7 @@ } .path-mod-assign div.gradingtable tr .quickgrademodified { - background-color: #ffcc99; + background-color: #fc9; } .path-mod-assign td.submissioneditable { @@ -463,7 +463,7 @@ left: auto; box-sizing: border-box; border-radius: 0 0 0 4px; - border: 1px solid #cccccc; + border: 1px solid #ccc; border-top: none; background-color: #fff; z-index: 99999; @@ -1059,7 +1059,7 @@ left: 0; right: auto; box-sizing: border-box; - border: 1px solid #cccccc; + border: 1px solid #ccc; border-radius: 0 0 4px 0; background-color: #fff; z-index: 99999; diff --git a/mod/book/tool/exportimscp/imscp.css b/mod/book/tool/exportimscp/imscp.css index fd23398b88a..3d9d6654d6e 100644 --- a/mod/book/tool/exportimscp/imscp.css +++ b/mod/book/tool/exportimscp/imscp.css @@ -33,8 +33,8 @@ h6.main { } h1#header { - color: #666666; + color: #666; text-align: right; padding-bottom: 0.2em; - border-bottom: solid 1px #666666; + border-bottom: solid 1px #666; } diff --git a/mod/chat/gui_ajax/theme/bubble/chat.css b/mod/chat/gui_ajax/theme/bubble/chat.css index a848056a487..6d73a8cda06 100644 --- a/mod/chat/gui_ajax/theme/bubble/chat.css +++ b/mod/chat/gui_ajax/theme/bubble/chat.css @@ -39,7 +39,7 @@ } #input-message { - background: #ffffff url(input.png) repeat-x scroll 0 0; + background: #fff url(input.png) repeat-x scroll 0 0; padding: 0 9px; border: 1px solid #999; border-radius: 9px; diff --git a/mod/chat/gui_ajax/theme/compact/chat.css b/mod/chat/gui_ajax/theme/compact/chat.css index adf458f9f32..e2b463cc7e9 100644 --- a/mod/chat/gui_ajax/theme/compact/chat.css +++ b/mod/chat/gui_ajax/theme/compact/chat.css @@ -35,7 +35,7 @@ } #input-message { - background: #ffffff url(input.png) repeat-x scroll 0 0; + background: #fff url(input.png) repeat-x scroll 0 0; border: 1px solid #999; } diff --git a/mod/data/styles.css b/mod/data/styles.css index 8916bbfd081..b65d459a913 100644 --- a/mod/data/styles.css +++ b/mod/data/styles.css @@ -123,7 +123,7 @@ } .mod-data-default-template.notapproved { - background-color: #ffcccc; + background-color: #fcc; } #page-mod-data-templates td.save_template, diff --git a/mod/feedback/styles.css b/mod/feedback/styles.css index 245365e68b2..821fc75f4ef 100644 --- a/mod/feedback/styles.css +++ b/mod/feedback/styles.css @@ -4,17 +4,17 @@ } .path-mod-feedback div.feedback_is_dependent { - background: #dddddd; + background: #ddd; } .path-mod-feedback span.feedback_depend { - color: #ff0000; + color: #f00; } .path-mod-feedback hr.feedback_pagebreak { height: 4px; - color: #aaaaaa; - background-color: #aaaaaa; + color: #aaa; + background-color: #aaa; border: 0; margin: 0; } @@ -43,7 +43,7 @@ /* Analysis page */ .path-mod-feedback table.analysis { width: 100%; - border-top: 1px solid #aaaaaa; + border-top: 1px solid #aaa; margin-top: 10px; } diff --git a/mod/imscp/styles.css b/mod/imscp/styles.css index 6ca5cee967d..deb72d0e571 100644 --- a/mod/imscp/styles.css +++ b/mod/imscp/styles.css @@ -12,7 +12,7 @@ #page-mod-imscp-view .yui-layout-hd { background-image: none; - background-color: #dddddd; + background-color: #ddd; } #page-mod-imscp-view .yui-layout-hd h2 { diff --git a/mod/lti/styles.css b/mod/lti/styles.css index 5e59c3b1cca..199bcf6a5f0 100644 --- a/mod/lti/styles.css +++ b/mod/lti/styles.css @@ -214,7 +214,7 @@ .tool-card:hover, .tool-card:focus { - border-color: #0088cc; + border-color: #08c; box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; -moz-transition: border linear 0.2s, box-shadow linear 0.2s; diff --git a/mod/quiz/styles.css b/mod/quiz/styles.css index bc8960bebea..91f8210821a 100644 --- a/mod/quiz/styles.css +++ b/mod/quiz/styles.css @@ -51,7 +51,7 @@ body.jsenabled .questionflagcheckbox { left: 10%; color: #555; border-radius: 0 0 10px 10px; - box-shadow: 5px 5px 20px 0 #666666; + box-shadow: 5px 5px 20px 0 #666; padding: 1em 1em 0; z-index: 10000; } @@ -211,67 +211,67 @@ body.jsenabled .questionflagcheckbox { } #quiz-timer.timeleft15 { - background: #ffffff; + background: #fff; } #quiz-timer.timeleft14 { - background: #ffeeee; + background: #fee; } #quiz-timer.timeleft13 { - background: #ffdddd; + background: #fdd; } #quiz-timer.timeleft12 { - background: #ffcccc; + background: #fcc; } #quiz-timer.timeleft11 { - background: #ffbbbb; + background: #fbb; } #quiz-timer.timeleft10 { - background: #ffaaaa; + background: #faa; } #quiz-timer.timeleft9 { - background: #ff9999; + background: #f99; } #quiz-timer.timeleft8 { - background: #ff8888; + background: #f88; } #quiz-timer.timeleft7 { - background: #ff7777; + background: #f77; } #quiz-timer.timeleft6 { - background: #ff6666; + background: #f66; } #quiz-timer.timeleft5 { - background: #ff5555; + background: #f55; } #quiz-timer.timeleft4 { - background: #ff4444; + background: #f44; } #quiz-timer.timeleft3 { - background: #ff3333; + background: #f33; } #quiz-timer.timeleft2 { - background: #ff2222; + background: #f22; } #quiz-timer.timeleft1 { - background: #ff1111; + background: #f11; } #quiz-timer.timeleft0 { - background: #ff0000; + background: #f00; } /** mod quiz mod **/ @@ -940,7 +940,7 @@ table.quizreviewsummary td.cell { } #categoryquestions > tbody > tr:nth-of-type(even).highlight { - background-color: #aaffaa; + background-color: #afa; } #categoryquestions .header { diff --git a/mod/scorm/styles.css b/mod/scorm/styles.css index 1b62c85e96a..e93864023d0 100644 --- a/mod/scorm/styles.css +++ b/mod/scorm/styles.css @@ -157,7 +157,7 @@ } #page-mod-scorm-view .exceededmaxattempts { - color: #cc0000; + color: #c00; } #page-mod-scorm-player #altfinishlink { diff --git a/mod/wiki/styles.css b/mod/wiki/styles.css index e951eac50e5..a3ad5562142 100644 --- a/mod/wiki/styles.css +++ b/mod/wiki/styles.css @@ -223,13 +223,13 @@ } .ouw_deleted { - background: #ffffaa; + background: #ffa; color: red; text-decoration: line-through; } .ouw_added { - background: #ccffcc; + background: #cfc; color: red; } diff --git a/mod/workshop/styles.css b/mod/workshop/styles.css index 7b56f15425d..713684b4b98 100644 --- a/mod/workshop/styles.css +++ b/mod/workshop/styles.css @@ -487,7 +487,7 @@ .path-mod-workshop .grading-report .givengrade.null .user, .path-mod-workshop .grading-report .receivedgrade.null .user { - color: #ee0000; + color: #e00; } /** diff --git a/question/type/ddimageortext/styles.css b/question/type/ddimageortext/styles.css index 89adaa2215f..bce4d90e1cc 100644 --- a/question/type/ddimageortext/styles.css +++ b/question/type/ddimageortext/styles.css @@ -5,7 +5,7 @@ .que.ddimageortext div.droparea img, form.mform fieldset#id_previewareaheader div.droparea img { - border: 1px solid #000000; + border: 1px solid #000; max-width: none; } @@ -29,7 +29,7 @@ form.mform fieldset#id_previewareaheader div.draghome { .que.ddimageortext .group1, form.mform fieldset#id_previewareaheader .group1 { - background-color: #ffffff; + background-color: #fff; } .que.ddimageortext .group2, diff --git a/question/type/ddwtos/styles.css b/question/type/ddwtos/styles.css index a58f901a2ef..aa7b8ab3732 100644 --- a/question/type/ddwtos/styles.css +++ b/question/type/ddwtos/styles.css @@ -14,7 +14,7 @@ .que.ddwtos .drop { display: inline-block; text-align: center; - border: 1px solid #000000; + border: 1px solid #000; margin-bottom: 2px; } @@ -28,7 +28,7 @@ .que.ddwtos .draghome, .que.ddwtos .drag.unplaced { - border: 1px solid #000000; + border: 1px solid #000; } .que.ddwtos .draghome { @@ -67,7 +67,7 @@ } .que.ddwtos .group1 { - background-color: #ffffff; + background-color: #fff; } .que.ddwtos .group2 { diff --git a/question/type/multianswer/styles.css b/question/type/multianswer/styles.css index 54a7fb9ede8..abd6a1333e9 100644 --- a/question/type/multianswer/styles.css +++ b/question/type/multianswer/styles.css @@ -4,7 +4,7 @@ background: #fff3bf; padding: 0.5em; margin-top: 1em; - box-shadow: 0.5em 0.5em 1em #000000; + box-shadow: 0.5em 0.5em 1em #000; } body.ie6 .que.multianswer .feedbackspan,