From 8043aff6d0215044a5b0e3524f3028ef2d0ff160 Mon Sep 17 00:00:00 2001 From: Dan Mouyard Date: Tue, 27 Mar 2012 02:15:54 -0400 Subject: [PATCH] Issue #1217040: Clean up the CSS for Simpletest module. --- core/modules/simpletest/simpletest.admin-rtl.css | 5 + core/modules/simpletest/simpletest.admin.css | 84 ++++++++++++++++++++ core/modules/simpletest/simpletest.css | 89 ---------------------- core/modules/simpletest/simpletest.module | 2 +- core/modules/simpletest/simpletest.pages.inc | 4 +- core/modules/simpletest/tests/common.test | 6 +- 6 files changed, 95 insertions(+), 95 deletions(-) create mode 100644 core/modules/simpletest/simpletest.admin-rtl.css create mode 100644 core/modules/simpletest/simpletest.admin.css delete mode 100644 core/modules/simpletest/simpletest.css diff --git a/core/modules/simpletest/simpletest.admin-rtl.css b/core/modules/simpletest/simpletest.admin-rtl.css new file mode 100644 index 0000000..503daeb --- /dev/null +++ b/core/modules/simpletest/simpletest.admin-rtl.css @@ -0,0 +1,5 @@ + +.simpletest-test-label label { + margin-left: 0; + margin-right: 1em; +} diff --git a/core/modules/simpletest/simpletest.admin.css b/core/modules/simpletest/simpletest.admin.css new file mode 100644 index 0000000..626ff59 --- /dev/null +++ b/core/modules/simpletest/simpletest.admin.css @@ -0,0 +1,84 @@ + +.simpletest-test-form th.select-all { + width: 1em; +} +th.simpletest_test { + width: 16em; +} + +.simpletest-image { + cursor: pointer; + display: inline-block; + width: 1em; +} +label.simpletest-group-label { + display: inline; + font-weight: bold; +} +.simpletest-test-label label { + margin-left: 1em; /* LTR */ +} +.simpletest-test-description .description { + margin: 0; +} +.simpletest-test-form td { + background: #fff; + color: #494949; +} +tr.simpletest-group td { + background-color: #edf5fa; + color: #494949; +} + +.message > .item-list { + font-weight: normal; +} + +div.simpletest-pass { + color: #33a333; +} +.simpletest-fail { + color: #981010; +} + +tr.simpletest-pass.odd { + background-color: #b6ffb6; +} +tr.simpletest-pass.even { + background-color: #9bff9b; +} +tr.simpletest-fail.odd { + background-color: #ffc9c9; +} +tr.simpletest-fail.even { + background-color: #ffacac; +} +tr.simpletest-exception.odd { + background-color: #f4ea71; +} +tr.simpletest-exception.even { + background-color: #f5e742; +} +tr.simpletest-debug.odd { + background-color: #eee; +} +tr.simpletest-debug.even { + background-color: #fff; +} + +a.simpletest-collapse { + height: 0; + position: absolute; + top: -99em; + width: 0; +} +a.simpletest-collapse:focus, +a.simpletest-collapse:hover { + font-size: 80%; + height: auto; + overflow: visible; + position: relative; + top: 0px; + width: auto; + z-index: 1000; +} diff --git a/core/modules/simpletest/simpletest.css b/core/modules/simpletest/simpletest.css deleted file mode 100644 index 86bd04b..0000000 --- a/core/modules/simpletest/simpletest.css +++ /dev/null @@ -1,89 +0,0 @@ - -/* Test Table */ -#simpletest-form-table th.select-all { - width: 1em; -} -th.simpletest_test { - width: 16em; -} - -.simpletest-image { - display: inline-block; - cursor: pointer; - width: 1em; -} -.simpletest-group-label label { - display: inline; - font-weight: bold; -} -.simpletest-test-label label { - margin-left: 1em; /* LTR */ -} -.simpletest-test-description .description { - margin: 0; -} -#simpletest-form-table tr td { - background-color: white; - color: #494949; -} -#simpletest-form-table tr.simpletest-group td { - background-color: #edf5fa; - color: #494949; -} - -table#simpletest-form-table tr.simpletest-group label { - display: inline; -} - -div.message > div.item-list { - font-weight: normal; -} - -div.simpletest-pass { - color: #33a333; -} -.simpletest-fail { - color: #981010; -} - -tr.simpletest-pass.odd { - background-color: #b6ffb6; -} -tr.simpletest-pass.even { - background-color: #9bff9b; -} -tr.simpletest-fail.odd { - background-color: #ffc9c9; -} -tr.simpletest-fail.even { - background-color: #ffacac; -} -tr.simpletest-exception.odd { - background-color: #f4ea71; -} -tr.simpletest-exception.even { - background-color: #f5e742; -} -tr.simpletest-debug.odd { - background-color: #eee; -} -tr.simpletest-debug.even { - background-color: #fff; -} - -a.simpletest-collapse { - height: 0; - width: 0; - top: -99em; - position: absolute; -} -a.simpletest-collapse:focus, -a.simpletest-collapse:hover { - font-size: 80%; - top: 0px; - height: auto; - width: auto; - overflow: visible; - position: relative; - z-index: 1000; -} diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module index b21c64c..920f6fb 100644 --- a/core/modules/simpletest/simpletest.module +++ b/core/modules/simpletest/simpletest.module @@ -145,7 +145,7 @@ function simpletest_run_tests($test_list, $reporter = 'drupal') { ), 'finished' => '_simpletest_batch_finished', 'progress_message' => '', - 'css' => array(drupal_get_path('module', 'simpletest') . '/simpletest.css'), + 'css' => array(drupal_get_path('module', 'simpletest') . '/simpletest.admin.css'), 'init_message' => t('Processing test @num of @max - %test.', array('%test' => $info['name'], '@num' => '1', '@max' => count($test_list))), ); batch_set($batch); diff --git a/core/modules/simpletest/simpletest.pages.inc b/core/modules/simpletest/simpletest.pages.inc index 8ac1ee2..e373ff3 100644 --- a/core/modules/simpletest/simpletest.pages.inc +++ b/core/modules/simpletest/simpletest.pages.inc @@ -68,7 +68,7 @@ function simpletest_test_form($form) { function theme_simpletest_test_table($variables) { $table = $variables['table']; - drupal_add_css(drupal_get_path('module', 'simpletest') . '/simpletest.css'); + drupal_add_css(drupal_get_path('module', 'simpletest') . '/simpletest.admin.css'); drupal_add_js(drupal_get_path('module', 'simpletest') . '/simpletest.js'); drupal_add_js('core/misc/tableselect.js'); @@ -212,7 +212,7 @@ function simpletest_result_form($form, &$form_state, $test_id) { } // Load all classes and include CSS. - drupal_add_css(drupal_get_path('module', 'simpletest') . '/simpletest.css'); + drupal_add_css(drupal_get_path('module', 'simpletest') . '/simpletest.admin.css'); // Keep track of which test cases passed or failed. $filter = array( diff --git a/core/modules/simpletest/tests/common.test b/core/modules/simpletest/tests/common.test index 4f20361..695305b 100644 --- a/core/modules/simpletest/tests/common.test +++ b/core/modules/simpletest/tests/common.test @@ -657,7 +657,7 @@ class CommonCascadingStylesheetsTestCase extends DrupalWebTestCase { * Tests rendering the stylesheets. */ function testRenderFile() { - $css = drupal_get_path('module', 'simpletest') . '/simpletest.css'; + $css = drupal_get_path('module', 'simpletest') . '/simpletest.admin.css'; drupal_add_css($css); $styles = drupal_get_css(); $this->assertTrue(strpos($styles, $css) > 0, t('Rendered CSS includes the added stylesheet.')); @@ -736,7 +736,7 @@ class CommonCascadingStylesheetsTestCase extends DrupalWebTestCase { */ function testRenderOrder() { // A module CSS file. - drupal_add_css(drupal_get_path('module', 'simpletest') . '/simpletest.css'); + drupal_add_css(drupal_get_path('module', 'simpletest') . '/simpletest.admin.css'); // A few system CSS files, ordered in a strange way. $system_path = drupal_get_path('module', 'system'); drupal_add_css($system_path . '/system.base.css', array('group' => CSS_SYSTEM, 'weight' => -10)); @@ -745,7 +745,7 @@ class CommonCascadingStylesheetsTestCase extends DrupalWebTestCase { $expected = array( $system_path . '/system.base.css', $system_path . '/system.theme.css', - drupal_get_path('module', 'simpletest') . '/simpletest.css', + drupal_get_path('module', 'simpletest') . '/simpletest.admin.css', ); -- 1.7.4.1