mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-16 14:02:32 +02:00
Code Issues Projects Releases Wiki Activity

MDL-33825 css_optimiser: Fixed bug where !important was being lost for advanced background styles

Browse Source
This commit is contained in:
Sam Hemelryk 2012-06-19 12:32:56 +12:00
parent f4a9bf65da
commit 2395a7510f
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/csslib.php
View File

@ -3845,7 +3845,11 @@ class css_style_background extends css_style {
} else if ($attachment === self::NULL_VALUE && in_array($bit, $attachments)) {
$attachment = $bit;
} else if ($bit !== '') {
$return[] = css_style_background_advanced::init($bit);
$advanced = css_style_background_advanced::init($bit);
if ($important) {
$advanced->set_important();
}
$return[] = $advanced;
}
}
}

10
lib/tests/csslib_test.php
View File

@ -213,6 +213,16 @@ class css_optimiser_testcase extends advanced_testcase {
$css = '#filesskin .yui3-widget-hd{background:#CCC;background:-webkit-gradient(linear, left top, left bottom, from(#FFFFFF), to(#CCCCCC));background:-moz-linear-gradient(top, #FFFFFF, #CCCCCC);}';
$this->assertEquals($css, $optimiser->process($css));
$css = '.userenrolment{background:-moz-linear-gradient(top, #FFFFFF, #CCCCCC) !important;}';
$this->assertEquals($css, $optimiser->process($css));
$css = '.userenrolment{background:#CCC !important;background:-webkit-gradient(linear, left top, left bottom, from(#FFFFFF), to(#CCCCCC)) !important;background:-moz-linear-gradient(top, #FFFFFF, #CCCCCC) !important;}';
$this->assertEquals($css, $optimiser->process($css));
$cssin = '.userenrolment{background:-moz-linear-gradient(top, #FFFFFF, #CCCCCC) !important;}.userenrolment {background: #CCCCCC!important;background: -webkit-gradient(linear, left top, left bottom, from(#FFFFFF), to(#CCCCCC))!important;}';
$cssout = '.userenrolment{background:#CCC !important;background:-moz-linear-gradient(top, #FFFFFF, #CCCCCC) !important;background:-webkit-gradient(linear, left top, left bottom, from(#FFFFFF), to(#CCCCCC)) !important;}';
$this->assertEquals($cssout, $optimiser->process($cssin));
}
/**