From 1e23b91bc886b30e7a64c7c118a79071c706e39c Mon Sep 17 00:00:00 2001 From: Angie Byron Date: Mon, 5 Oct 2009 02:48:39 +0000 Subject: #472820 by rfay, Rob Loach, and catch: Fixed improper whitespace removal/invalid CSS from drupal_load_stylesheet_content() (with tests). --- .../css_test_files/css_input_without_import.css | 38 ++++++++++++++++++++++ .../css_input_without_import.css.optimized.css | 11 +++++++ .../css_input_without_import.css.unoptimized.css | 38 ++++++++++++++++++++++ 3 files changed, 87 insertions(+) create mode 100644 modules/simpletest/files/css_test_files/css_input_without_import.css create mode 100644 modules/simpletest/files/css_test_files/css_input_without_import.css.optimized.css create mode 100644 modules/simpletest/files/css_test_files/css_input_without_import.css.unoptimized.css (limited to 'modules/simpletest/files') diff --git a/modules/simpletest/files/css_test_files/css_input_without_import.css b/modules/simpletest/files/css_test_files/css_input_without_import.css new file mode 100644 index 000000000..70ad5a66e --- /dev/null +++ b/modules/simpletest/files/css_test_files/css_input_without_import.css @@ -0,0 +1,38 @@ +/* $Id$ */ + +/** + * @file Basic css that does not use import + */ + + +body { + margin: 0; + padding: 0; + background: #edf5fa; + font: 76%/170% Verdana, sans-serif; + color: #494949; +} + +.this .is .a .test { + font: 1em/100% Verdana, sans-serif; + color: #494949; +} + +/** + * CSS spec says that all whitespace is valid whitespace, so this selector should be just as + * good as the one above. + */ + +.this +.is +.a +.test { +font: 1em/100% Verdana, sans-serif; +color: #494949; +} + +textarea, select { + font: 1em/160% Verdana, sans-serif; + color: #494949; +} + diff --git a/modules/simpletest/files/css_test_files/css_input_without_import.css.optimized.css b/modules/simpletest/files/css_test_files/css_input_without_import.css.optimized.css new file mode 100644 index 000000000..bf139f490 --- /dev/null +++ b/modules/simpletest/files/css_test_files/css_input_without_import.css.optimized.css @@ -0,0 +1,11 @@ + + + + + +body{margin:0;padding:0;background:#edf5fa;font:76%/170% Verdana,sans-serif;color:#494949;}.this .is .a .test{font:1em/100% Verdana,sans-serif;color:#494949;} + +.this +.is +.a +.test{font:1em/100% Verdana,sans-serif;color:#494949;}textarea,select{font:1em/160% Verdana,sans-serif;color:#494949;} \ No newline at end of file diff --git a/modules/simpletest/files/css_test_files/css_input_without_import.css.unoptimized.css b/modules/simpletest/files/css_test_files/css_input_without_import.css.unoptimized.css new file mode 100644 index 000000000..70ad5a66e --- /dev/null +++ b/modules/simpletest/files/css_test_files/css_input_without_import.css.unoptimized.css @@ -0,0 +1,38 @@ +/* $Id$ */ + +/** + * @file Basic css that does not use import + */ + + +body { + margin: 0; + padding: 0; + background: #edf5fa; + font: 76%/170% Verdana, sans-serif; + color: #494949; +} + +.this .is .a .test { + font: 1em/100% Verdana, sans-serif; + color: #494949; +} + +/** + * CSS spec says that all whitespace is valid whitespace, so this selector should be just as + * good as the one above. + */ + +.this +.is +.a +.test { +font: 1em/100% Verdana, sans-serif; +color: #494949; +} + +textarea, select { + font: 1em/160% Verdana, sans-serif; + color: #494949; +} + -- cgit v1.2.3