is_container ? 'colspan="4" class="container"' : 'class="forum"'; ?>>
title: The title of the topic. Safe to output.
* - $topic->message: If the topic has been moved, this contains an
* explanation and a link.
- * - $topic->zebra: 'even' or 'odd' string used for row class.
* - $topic->comment_count: The number of replies on this topic.
* - $topic->new_replies: A flag to indicate whether there are unread
* comments.
@@ -37,13 +36,13 @@
* @ingroup themeable
*/
?>
-
+
-
+
icon; ?> |
diff --git a/core/modules/image/image.admin.css b/core/modules/image/image.admin.css
index 338a007..ceaf50c 100644
--- a/core/modules/image/image.admin.css
+++ b/core/modules/image/image.admin.css
@@ -57,8 +57,7 @@
.image-anchor {
width: auto;
}
-.image-anchor .even,
-.image-anchor .odd {
+.image-anchor .zebra {
background: none;
}
.image-anchor td {
diff --git a/core/modules/node/templates/node.tpl.php b/core/modules/node/templates/node.tpl.php
index ca9a75b..2c3f861 100644
--- a/core/modules/node/templates/node.tpl.php
+++ b/core/modules/node/templates/node.tpl.php
@@ -46,8 +46,6 @@
* - $comment_count: Number of comments attached to the node.
* - $uid: User ID of the node author.
* - $created: Time the node was published formatted in Unix timestamp.
- * - $zebra: Outputs either "even" or "odd". Useful for zebra striping in
- * teaser listings.
* - $id: Position of the node. Increments each time it's output.
*
* Node status variables:
diff --git a/core/modules/simpletest/simpletest.css b/core/modules/simpletest/simpletest.css
index 86bd04b..81ae9f6 100644
--- a/core/modules/simpletest/simpletest.css
+++ b/core/modules/simpletest/simpletest.css
@@ -1,4 +1,3 @@
-
/* Test Table */
#simpletest-form-table th.select-all {
width: 1em;
@@ -46,28 +45,28 @@ div.simpletest-pass {
color: #981010;
}
-tr.simpletest-pass.odd {
+tr.simpletest-pass {
background-color: #b6ffb6;
}
-tr.simpletest-pass.even {
+tr.simpletest-pass:nth-child(even) {
background-color: #9bff9b;
}
-tr.simpletest-fail.odd {
+tr.simpletest-fail {
background-color: #ffc9c9;
}
-tr.simpletest-fail.even {
+tr.simpletest-fail:nth-child(even) {
background-color: #ffacac;
}
-tr.simpletest-exception.odd {
+tr.simpletest-exception {
background-color: #f4ea71;
}
-tr.simpletest-exception.even {
+tr.simpletest-exception:nth-child(even) {
background-color: #f5e742;
}
-tr.simpletest-debug.odd {
+tr.simpletest-debug {
background-color: #eee;
}
-tr.simpletest-debug.even {
+tr.simpletest-debug:nth-child(even) {
background-color: #fff;
}
diff --git a/core/modules/system/lib/Drupal/system/Tests/Ajax/CommandsTest.php b/core/modules/system/lib/Drupal/system/Tests/Ajax/CommandsTest.php
index 5a455b7..6e45495 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Ajax/CommandsTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Ajax/CommandsTest.php
@@ -142,14 +142,6 @@ function testAjaxCommands() {
);
$this->assertCommand($commands, $expected, "'remove' AJAX command issued with correct command and selector");
- // Tests the 'restripe' command.
- $commands = $this->drupalPostAJAX($form_path, $edit, array('op' => t("AJAX 'restripe' command")));
- $expected = array(
- 'command' => 'restripe',
- 'selector' => '#restripe_table',
- );
- $this->assertCommand($commands, $expected, "'restripe' AJAX command issued with correct selector");
-
// Tests the 'settings' command.
$commands = $this->drupalPostAJAX($form_path, $edit, array('op' => t("AJAX 'settings' command")));
$expected = array(
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/FunctionsTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/FunctionsTest.php
index d3a090f..bf271a3 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Theme/FunctionsTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Theme/FunctionsTest.php
@@ -95,30 +95,30 @@ function testItemList() {
);
$inner_b = ' ';
- $inner_b .= '- ba
';
- $inner_b .= '- bb
';
+ $inner_b .= '- ba
';
+ $inner_b .= '- bb
';
$inner_b .= ' ';
$inner_cb = ' ';
- $inner_cb .= '- cba
';
- $inner_cb .= '- cbb
';
+ $inner_cb .= '- cba
';
+ $inner_cb .= '- cbb
';
$inner_cb .= ' ';
$inner_c = ' ';
- $inner_c .= '- ca
';
- $inner_c .= '- cb' . $inner_cb . '
';
- $inner_c .= '- cc
';
+ $inner_c .= '- ca
';
+ $inner_c .= '- cb' . $inner_cb . '
';
+ $inner_c .= '- cc
';
$inner_c .= ' ';
$expected = ' ';
$expected .= ' Some title';
$expected .= ' ';
- $expected .= '- a
';
- $expected .= '- b' . $inner_b . '
';
- $expected .= '- c' . $inner_c . '
';
- $expected .= '- d
';
- $expected .= '';
- $expected .= '- f
';
+ $expected .= '- a
';
+ $expected .= '- b' . $inner_b . '
';
+ $expected .= '- c' . $inner_c . '
';
+ $expected .= '- d
';
+ $expected .= '';
+ $expected .= '- f
';
$expected .= ' ';
$this->assertThemeOutput('item_list', $variables, $expected);
@@ -163,9 +163,9 @@ function testLinks() {
$expected_links = '';
$expected_links .= ' ';
// Verify that passing a string as heading works.
diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/TableTest.php b/core/modules/system/lib/Drupal/system/Tests/Theme/TableTest.php
index 392959d..1bfb5c9 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Theme/TableTest.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Theme/TableTest.php
@@ -63,7 +63,7 @@ function testThemeTableWithEmptyMessage() {
),
);
$this->content = theme('table', array('header' => $header, 'rows' => array(), 'empty' => t('No strings available.')));
- $this->assertRaw(' No strings available. | ', 'Correct colspan was set on empty message.');
+ $this->assertRaw(' No strings available. | ', 'Correct colspan was set on empty message.');
$this->assertRaw('Header 1 | ', 'Table header was printed.');
}
}
diff --git a/core/modules/system/system.admin-rtl.css b/core/modules/system/system.admin-rtl.css
index d7553b5..7c81f59 100644
--- a/core/modules/system/system.admin-rtl.css
+++ b/core/modules/system/system.admin-rtl.css
@@ -57,11 +57,11 @@ table.screenshot {
border-left: 1px solid #cdcdcd;
float: right;
}
-.theme-selector .operations li.last {
+.theme-selector .operations li:last-child {
border-left: none;
padding: 0 0.7em 0 0;
}
-.theme-selector .operations li.first {
+.theme-selector .operations li:first-child {
padding: 0 0 0 0.7em;
}
diff --git a/core/modules/system/system.admin.css b/core/modules/system/system.admin.css
index 957d3e0..bf7468b 100644
--- a/core/modules/system/system.admin.css
+++ b/core/modules/system/system.admin.css
@@ -222,12 +222,9 @@ table.screenshot {
list-style-type: none;
border-right: 1px solid #cdcdcd; /* LTR */
}
-.theme-selector .operations li.last {
- padding: 0 0 0 0.7em; /* LTR */
- border-right: none; /* LTR */
-}
-.theme-selector .operations li.first {
+.theme-selector .operations li:first-child {
padding: 0 0.7em 0 0; /* LTR */
+ border-left: none; /* LTR */
}
#system-themes-admin-form {
clear: left;
diff --git a/core/modules/system/system.theme.css b/core/modules/system/system.theme.css
index 6a4a64d..f5a088d 100644
--- a/core/modules/system/system.theme.css
+++ b/core/modules/system/system.theme.css
@@ -1,4 +1,3 @@
-
/**
* @file
* Basic styling for common markup.
diff --git a/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module b/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module
index 96288f9..856e0f2 100644
--- a/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module
+++ b/core/modules/system/tests/modules/ajax_forms_test/ajax_forms_test.module
@@ -210,21 +210,6 @@ function ajax_forms_test_ajax_commands_form($form, &$form_state) {
'#suffix' => '',
);
- // Shows the Ajax 'restripe' command.
- $form['restripe_command_example'] = array(
- '#type' => 'submit',
- '#value' => t("AJAX 'restripe' command"),
- '#ajax' => array(
- 'callback' => 'ajax_forms_test_advanced_commands_restripe_callback',
- ),
- '#suffix' => '
-
- first row |
- second row |
-
- ',
- );
-
// Demonstrates the Ajax 'settings' command. The 'settings' command has
// nothing visual to "show", but it can be tested via SimpleTest and via
// Firebug.
@@ -380,15 +365,6 @@ function ajax_forms_test_advanced_commands_remove_callback($form, $form_state) {
}
/**
- * Ajax form callback: Selects 'restripe'.
- */
-function ajax_forms_test_advanced_commands_restripe_callback($form, $form_state) {
- $commands = array();
- $commands[] = ajax_command_restripe('#restripe_table');
- return array('#type' => 'ajax', '#commands' => $commands);
-}
-
-/**
* Ajax form callback: Selects 'settings'.
*/
function ajax_forms_test_advanced_commands_settings_callback($form, $form_state) {
diff --git a/core/modules/taxonomy/templates/taxonomy-term.tpl.php b/core/modules/taxonomy/templates/taxonomy-term.tpl.php
index 712e83c..87307a7 100644
--- a/core/modules/taxonomy/templates/taxonomy-term.tpl.php
+++ b/core/modules/taxonomy/templates/taxonomy-term.tpl.php
@@ -23,8 +23,6 @@
* - $term: Full term object. Contains data that may not be safe.
* - $view_mode: View mode, e.g. 'full', 'teaser'...
* - $page: Flag for the full page state.
- * - $zebra: Outputs either "even" or "odd". Useful for zebra striping in
- * teaser listings.
* - $id: Position of the term. Increments each time it's output.
* - $is_front: Flags true when presented in the front page.
* - $logged_in: Flags true when the current user is a logged-in member.
diff --git a/core/modules/update/update.css b/core/modules/update/update.css
index cb20500..5206d8d 100644
--- a/core/modules/update/update.css
+++ b/core/modules/update/update.css
@@ -30,8 +30,7 @@
padding: 1em 1em .25em 1em;
}
-.update tr.even,
-.update tr.odd {
+.update tr.zebra {
border: none;
}
diff --git a/core/modules/user/user.css b/core/modules/user/user.css
index 866ee40..facbe47 100644
--- a/core/modules/user/user.css
+++ b/core/modules/user/user.css
@@ -5,8 +5,7 @@
#permissions td.permission {
padding-left: 1.5em; /* LTR */
}
-#permissions tr.odd .form-item,
-#permissions tr.even .form-item {
+#permissions tr.zebra .form-item {
white-space: normal;
}
#user-admin-settings fieldset .fieldset-description {
diff --git a/core/themes/bartik/css/style-rtl.css b/core/themes/bartik/css/style-rtl.css
index d95d66b..560ced8 100644
--- a/core/themes/bartik/css/style-rtl.css
+++ b/core/themes/bartik/css/style-rtl.css
@@ -54,11 +54,11 @@ ul.tips {
margin-left: 2px;
margin-right: 0;
}
-.region-header #block-user-login .item-list li.last {
+.region-header #block-user-login .item-list li:last-child {
padding-left: 0;
padding-right: 0.5em;
}
-.region-header #block-user-login ul.openid-links li.last {
+.region-header #block-user-login ul.openid-links li:last-child {
padding-right: 0;
}
.region-header #user-login-form li.openid-link a,
@@ -175,11 +175,11 @@ a.button {
border-color: rgba(255, 255, 255, 0.15);
border-right: none;
}
-#footer li.first a {
+#footer li:first-child a {
padding-right: 0;
padding-left: 12px;
}
-#footer li.last a {
+#footer li:last-child a {
padding-left: 0;
padding-right: 12px;
border-left: none;
diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css
index 9e781eb..ba24e41 100644
--- a/core/themes/bartik/css/style.css
+++ b/core/themes/bartik/css/style.css
@@ -40,9 +40,6 @@ p {
del {
text-decoration: line-through;
}
-tr.odd {
- background-color: #dddddd;
-}
img {
outline: 0;
}
@@ -209,12 +206,10 @@ tr th {
border-color: #555;
border-color: rgba(255, 255, 255, 0.18);
}
-tr.odd {
- background: #e4e4e4;
- background: rgba(0, 0, 0, 0.105);
+table.zebra tbody tr:nth-of-type(odd) {
+ background-color: #dddddd;
}
-tr,
-tr.even {
+tr {
background: #efefef;
background: rgba(0, 0, 0, 0.063);
}
@@ -390,7 +385,7 @@ h1#site-name {
text-decoration: none;
background: rgba(255, 255, 255, 0.15);
}
-.region-header .block-menu li.last a {
+.region-header .block-menu li:last-child a {
border-bottom: 0;
}
/* User Login block in the header region */
@@ -425,10 +420,10 @@ h1#site-name {
float: left; /* LTR */
padding: 3px 0 1px;
}
-.region-header #block-user-login .item-list li.last {
+.region-header #block-user-login .item-list li:last-child {
padding-left: 0.5em; /* LTR */
}
-.region-header #block-user-login ul.openid-links li.last {
+.region-header #block-user-login ul.openid-links li:last-child {
padding-left: 0; /* LTR */
}
.region-header #user-login-form li.openid-link a,
@@ -775,9 +770,10 @@ ul.links {
.sidebar tbody {
border: none;
}
-.sidebar tr.even,
-.sidebar tr.odd {
+.sidebar table.zebra tbody tr {
background: none;
+}
+.sidebar table.zebra tbody tr:nth-of-type(odd) {
border-bottom: 1px solid #d6d6d6;
}
@@ -802,7 +798,7 @@ ul.links {
border-bottom: 1px solid #dfdfdf;
line-height: 1.3;
}
-#triptych .block.last {
+#triptych .block:last-child {
border-bottom: none;
}
#triptych .block ul li,
@@ -939,17 +935,17 @@ ul.links {
border-right: 1px solid #555; /* LTR */
border-color: rgba(255, 255, 255, 0.15);
}
-#footer li.first a {
+#footer li:first-child a {
padding-left: 0; /* LTR */
}
-#footer li.last a {
- padding-right: 0; /* LTR */
+#footer li:last-child a {
border-right: none; /* LTR */
+ padding-right: 0; /* LTR */
}
-#footer-wrapper tr.odd {
+#footer-wrapper tr.zebra {
background-color: transparent;
}
-#footer-wrapper tr.even {
+#footer-wrapper tr.zebra:nth-child(even) {
background-color: #2c2c2c;
background-color: rgba(0, 0, 0, 0.15);
}
diff --git a/core/themes/bartik/templates/node.tpl.php b/core/themes/bartik/templates/node.tpl.php
index 8467a4d..fc3e03c 100644
--- a/core/themes/bartik/templates/node.tpl.php
+++ b/core/themes/bartik/templates/node.tpl.php
@@ -46,8 +46,6 @@
* - $comment_count: Number of comments attached to the node.
* - $uid: User ID of the node author.
* - $created: Time the node was published formatted in Unix timestamp.
- * - $zebra: Outputs either "even" or "odd". Useful for zebra striping in
- * teaser listings.
* - $id: Position of the node. Increments each time it's output.
*
* Node status variables:
diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css
index bb0ad8c..5bfde09 100644
--- a/core/themes/seven/style.css
+++ b/core/themes/seven/style.css
@@ -393,21 +393,20 @@ table th {
border: 0;
color: #000;
}
-tr.even,
-tr.odd {
- border-width: 0 1px 0 1px;
- border-style: solid;
- border-color: #bebfb9;
+table.zebra tbody tr {
background: #f3f4ee;
+ border-color: #bebfb9;
+ border-style: solid;
+ border-width: 0 1px 0 1px;
}
-tr.odd {
+table.zebra tbody tr:nth-of-type(odd) {
background: #fff;
}
tr.drag {
- background: #fe7;
+ background: #fe7 !important;
}
tr.drag-previous {
- background: #ffb;
+ background: #ffb !important;
}
table th {
text-transform: uppercase;
---|
| |