' . t('Help is available on the following items:') . '
' . help_links_as_list(); return $output; } diff --git a/core/modules/help/help.css b/core/modules/help/help.css deleted file mode 100644 index 5d074c8..0000000 --- a/core/modules/help/help.css +++ /dev/null @@ -1,20 +0,0 @@ - -.help-items { - float: left; /* LTR */ - width: 22%; - margin-right: 3%; /* LTR */ -} -.help-items-last { - margin-right: 0; /* LTR */ -} - -/** - * Avoid text overlapping on a narrow viewport. - */ -@media screen and (max-width: 480px) { - .help-items { - float: none; - width: 100%; - margin: 0; - } -} diff --git a/core/modules/help/lib/Drupal/help/Tests/HelpTest.php b/core/modules/help/lib/Drupal/help/Tests/HelpTest.php index 54b955f..92a9cc6 100644 --- a/core/modules/help/lib/Drupal/help/Tests/HelpTest.php +++ b/core/modules/help/lib/Drupal/help/Tests/HelpTest.php @@ -67,7 +67,7 @@ public function testHelp() { // Check for css on admin/help. $this->drupalLogin($this->adminUser); $this->drupalGet('admin/help'); - $this->assertRaw(drupal_get_path('module', 'help') . '/help.css', 'The help.css file is present in the HTML.'); + $this->assertRaw(drupal_get_path('module', 'help') . '/css/help.admin.css', 'The help.css file is present in the HTML.'); // Verify that introductory help text exists, goes for 100% module coverage. $this->assertRaw(t('For more information, refer to the specific topics listed in the next section or to the online Drupal handbooks.', array('@drupal' => 'http://drupal.org/documentation')), 'Help intro text correctly appears.'); diff --git a/core/modules/language/language.admin.css b/core/modules/language/language.admin.css deleted file mode 100644 index 2af92d7..0000000 --- a/core/modules/language/language.admin.css +++ /dev/null @@ -1,16 +0,0 @@ -/** - * @file - * Styles for the content language administration page. - */ - -#language-content-settings-form table .bundle { - width: 25%; -} - -#language-content-settings-form table td.bundle { - font-weight: bold; -} - -#language-content-settings-form table .operations { - width: 75%; -} diff --git a/core/modules/language/language.admin.inc b/core/modules/language/language.admin.inc index f59fb38..7c2213b 100644 --- a/core/modules/language/language.admin.inc +++ b/core/modules/language/language.admin.inc @@ -803,7 +803,7 @@ function language_content_settings_form(array $form, array $form_state, array $s $form = array( '#labels' => $labels, '#attached' => array( - 'css' => array($path . '/language.admin.css'), + 'css' => array($path . '/css/language.admin.css'), ), ); diff --git a/core/modules/layout/layout.admin.css b/core/modules/layout/layout.admin.css deleted file mode 100644 index 6e38bf4..0000000 --- a/core/modules/layout/layout.admin.css +++ /dev/null @@ -1,17 +0,0 @@ -.layout-display { - background: rgb(224, 224, 224); -} - -.layout-region-demonstration { - background-image: -moz-linear-gradient(bottom, rgb(70,70,71) 40%, rgb(91,91,94) 70%, rgb(125,124,125) 88%); - background-image: -o-linear-gradient(bottom, rgb(70,70,71) 40%, rgb(91,91,94) 70%, rgb(125,124,125) 88%); - background-image: -ms-linear-gradient(bottom, rgb(70,70,71) 40%, rgb(91,91,94) 70%, rgb(125,124,125) 88%); - background-image: -webkit-linear-gradient(bottom, rgb(70,70,71) 40%, rgb(91,91,94) 70%, rgb(125,124,125) 88%); - background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0.4, rgb(70,70,71)), color-stop(0.7, rgb(91,91,94)), color-stop(0.88, rgb(125,124,125))); - background-image: linear-gradient(bottom, rgb(70,70,71) 40%, rgb(91,91,94) 70%, rgb(125,124,125) 88%); - color: white; - font-size: 0.8em; - margin: 3px; - padding: 10px; - text-transform: uppercase; -} diff --git a/core/modules/layout/layout.admin.inc b/core/modules/layout/layout.admin.inc index 9a1a921..40b70c2 100644 --- a/core/modules/layout/layout.admin.inc +++ b/core/modules/layout/layout.admin.inc @@ -70,6 +70,7 @@ function layout_page_view($key) { '#type' => 'markup', '#markup' => $instance->renderLayout(TRUE, $regions), ); - $build['#attached']['css'][] = drupal_get_path('module', 'layout') . '/layout.admin.css'; + $build['#attached']['css'][] = drupal_get_path('module', 'layout') . '/css/layout.admin.css'; + $build['#attached']['css'][] = drupal_get_path('module', 'layout') . '/css/layout.admin.skin.css'; return $build; } diff --git a/core/modules/locale/locale.admin-rtl.css b/core/modules/locale/locale.admin-rtl.css deleted file mode 100644 index 0b78f1b..0000000 --- a/core/modules/locale/locale.admin-rtl.css +++ /dev/null @@ -1,16 +0,0 @@ -/** - * @file - * CSS for the Locale module for right-to-left languages. - */ - -.locale-translate-filter-form .form-item-langcode, -.locale-translate-filter-form .form-item-translation, -.locale-translate-filter-form .form-item-customized { - float: right; - margin-left: 1em; - margin-right: 0; -} -.locale-translate-filter-form .form-actions { - float: right; - padding: 3.5ex 0 0 0; -} diff --git a/core/modules/locale/locale.admin.css b/core/modules/locale/locale.admin.css deleted file mode 100644 index 03ce7bd..0000000 --- a/core/modules/locale/locale.admin.css +++ /dev/null @@ -1,123 +0,0 @@ -.locale-translate-filter-form .details-wrapper { - overflow: hidden; -} -.locale-translate-filter-form .form-item-langcode, -.locale-translate-filter-form .form-item-translation, -.locale-translate-filter-form .form-item-customized { - float: left; /* LTR */ - margin-right: 1em; /* LTR */ - margin-bottom: 0; - /** - * In Opera 9, DOM elements with the property of "overflow: auto" - * will partially hide its contents with unnecessary scrollbars when - * its immediate child is floated without an explicit width set. - */ - width: 15em; -} -.locale-translate-filter-form .form-type-select select { - width: 100%; -} -.locale-translate-filter-form .form-actions { - float: left; /* LTR */ - padding: 3.8ex 0 0 0; /* LTR */ -} -.locale-translate-edit-form th { - width: 50%; - table-layout: fixed; -} -.locale-translate-edit-form .form-item { - white-space: normal; -} -.locale-translate-edit-form td { - vertical-align: top -} - -.locale-translate-edit-form .changed { - background: #ffb; -} - -.locale-translate-edit-form tr .form-type-item .ajax-changed { - position: absolute; -} - -.locale-translate-filter-form .form-wrapper { - margin-bottom:0; -} - -.locale-translate-edit-form table.changed { - margin-top: 0; -} - -/** - * Available translation updates page. - */ -#locale-translation-status-form table { - table-layout: fixed; -} -#locale-translation-status-form th.select-all { - width: 4%; -} -#locale-translation-status-form th.title { - width: 25%; -} -#locale-translation-status-form th.description { -} -#locale-translation-status-form td { - vertical-align: top; -} -#locale-translation-status-form .expand .inner { - background: transparent url(../../misc/menu-collapsed.png) left .6em no-repeat; - margin-left: -12px; - padding-left: 12px; -} -#locale-translation-status-form .expanded .expand .inner { - background: transparent url(../../misc/menu-expanded.png) left .6em no-repeat; -} - -#locale-translation-status-form label { - color: #1d1d1d; - font-size: 1.15em; -} -#locale-translation-status-form .description { - cursor: pointer; -} -#locale-translation-status-form .description .inner { - color: #5c5c5b; - line-height: 20px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; -} -#locale-translation-status-form .expanded .description .inner { - height: auto; - overflow: visible; - white-space: normal; -} -#locale-translation-status-form .expanded .description .text { - -webkit-hyphens: auto; - -moz-hyphens: auto; - hyphens: auto; -} -.js #locale-translation-status-form .description .inner { - height: 20px; -} -#locale-translation-status-form .expanded .description .inner { - height: auto; - overflow: visible; - white-space: normal; -} -#locale-translation-status-form .details { - padding: 5px 0; - max-width: 490px; - white-space: normal; - font-size: 0.9em; - color: #666; -} -@media screen and (max-width: 40em) { - #locale-translation-status-form th.title { - width: 20%; - } - #locale-translation-status-form th.status { - width: 40%; - } -} diff --git a/core/modules/locale/locale.pages.inc b/core/modules/locale/locale.pages.inc index a109f5f..7daf844 100644 --- a/core/modules/locale/locale.pages.inc +++ b/core/modules/locale/locale.pages.inc @@ -163,7 +163,8 @@ function locale_translate_filter_form($form, &$form_state) { $filter_values = locale_translate_filter_values(); $form['#attached']['css'] = array( - drupal_get_path('module', 'locale') . '/locale.admin.css', + drupal_get_path('module', 'locale') . '/css/locale.admin.css', + drupal_get_path('module', 'locale') . '/css/locale.admin.skin.css', ); $form['filters'] = array( @@ -260,7 +261,8 @@ function locale_translate_edit_form($form, &$form_state) { $path = drupal_get_path('module', 'locale'); $form['#attached']['css'] = array( - $path . '/locale.admin.css', + $path . '/css/locale.admin.css', + $path . '/css/locale.admin.skin.css', ); $form['#attached']['library'][] = array('locale', 'drupal.locale.admin'); @@ -583,7 +585,8 @@ function locale_translation_status_form($form, &$form_state) { ); $form['#attached']['library'][] = array('locale', 'drupal.locale.admin'); - $form['#attached']['css'] = array(drupal_get_path('module', 'locale') . '/locale.admin.css'); + $form['#attached']['css'] = array(drupal_get_path('module', 'locale') . '/css/locale.admin.css'); + $form['#attached']['css'] = array(drupal_get_path('module', 'locale') . '/css/locale.admin.skin.css'); $form['actions'] = array('#type' => 'actions'); if ($languages_update) { diff --git a/core/modules/menu/lib/Drupal/menu/MenuListController.php b/core/modules/menu/lib/Drupal/menu/MenuListController.php index e557d92..e0c1a7d 100644 --- a/core/modules/menu/lib/Drupal/menu/MenuListController.php +++ b/core/modules/menu/lib/Drupal/menu/MenuListController.php @@ -71,7 +71,8 @@ public function getOperations(EntityInterface $entity) { */ public function render() { $build = parent::render(); - $build['#attached']['css'][] = drupal_get_path('module', 'menu') . '/menu.admin.css'; + $build['#attached']['css'][] = drupal_get_path('module', 'menu') . '/css/menu.admin.css'; + $build['#attached']['css'][] = drupal_get_path('module', 'menu') . '/css/menu.admin.skin.css'; return $build; } diff --git a/core/modules/menu/menu.admin.css b/core/modules/menu/menu.admin.css deleted file mode 100644 index efbfe75..0000000 --- a/core/modules/menu/menu.admin.css +++ /dev/null @@ -1,6 +0,0 @@ -.menu-enabled { - width: 70px; -} -.menu-label { - font-weight: bold; -} diff --git a/core/modules/menu/menu.admin.inc b/core/modules/menu/menu.admin.inc index 8869465..d3fa66e 100644 --- a/core/modules/menu/menu.admin.inc +++ b/core/modules/menu/menu.admin.inc @@ -71,7 +71,8 @@ function menu_overview_form($form, &$form_state) { $form['#theme'] = 'menu_overview_form'; $form_state += array('menu_overview_form_parents' => array()); - $form['#attached']['css'] = array(drupal_get_path('module', 'menu') . '/menu.admin.css'); + $form['#attached']['css'] = array(drupal_get_path('module', 'menu') . '/css/menu.admin.css'); + $form['#attached']['css'] = array(drupal_get_path('module', 'menu') . '/css/menu.admin.skin.css'); $links = array(); $query = Drupal::entityQuery('menu_link') diff --git a/core/modules/translation_entity/translation_entity.admin.css b/core/modules/translation_entity/translation_entity.admin.css deleted file mode 100644 index cab64f8..0000000 --- a/core/modules/translation_entity/translation_entity.admin.css +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file - * Styles for the content language administration page. - */ - -#language-content-settings-form table .bundle { - width: 24%; -} - -#language-content-settings-form table td.bundle { - font-weight: bold; -} - -#language-content-settings-form table .field, -#language-content-settings-form table .column { - width: 24%; - padding-left: 3em; -} - -#language-content-settings-form table .column { - padding-left: 5em; -} - -#language-content-settings-form table .field label, -#language-content-settings-form table .column label { - font-weight: normal; -} - -#language-content-settings-form table .translatable { - width: 1%; -} - -#language-content-settings-form table .operations { - width: 75%; -} diff --git a/core/modules/translation_entity/translation_entity.module b/core/modules/translation_entity/translation_entity.module index e4dca3e..1bbfcda 100644 --- a/core/modules/translation_entity/translation_entity.module +++ b/core/modules/translation_entity/translation_entity.module @@ -362,7 +362,8 @@ function translation_entity_library_info() { $path . '/translation_entity.admin.js' => array(), ), 'css' => array( - $path . '/translation_entity.admin.css' => array(), + $path . '/css/translation_entity.admin.css' => array(), + $path . '/css/translation_entity.admin.skin.css' => array(), ), 'dependencies' => array( array('system', 'jquery'), diff --git a/core/modules/update/update-rtl.css b/core/modules/update/update-rtl.css deleted file mode 100644 index f181c84..0000000 --- a/core/modules/update/update-rtl.css +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file - * RTL styles used by the Update Manager module. - */ - -.update .project { - padding-right: .25em; -} - -.update .version-status { - float: left; - padding-left: 10px; -} - -.update .version-status .icon { - padding-right: .5em; -} - -.update table.version .version-title { - padding-left: 1em; -} - -.update table.version .version-details { - padding-left: .5em; - direction: ltr; -} - -.update table.version .version-links { - text-align: left; - padding-left: 1em; -} - -.update .check-manually { - padding-right: 1em; -} diff --git a/core/modules/update/update.css b/core/modules/update/update.css deleted file mode 100644 index cb20500..0000000 --- a/core/modules/update/update.css +++ /dev/null @@ -1,135 +0,0 @@ -/** - * @file - * Styles used by the Update Manager module. - */ - -.update .project { - font-weight: bold; - font-size: 110%; - padding-left: .25em; /* LTR */ - height: 22px; -} - -.update .version-status { - float: right; /* LTR */ - padding-right: 10px; /* LTR */ - font-size: 110%; - height: 20px; -} - -.update .version-status .icon { - padding-left: .5em; /* LTR */ -} - -.update .version-date { - white-space: nowrap; -} - -.update .info { - margin: 0; - padding: 1em 1em .25em 1em; -} - -.update tr.even, -.update tr.odd { - border: none; -} - -.update tr td { - border-top: 1px solid #ccc; - border-bottom: 1px solid #ccc; -} - -.update tr.error { - background: #fcc; -} - -.update tr.error .version-recommended { - background: #fdd; -} - -.update tr.ok { - background: #dfd; -} - -.update tr.warning { - background: #ffd; -} - -.update tr.warning .version-recommended { - background: #ffe; -} - -.current-version, -.new-version { - direction: ltr; /* Note: version numbers should always be LTR. */ -} - -.update tr.unknown { - background: #ddd; -} - -table.update, -.update table.version { - width: 100%; - margin-top: .5em; - border: none; -} - -.update table.version tbody { - border: none; -} - -.update table.version tr, -.update table.version td { - line-height: .9em; - padding: 0; - margin: 0; - border: none; - background: none; -} - -.update table.version .version-title { - padding-left: 1em; /* LTR */ - width: 14em; -} - -.update table.version .version-details { - padding-right: .5em; /* LTR */ -} - -.update table.version .version-links { - text-align: right; /* LTR */ - padding-right: 1em; /* LTR */ -} - -.update table.version-security .version-title { - color: #970f00; -} - -.update table.version-recommended-strong .version-title { - font-weight: bold; -} - -.update .security-error { - font-weight: bold; - color: #970f00; -} - -.update .check-manually { - padding-left: 1em; /* LTR */ -} - -.update-major-version-warning { - color: #ff0000; -} - -table tbody tr.update-security, -table tbody tr.update-unsupported { - background: #fcc; -} - -th.update-project-name { - width: 50%; -} - diff --git a/core/modules/update/update.manager.inc b/core/modules/update/update.manager.inc index bc84058..ccb90a7 100644 --- a/core/modules/update/update.manager.inc +++ b/core/modules/update/update.manager.inc @@ -77,7 +77,8 @@ function update_manager_update_form($form, $form_state = array(), $context) { return $form; } - $form['#attached']['css'][] = drupal_get_path('module', 'update') . '/update.css'; + $form['#attached']['css'][] = drupal_get_path('module', 'update') . '/css/update.admin.css'; + $form['#attached']['css'][] = drupal_get_path('module', 'update') . '/css/update.admin.skin.css'; // This will be a nested array. The first key is the kind of project, which // can be either 'enabled', 'disabled', 'manual' (projects which require diff --git a/core/modules/update/update.report.inc b/core/modules/update/update.report.inc index 607b523..9f55611 100644 --- a/core/modules/update/update.report.inc +++ b/core/modules/update/update.report.inc @@ -247,7 +247,8 @@ function theme_update_report($variables) { $output .= theme('table', array('header' => $header, 'rows' => $rows[$type_name], 'attributes' => array('class' => array('update')))); } } - drupal_add_css(drupal_get_path('module', 'update') . '/update.css'); + drupal_add_css(drupal_get_path('module', 'update') . '/css/update.admin.css'); + drupal_add_css(drupal_get_path('module', 'update') . '/css/update.admin.skin.css'); return $output; }