From 03e93abad8dad55818731a16538c72233a2d5218 Mon Sep 17 00:00:00 2001 From: Dan Poltawski Date: Tue, 18 Nov 2014 20:42:20 +0000 Subject: [PATCH] MDL-48277 css: enable duplicate definitions lint rule And remove duplicates found in code which were detected by this rule (leaving the last rule defined as this would take precidence). https://github.com/CSSLint/csslint/wiki/Disallow-duplicate-properties --- .csslintrc | 2 +- blocks/community/styles.css | 1 - blocks/navigation/styles.css | 2 +- mod/scorm/styles.css | 1 - theme/base/style/core.css | 4 ++-- theme/base/style/course.css | 2 +- theme/base/style/grade.css | 2 +- 7 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.csslintrc b/.csslintrc index c4cf52dcf55..69c4ebfe3b5 100644 --- a/.csslintrc +++ b/.csslintrc @@ -1,2 +1,2 @@ ---errors=errors +--errors=errors,duplicate-properties --exclude-list=vendor/,lib/editor/tinymce/,lib/yuilib/,theme/bootstrapbase/style/ diff --git a/blocks/community/styles.css b/blocks/community/styles.css index 96598cf2aa5..0211abd85d5 100644 --- a/blocks/community/styles.css +++ b/blocks/community/styles.css @@ -67,7 +67,6 @@ font-weight:normal; line-height:1.2em; font-size: 140%; - color: #fff; width: 102%; text-indent: 15px; } diff --git a/blocks/navigation/styles.css b/blocks/navigation/styles.css index 9126897315d..c25945c08c5 100644 --- a/blocks/navigation/styles.css +++ b/blocks/navigation/styles.css @@ -43,7 +43,7 @@ .ie6 .block_navigation .block_tree .tree_item {width:100%;} /** Overide for RTL layout **/ -.dir-rtl .block_navigation .block_tree li.depth_2 ul {padding-left:0;padding-right: 16px; padding-left: 0;} +.dir-rtl .block_navigation .block_tree li.depth_2 ul {padding-left: 0; padding-right: 16px;} .dir-rtl .block_navigation .block_tree .type_activity > p.tree_item.branch.hasicon.active_tree_node, .dir-rtl .block_navigation .block_tree .tree_item {padding-right: 21px;text-align:right;} diff --git a/mod/scorm/styles.css b/mod/scorm/styles.css index 8f82d9f8f52..a7597023bfd 100644 --- a/mod/scorm/styles.css +++ b/mod/scorm/styles.css @@ -41,7 +41,6 @@ #page-mod-scorm-player #scormnav { position: absolute; right: 5px; - top: 0px; text-align: center; top: 3px; width: 100%; diff --git a/theme/base/style/core.css b/theme/base/style/core.css index b2c5e5c6097..dad077d31b3 100644 --- a/theme/base/style/core.css +++ b/theme/base/style/core.css @@ -1867,8 +1867,8 @@ body.jsenabled .formlisting { #page-badges-view .collection { width: 90%; margin: 1em auto; } #page-badges-index .collection { width: 85%; margin: 1em auto; } -table.collection th { font-size: inherit !important; border-width: 1px; border-style: solid; border-color: #CCCCCC; vertical-align: middle; padding-left: 5px; padding-right: 5px; vertical-align: top; text-align: center !important; } -table.collection td { border-width: 1px; border-style: solid; border-color: #CCCCCC; vertical-align: middle; padding-left: 5px; padding-right: 5px; vertical-align: top; } +table.collection th { font-size: inherit !important; border-width: 1px; border-style: solid; border-color: #CCCCCC; padding-left: 5px; padding-right: 5px; vertical-align: top; text-align: center !important; } +table.collection td { border-width: 1px; border-style: solid; border-color: #CCCCCC; padding-left: 5px; padding-right: 5px; vertical-align: top; } table.collection > tbody > tr:nth-of-type(even) { background-color: #FFFFFF; } table.collection > tbody > tr:nth-of-type(odd) { background-color: #F6F6F6; } table.collection ul { margin: 0.5em 0.5em 0.5em 2em; } diff --git a/theme/base/style/course.css b/theme/base/style/course.css index d3c8aa48526..ef7d5d761df 100644 --- a/theme/base/style/course.css +++ b/theme/base/style/course.css @@ -180,7 +180,7 @@ .course-content .section-summary { border: 1px solid #DDD; margin-top: 5px; list-style: none; } .course-content .section-summary .section-title { margin: 2px 5px 10px 5px; } .course-content .section-summary .summarytext { margin: 2px 5px 2px 5px; } -.course-content .section-summary .section-summary-activities .activity-count {margin-right: 10px;color: #AAA; font-size: 12px; margin-right: 15px;} +.course-content .section-summary .section-summary-activities .activity-count {color: #AAA; font-size: 12px; margin-right: 15px;} .course-content .section-summary .summary { margin-top: 5px; } .course-content .single-section { margin-top: 1em; } .course-content .single-section .section-navigation { display: block; padding: 0.5em; margin-bottom: -0.5em; } diff --git a/theme/base/style/grade.css b/theme/base/style/grade.css index c8ef0c12c8b..6fcba3246cb 100644 --- a/theme/base/style/grade.css +++ b/theme/base/style/grade.css @@ -201,7 +201,7 @@ margin:0.5em;padding:0.5em;text-align:center;-moz-border-radius:5px} #page-grade-grading-manage .action:hover {text-decoration:none;background-color:#F6F6F6;} #page-grade-grading-manage #actionresultmessagebox {background-color:#D2EBFF;width:60%;margin:1em auto 1em auto;text-align:center; - padding:0.5em;border:2px solid #CCC;text-align:center;-moz-border-radius:5px;position:relative} + padding:0.5em;border:2px solid #CCC;-moz-border-radius:5px;position:relative} #page-grade-grading-manage #actionresultmessagebox span {position:absolute;right:0px;top:-1.2em;color:#666;font-size:80%} #page-grade-grading-manage .definition-name .status {font-weight:normal;text-transform:uppercase;font-size:60%;padding:0.25em;border:1px solid #EEE;-moz-border-radius:5px;} #page-grade-grading-manage .definition-name .status.ready {background-color:#e7f1c3;border-color:#AAEEAA;}