diff --git a/core/modules/block/block.admin.inc b/core/modules/block/block.admin.inc index 6774119..6a0d13e 100644 --- a/core/modules/block/block.admin.inc +++ b/core/modules/block/block.admin.inc @@ -13,7 +13,7 @@ * @see block_menu() */ function block_admin_demo($theme = NULL) { - drupal_add_css(drupal_get_path('module', 'block') . '/block.admin.css'); + drupal_add_css(drupal_get_path('module', 'block') . '/css/block.admin.css'); return ''; } diff --git a/core/modules/block/css/block.admin-rtl.css b/core/modules/block/css/block.admin-rtl.css new file mode 100644 index 0000000..8b2b840 --- /dev/null +++ b/core/modules/block/css/block.admin-rtl.css @@ -0,0 +1,12 @@ +/** + * @file + * RTL admin styles for Block module. + */ + +a.block-demo-backlink, +a.block-demo-backlink:link, +a.block-demo-backlink:visited { + left: 0; + right: 20px; +} + diff --git a/core/modules/block/css/block.admin.css b/core/modules/block/css/block.admin.css new file mode 100644 index 0000000..611fbb5 --- /dev/null +++ b/core/modules/block/css/block.admin.css @@ -0,0 +1,22 @@ +/** + * Admin styles for Block module. + */ + +#blocks tr.region-populated { + display: none; +} +.block-region { + margin-top: 4px; + margin-bottom: 4px; + padding: 3px; +} +a.block-demo-backlink, +a.block-demo-backlink:link, +a.block-demo-backlink:visited { + line-height: 20px; + left: 20px; /*LTR*/ + padding: 5px 10px; + position: fixed; + z-index: 499; +} + diff --git a/core/modules/block/css/block.admin.skin.css b/core/modules/block/css/block.admin.skin.css new file mode 100644 index 0000000..7326358 --- /dev/null +++ b/core/modules/block/css/block.admin.skin.css @@ -0,0 +1,31 @@ +/** + * @file + * Admin skin for Block module. + */ + +#blocks tr.region-title td { + font-weight: bold; +} +#blocks tr.region-message { + font-weight: normal; + color: #999; +} + +.block-region { + background-color: #ff6; +} + +a.block-demo-backlink, +a.block-demo-backlink:link, +a.block-demo-backlink:visited { + background-color: #b4d7f0; + border-radius: 0 0 10px 10px; + color: #000; + font-family: "Lucida Grande", Verdana, sans-serif; + font-size: small; +} + +a.block-demo-backlink:hover { + text-decoration: underline; +} + diff --git a/core/modules/block/lib/Drupal/block/BlockListController.php b/core/modules/block/lib/Drupal/block/BlockListController.php index 5dd981f..b9d0844 100644 --- a/core/modules/block/lib/Drupal/block/BlockListController.php +++ b/core/modules/block/lib/Drupal/block/BlockListController.php @@ -106,7 +106,7 @@ public function getFormID() { */ public function buildForm(array $form, array &$form_state) { $entities = $this->load(); - $form['#attached']['css'][] = drupal_get_path('module', 'block') . '/block.admin.css'; + $form['#attached']['css'][] = drupal_get_path('module', 'block') . '/css/block.admin.css'; $form['#attached']['library'][] = array('system', 'drupal.tableheader'); $form['#attached']['library'][] = array('block', 'drupal.block'); diff --git a/core/modules/color/color.module b/core/modules/color/color.module index 2203133..6942c6f 100644 --- a/core/modules/color/color.module +++ b/core/modules/color/color.module @@ -194,7 +194,7 @@ function color_scheme_form($complete_form, &$form_state, $theme) { ), // Add custom CSS. 'css' => array( - $base . '/color.admin.css' => array(), + $base . '/css/color.admin.css' => array(), ), // Add custom JavaScript. 'js' => array( diff --git a/core/modules/color/css/color.admin-rtl.css b/core/modules/color/css/color.admin-rtl.css new file mode 100644 index 0000000..d5bfbe8 --- /dev/null +++ b/core/modules/color/css/color.admin-rtl.css @@ -0,0 +1,48 @@ +/** + * @file + * Right-to-left specific stylesheet for the Color module. + */ + +#placeholder { + left: 0; + right: auto; +} + +/* Palette */ +.color-form .form-item { + padding-left: 0; + padding-right: 1em; +} +.color-form label { + float: right; + clear: right; +} +.color-form .form-text, +.color-form .form-select { + float: right; +} +.color-form .form-text { + margin-right: 0; + margin-left: 5px; +} +#palette .hook { + float: right; +} +#palette .down, +#palette .up, +#palette .both { + background: url(images/hook-rtl.png) no-repeat 0 0; +} +#palette .up { + background-position: 0 -27px; +} +#palette .both { + background-position: 0 -54px; +} +#palette .lock { + float: right; + right: -10px; +} +.js #preview { + float: right; +} diff --git a/core/modules/color/css/color.admin.css b/core/modules/color/css/color.admin.css new file mode 100644 index 0000000..1a8ca3a --- /dev/null +++ b/core/modules/color/css/color.admin.css @@ -0,0 +1,67 @@ +/** + * @file + * Stylesheet for the administration pages of the Color module. + */ + +/* Farbtastic placement */ +.color-form { + max-width: 50em; + position: relative; +} +#placeholder { + position: absolute; + top: 0; + right: 0; /* LTR */ +} + +/* Palette */ +.color-form .form-item { + height: 2em; + line-height: 2em; + padding-left: 1em; /* LTR */ + margin: 0.5em 0; +} +.color-form label { + float: left; /* LTR */ + clear: left; /* LTR */ + width: 10em; +} +.color-form .form-text, +.color-form .form-select { + float: left; /* LTR */ +} +.color-form .form-text { + text-align: center; + margin-right: 5px; /* LTR */ + cursor: pointer; +} + +#palette .hook { + float: left; /* LTR */ + margin-top: 3px; + width: 16px; + height: 16px; +} + +#palette .lock { + float: left; /* LTR */ + position: relative; + top: -1.4em; + left: -10px; /* LTR */ + width: 20px; + height: 25px; + cursor: pointer; +} +#palette .form-item { + width: 20em; +} + +/* Preview */ +#preview { + display: none; +} +.js #preview { + display: block; + position: relative; + float: left; /* LTR */ +} diff --git a/core/modules/color/css/color.admin.skin-rtl.css b/core/modules/color/css/color.admin.skin-rtl.css new file mode 100644 index 0000000..f5f88c7 --- /dev/null +++ b/core/modules/color/css/color.admin.skin-rtl.css @@ -0,0 +1,16 @@ +/** + * RTL stylesheet for the admin skin of Color module. + */ + +#palette .down, +#palette .up, +#palette .both { + background: url(images/hook.png) no-repeat 100% 0; +} +#palette .up { + background-position: 100% -27px; +} +#palette .both { + background-position: 100% -54px; +} + diff --git a/core/modules/color/css/color.admin.skin.css b/core/modules/color/css/color.admin.skin.css new file mode 100644 index 0000000..53b374a --- /dev/null +++ b/core/modules/color/css/color.admin.skin.css @@ -0,0 +1,25 @@ +/** + * Stylesheet for the admin skin of Color module. + */ + +#palette .down, +#palette .up, +#palette .both { + background: url(images/hook.png) no-repeat 100% 0; /* LTR */ +} +#palette .up { + background-position: 100% -27px; /* LTR */ +} +#palette .both { + background-position: 100% -54px; /* LTR */ +} +#palette .lock { + background: url(images/lock.png) no-repeat 50% 2px; +} +#palette .unlocked { + background-position: 50% -22px; +} +#palette .item-selected { + background: #eee; +} + diff --git a/core/modules/dblog/dblog-rtl.css b/core/modules/dblog/css/dblog.admin-rtl.css similarity index 100% rename from core/modules/dblog/dblog-rtl.css rename to core/modules/dblog/css/dblog.admin-rtl.css diff --git a/core/modules/dblog/css/dblog.admin.css b/core/modules/dblog/css/dblog.admin.css new file mode 100644 index 0000000..e88cfea --- /dev/null +++ b/core/modules/dblog/css/dblog.admin.css @@ -0,0 +1,20 @@ +/** + * @file + * Admin styles for the Database Logging module. + */ + +.dblog-filter-form .form-item-type, +.dblog-filter-form .form-item-severity { + display: inline-block; + margin: .1em .9em .1em .1em; /* LTR */ + max-width: 30%; +} +.dblog-filter-form .form-actions { + display: inline-block; + padding: 3ex 0 0; + vertical-align: top; +} +.admin-dblog .icon { + width: 16px; +} + diff --git a/core/modules/dblog/dblog.css b/core/modules/dblog/css/dblog.admin.skin.css similarity index 67% rename from core/modules/dblog/dblog.css rename to core/modules/dblog/css/dblog.admin.skin.css index 5494553..0ddc945 100644 --- a/core/modules/dblog/dblog.css +++ b/core/modules/dblog/css/dblog.admin.skin.css @@ -1,19 +1,8 @@ /** * @file - * Admin styles for the Database Logging module. + * Admin skin styles for the Database Logging module. */ -.dblog-filter-form .form-item-type, -.dblog-filter-form .form-item-severity { - display: inline-block; - margin: .1em .9em .1em .1em; /* LTR */ - max-width: 30%; -} -.dblog-filter-form .form-actions { - display: inline-block; - padding: 3ex 0 0; - vertical-align: top; -} .dblog-user.odd .active { background: #ddf; } @@ -34,7 +23,6 @@ } .admin-dblog .icon { background: no-repeat center; - width: 16px; } .admin-dblog .dblog-warning .icon { background-image: url(../../misc/message-16-warning.png); @@ -45,3 +33,4 @@ .admin-dblog .dblog-emergency .icon { background-image: url(../../misc/message-16-error.png); } + diff --git a/core/modules/dblog/dblog.module b/core/modules/dblog/dblog.module index d28f3b7..b4583ca 100644 --- a/core/modules/dblog/dblog.module +++ b/core/modules/dblog/dblog.module @@ -90,7 +90,7 @@ function dblog_menu() { */ function dblog_page_build(&$page) { if (arg(0) == 'admin' && arg(1) == 'reports') { - $page['#attached']['css'][] = drupal_get_path('module', 'dblog') . '/dblog.css'; + $page['#attached']['css'][] = drupal_get_path('module', 'dblog') . '/css/dblog.admin.css'; } } diff --git a/core/modules/entity_reference/css/entity_reference-rtl.admin.css b/core/modules/entity_reference/css/entity_reference.admin-rtl.css similarity index 100% rename from core/modules/entity_reference/css/entity_reference-rtl.admin.css rename to core/modules/entity_reference/css/entity_reference.admin-rtl.css diff --git a/core/modules/field_ui/field_ui.admin-rtl.css b/core/modules/field_ui/css/field_ui.admin-rtl.css similarity index 100% rename from core/modules/field_ui/field_ui.admin-rtl.css rename to core/modules/field_ui/css/field_ui.admin-rtl.css diff --git a/core/modules/field_ui/field_ui.admin.css b/core/modules/field_ui/css/field_ui.admin.css similarity index 84% rename from core/modules/field_ui/field_ui.admin.css rename to core/modules/field_ui/css/field_ui.admin.css index cf59695..6c07b2a 100644 --- a/core/modules/field_ui/field_ui.admin.css +++ b/core/modules/field_ui/css/field_ui.admin.css @@ -18,15 +18,8 @@ white-space: normal; } .field-ui-overview .add-new .add-new-placeholder { - font-weight: bold; padding-bottom: .5em; } -.field-ui-overview .region-title td { - font-weight: bold; -} -.field-ui-overview .region-message td { - font-style: italic; -} .field-ui-overview .region-populated { display: none; } @@ -63,6 +56,4 @@ .field-ui-overview .field-formatter-settings-editing .field-formatter-type { display: none; } -.field-ui-overview .field-formatter-settings-edit-form .formatter-name{ - font-weight: bold; -} + diff --git a/core/modules/field_ui/css/field_ui.admin.skin.css b/core/modules/field_ui/css/field_ui.admin.skin.css new file mode 100644 index 0000000..31c9042 --- /dev/null +++ b/core/modules/field_ui/css/field_ui.admin.skin.css @@ -0,0 +1,18 @@ +/** + * @file + * Stylesheet for the admin skin of the Field UI module. + */ + +.field-ui-overview .add-new .add-new-placeholder { + font-weight: bold; +} +.field-ui-overview .region-title td { + font-weight: bold; +} +.field-ui-overview .region-message td { + font-style: italic; +} +.field-ui-overview .field-formatter-settings-edit-form .formatter-name{ + font-weight: bold; +} + diff --git a/core/modules/field_ui/field_ui.module b/core/modules/field_ui/field_ui.module index a0f29e3..8d32be9 100644 --- a/core/modules/field_ui/field_ui.module +++ b/core/modules/field_ui/field_ui.module @@ -417,7 +417,7 @@ function field_ui_library_info() { drupal_get_path('module', 'field_ui') . '/field_ui.js' => array(), ), 'css' => array( - drupal_get_path('module', 'field_ui') . '/field_ui.admin.css' => array(), + drupal_get_path('module', 'field_ui') . '/css/field_ui.admin.css' => array(), ), 'dependencies' => array( array('system', 'jquery'), diff --git a/core/modules/file/file.admin.css b/core/modules/file/css/file.admin.css similarity index 100% rename from core/modules/file/file.admin.css rename to core/modules/file/css/file.admin.css diff --git a/core/modules/file/file.module b/core/modules/file/file.module index 3fcd034..1c20279 100644 --- a/core/modules/file/file.module +++ b/core/modules/file/file.module @@ -1658,7 +1658,7 @@ function file_library_info() { drupal_get_path('module', 'file') . '/file.js' => array(), ), 'css' => array( - drupal_get_path('module', 'file') . '/file.admin.css' + drupal_get_path('module', 'file') . '/css/file.admin.css' ), 'dependencies' => array( array('system', 'jquery'), diff --git a/core/modules/filter/filter.admin-rtl.css b/core/modules/filter/css/filter.admin-rtl.css similarity index 88% rename from core/modules/filter/filter.admin-rtl.css rename to core/modules/filter/css/filter.admin-rtl.css index 4d972e2..50f19c2 100644 --- a/core/modules/filter/filter.admin-rtl.css +++ b/core/modules/filter/css/filter.admin-rtl.css @@ -1,4 +1,3 @@ - /** * @file * Right-to-Left administrative styling for the Filter module. @@ -11,7 +10,6 @@ float: left; } .filter-help a { - background-position: left center; padding: 0 0 0 20px; } @@ -21,3 +19,4 @@ .tips { padding-right: 0; } + diff --git a/core/modules/filter/filter.admin.css b/core/modules/filter/css/filter.admin.css similarity index 86% rename from core/modules/filter/filter.admin.css rename to core/modules/filter/css/filter.admin.css index 8c144cf..d73f183 100644 --- a/core/modules/filter/filter.admin.css +++ b/core/modules/filter/css/filter.admin.css @@ -12,7 +12,6 @@ } .filter-wrapper { - border: 1px solid #ccc; border-top: 0; margin: 0; padding: 0.5em 1.5em; @@ -31,7 +30,6 @@ margin: 0; } .filter-help a { - background: transparent url(../../misc/help.png) right center no-repeat; /* LTR */ padding: 0 20px 0 0; /* LTR */ } @@ -52,3 +50,4 @@ .tips { padding-left: 0; /* LTR */ } + diff --git a/core/modules/filter/css/filter.admin.skin-rtl.css b/core/modules/filter/css/filter.admin.skin-rtl.css new file mode 100644 index 0000000..7ac0013 --- /dev/null +++ b/core/modules/filter/css/filter.admin.skin-rtl.css @@ -0,0 +1,9 @@ +/** + * @file + * Right-to-Left administrative skin styling for the Filter module. + */ + +.filter-help a { + background-position: left center; +} + diff --git a/core/modules/filter/css/filter.admin.skin.css b/core/modules/filter/css/filter.admin.skin.css new file mode 100644 index 0000000..97e557d --- /dev/null +++ b/core/modules/filter/css/filter.admin.skin.css @@ -0,0 +1,13 @@ +/** + * @file + * Admin skin styling for the Filter module. + */ + +.filter-wrapper { + border: 1px solid #ccc; +} + +.filter-help a { + background: transparent url(../../misc/help.png) right center no-repeat; /* LTR */ +} + diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module index 57ff8c2..93cb8af 100644 --- a/core/modules/filter/filter.module +++ b/core/modules/filter/filter.module @@ -1811,7 +1811,7 @@ function filter_library_info() { drupal_get_path('module', 'filter') . '/filter.admin.js' => array(), ), 'css' => array( - drupal_get_path('module', 'filter') . '/filter.admin.css' + drupal_get_path('module', 'filter') . '/css/filter.admin.css' ), 'dependencies' => array( array('system', 'jquery'), @@ -1827,7 +1827,7 @@ function filter_library_info() { drupal_get_path('module', 'filter') . '/filter.js' => array(), ), 'css' => array( - drupal_get_path('module', 'filter') . '/filter.admin.css' + drupal_get_path('module', 'filter') . '/css/filter.admin.css' ), 'dependencies' => array( array('system', 'jquery'), diff --git a/core/modules/help/help-rtl.css b/core/modules/help/css/help.admin-rtl.css similarity index 69% rename from core/modules/help/help-rtl.css rename to core/modules/help/css/help.admin-rtl.css index 035d5d2..2a352e4 100644 --- a/core/modules/help/help-rtl.css +++ b/core/modules/help/css/help.admin-rtl.css @@ -1,3 +1,6 @@ +/** + * Right-to-Left admin styling for Help module. + */ .help-items { float: right; @@ -8,3 +11,4 @@ margin-right: 0; margin-left: 0; } + diff --git a/core/modules/help/help.css b/core/modules/help/css/help.admin.css similarity index 85% rename from core/modules/help/help.css rename to core/modules/help/css/help.admin.css index 5d074c8..72426c5 100644 --- a/core/modules/help/help.css +++ b/core/modules/help/css/help.admin.css @@ -1,3 +1,7 @@ +/** + * @file + * Admin styling for Help module. + */ .help-items { float: left; /* LTR */ @@ -18,3 +22,4 @@ margin: 0; } } + diff --git a/core/modules/help/help.admin.inc b/core/modules/help/help.admin.inc index a3bea9e..69c406a 100644 --- a/core/modules/help/help.admin.inc +++ b/core/modules/help/help.admin.inc @@ -12,7 +12,7 @@ */ function help_main() { // Add CSS. - drupal_add_css(drupal_get_path('module', 'help') . '/help.css'); + drupal_add_css(drupal_get_path('module', 'help') . '/css/help.admin.css'); $output = '

' . t('Help topics') . '

' . t('Help is available on the following items:') . '

' . help_links_as_list(); return $output; } 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/css/language.admin.css similarity index 99% rename from core/modules/language/language.admin.css rename to core/modules/language/css/language.admin.css index 2af92d7..4146267 100644 --- a/core/modules/language/language.admin.css +++ b/core/modules/language/css/language.admin.css @@ -14,3 +14,4 @@ #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/css/layout.admin.css b/core/modules/layout/css/layout.admin.css new file mode 100644 index 0000000..090eb90 --- /dev/null +++ b/core/modules/layout/css/layout.admin.css @@ -0,0 +1,10 @@ +/** + * @file + * Admin styling for Layout module. + */ + +.layout-region-demonstration { + margin: 3px; + padding: 10px; +} + diff --git a/core/modules/layout/layout.admin.css b/core/modules/layout/css/layout.admin.skin.css similarity index 93% rename from core/modules/layout/layout.admin.css rename to core/modules/layout/css/layout.admin.skin.css index 6e38bf4..adc108c 100644 --- a/core/modules/layout/layout.admin.css +++ b/core/modules/layout/css/layout.admin.skin.css @@ -1,3 +1,8 @@ +/** + * @file + * Admin skin styling for Layout module. + */ + .layout-display { background: rgb(224, 224, 224); } @@ -11,7 +16,6 @@ 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..245afcf 100644 --- a/core/modules/layout/layout.admin.inc +++ b/core/modules/layout/layout.admin.inc @@ -70,6 +70,6 @@ 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'; return $build; } diff --git a/core/modules/locale/locale.admin-rtl.css b/core/modules/locale/css/locale.admin-rtl.css similarity index 100% rename from core/modules/locale/locale.admin-rtl.css rename to core/modules/locale/css/locale.admin-rtl.css diff --git a/core/modules/locale/locale.admin.css b/core/modules/locale/css/locale.admin.css similarity index 83% rename from core/modules/locale/locale.admin.css rename to core/modules/locale/css/locale.admin.css index 03ce7bd..b100a96 100644 --- a/core/modules/locale/locale.admin.css +++ b/core/modules/locale/css/locale.admin.css @@ -1,3 +1,8 @@ +/** + * @file + * Admin styling for Locale module. + */ + .locale-translate-filter-form .details-wrapper { overflow: hidden; } @@ -32,10 +37,6 @@ vertical-align: top } -.locale-translate-edit-form .changed { - background: #ffb; -} - .locale-translate-edit-form tr .form-type-item .ajax-changed { position: absolute; } @@ -66,23 +67,11 @@ 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; @@ -110,8 +99,6 @@ 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 { @@ -121,3 +108,4 @@ width: 40%; } } + diff --git a/core/modules/locale/css/locale.admin.skin.css b/core/modules/locale/css/locale.admin.skin.css new file mode 100644 index 0000000..159b91e --- /dev/null +++ b/core/modules/locale/css/locale.admin.skin.css @@ -0,0 +1,34 @@ +/** + * @file + * Admin skin styling for Locale module. + */ + +.locale-translate-edit-form .changed { + background: #ffb; +} + +#locale-translation-status-form .expand .inner { + background: transparent url(../../misc/menu-collapsed.png) left .6em no-repeat; +} + +#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; +} + +#locale-translation-status-form .details { + font-size: 0.9em; + color: #666; +} + diff --git a/core/modules/locale/locale.pages.inc b/core/modules/locale/locale.pages.inc index fc68a51..719f2c0 100644 --- a/core/modules/locale/locale.pages.inc +++ b/core/modules/locale/locale.pages.inc @@ -163,7 +163,7 @@ 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', ); $form['filters'] = array( @@ -260,7 +260,7 @@ 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', ); $form['#attached']['library'][] = array('locale', 'drupal.locale.admin'); @@ -582,7 +582,7 @@ 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['actions'] = array('#type' => 'actions'); if ($languages_update) { diff --git a/core/modules/menu/css/menu.admin.css b/core/modules/menu/css/menu.admin.css new file mode 100644 index 0000000..18355ed --- /dev/null +++ b/core/modules/menu/css/menu.admin.css @@ -0,0 +1,8 @@ +/** + * Admin styling for Menu module. + */ + +.menu-enabled { + width: 70px; +} + diff --git a/core/modules/menu/css/menu.admin.skin.css b/core/modules/menu/css/menu.admin.skin.css new file mode 100644 index 0000000..a2ea32c --- /dev/null +++ b/core/modules/menu/css/menu.admin.skin.css @@ -0,0 +1,8 @@ +/** + * Admin styling for Menu module. + */ + +.menu-label { + font-weight: bold; +} + diff --git a/core/modules/menu/lib/Drupal/menu/MenuListController.php b/core/modules/menu/lib/Drupal/menu/MenuListController.php index e557d92..1ed2200 100644 --- a/core/modules/menu/lib/Drupal/menu/MenuListController.php +++ b/core/modules/menu/lib/Drupal/menu/MenuListController.php @@ -71,7 +71,7 @@ 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'; 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..f86e3bc 100644 --- a/core/modules/menu/menu.admin.inc +++ b/core/modules/menu/menu.admin.inc @@ -71,7 +71,7 @@ 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'); $links = array(); $query = Drupal::entityQuery('menu_link') diff --git a/core/modules/translation_entity/translation_entity.admin.css b/core/modules/translation_entity/css/translation_entity.admin.css similarity index 70% rename from core/modules/translation_entity/translation_entity.admin.css rename to core/modules/translation_entity/css/translation_entity.admin.css index cab64f8..af2b909 100644 --- a/core/modules/translation_entity/translation_entity.admin.css +++ b/core/modules/translation_entity/css/translation_entity.admin.css @@ -7,10 +7,6 @@ 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%; @@ -21,11 +17,6 @@ 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%; } @@ -33,3 +24,4 @@ #language-content-settings-form table .operations { width: 75%; } + diff --git a/core/modules/translation_entity/css/translation_entity.admin.skin.css b/core/modules/translation_entity/css/translation_entity.admin.skin.css new file mode 100644 index 0000000..9101b2a --- /dev/null +++ b/core/modules/translation_entity/css/translation_entity.admin.skin.css @@ -0,0 +1,14 @@ +/** + * @file + * Skin styles for the content language administration page. + */ + +#language-content-settings-form table td.bundle { + font-weight: bold; +} + +#language-content-settings-form table .field label, +#language-content-settings-form table .column label { + font-weight: normal; +} + diff --git a/core/modules/translation_entity/translation_entity.module b/core/modules/translation_entity/translation_entity.module index cb75cb2..6ec8672 100644 --- a/core/modules/translation_entity/translation_entity.module +++ b/core/modules/translation_entity/translation_entity.module @@ -362,7 +362,7 @@ 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(), ), 'dependencies' => array( array('system', 'jquery'), diff --git a/core/modules/update/update-rtl.css b/core/modules/update/css/update.admin-rtl.css similarity index 100% rename from core/modules/update/update-rtl.css rename to core/modules/update/css/update.admin-rtl.css diff --git a/core/modules/update/update.css b/core/modules/update/css/update.admin.css similarity index 52% copy from core/modules/update/update.css copy to core/modules/update/css/update.admin.css index cb20500..45a38de 100644 --- a/core/modules/update/update.css +++ b/core/modules/update/css/update.admin.css @@ -4,8 +4,6 @@ */ .update .project { - font-weight: bold; - font-size: 110%; padding-left: .25em; /* LTR */ height: 22px; } @@ -13,7 +11,6 @@ .update .version-status { float: right; /* LTR */ padding-right: 10px; /* LTR */ - font-size: 110%; height: 20px; } @@ -30,54 +27,15 @@ 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, @@ -85,8 +43,6 @@ table.update, line-height: .9em; padding: 0; margin: 0; - border: none; - background: none; } .update table.version .version-title { @@ -103,32 +59,10 @@ table.update, 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.css b/core/modules/update/css/update.admin.skin.css similarity index 55% rename from core/modules/update/update.css rename to core/modules/update/css/update.admin.skin.css index cb20500..88e0430 100644 --- a/core/modules/update/update.css +++ b/core/modules/update/css/update.admin.skin.css @@ -1,33 +1,15 @@ /** * @file - * Styles used by the Update Manager module. + * Admin skin 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, @@ -60,19 +42,12 @@ 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; } @@ -82,27 +57,10 @@ table.update, .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; } @@ -116,10 +74,6 @@ table.update, color: #970f00; } -.update .check-manually { - padding-left: 1em; /* LTR */ -} - .update-major-version-warning { color: #ff0000; } @@ -129,7 +83,3 @@ 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..26cd673 100644 --- a/core/modules/update/update.manager.inc +++ b/core/modules/update/update.manager.inc @@ -77,7 +77,7 @@ 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'; // 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..c403433 100644 --- a/core/modules/update/update.report.inc +++ b/core/modules/update/update.report.inc @@ -247,7 +247,7 @@ 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'); return $output; }