Index: modules/filter/filter.css =================================================================== RCS file: /cvs/drupal/drupal/modules/filter/filter.css,v retrieving revision 1.5 diff -u -p -F '^f' -r1.5 filter.css --- modules/filter/filter.css 20 Jul 2010 10:11:54 -0000 1.5 +++ modules/filter/filter.css 23 Aug 2010 04:23:18 -0000 @@ -44,3 +44,10 @@ input#edit-filters-filter-html-settings-allowed-html { width: 100%; } +.tips { + margin-top: 0; + margin-bottom: 0; + padding-top: 0; + padding-bottom: 0; + font-size: 0.9em; +} Index: modules/system/admin-rtl.css =================================================================== RCS file: /cvs/drupal/drupal/modules/system/admin-rtl.css,v retrieving revision 1.7 diff -u -p -F '^f' -r1.7 admin-rtl.css --- modules/system/admin-rtl.css 28 Apr 2010 20:08:39 -0000 1.7 +++ modules/system/admin-rtl.css 23 Aug 2010 04:23:18 -0000 @@ -1,9 +1,11 @@ /* $Id: admin-rtl.css,v 1.7 2010/04/28 20:08:39 dries Exp $ */ +/** + * Configuration listings + */ div.admin-panel .body { padding: 0 8px 2px 4px; } - div.admin .left { float: right; margin-left: 0; @@ -14,7 +16,6 @@ div.admin .right { margin-left: 1em; margin-right: 0; } - div.admin .expert-link { text-align: left; margin-right: 0; @@ -23,28 +24,41 @@ div.admin .expert-link { padding-left: 4px; } +/** + * Status Report + */ table.system-status-report th, table.system-status-report tr.merge-up td { padding-right: 30px; } - table.system-status-report th { background-position: 95% 50%; } +/** + * Appearance page + */ table.screenshot { margin-left: 1em; } - -.date-container { - clear: right; +.system-themes-list-enabled .theme-selector .screenshot, +.system-themes-list-enabled .theme-selector .no-screenshot { + float: right; + margin: 0 0 0 20px; } -.date-container .select-container, -.date-container .custom-container { +.system-themes-list-disabled .theme-selector { float: right; + padding: 20px 0 20px 20px; } -.date-container .custom-container { - margin-left: 0; - margin-right: 15px; +.theme-selector .operations li { + float: right; + border-right: none; + border-left: 1px solid #cdcdcd; +} +.theme-selector .operations li.last { + padding: 0 0.7em 0 0; + border-left: none; +} +.theme-selector .operations li.first { + padding: 0 0 0 0.7em; } - Index: modules/system/admin.css =================================================================== RCS file: /cvs/drupal/drupal/modules/system/admin.css,v retrieving revision 1.22 diff -u -p -F '^f' -r1.22 admin.css --- modules/system/admin.css 28 Apr 2010 20:08:39 -0000 1.22 +++ modules/system/admin.css 23 Aug 2010 04:23:18 -0000 @@ -1,26 +1,27 @@ /* $Id: admin.css,v 1.22 2010/04/28 20:08:39 dries Exp $ */ -/* -** Formatting for administration page -*/ +/** + * @file + * Contains styles which are specific to administration pages. + */ + +/** + * Configuration listings + */ div.admin-panel { margin: 0; padding: 5px 5px 15px 5px; } - div.admin-panel .description { margin: 0 0 3px; padding: 2px 0 3px 0; } - div.admin-panel .body { padding: 0 4px 2px 8px; /* LTR */ } - div.admin { padding-top: 15px; } - div.admin .left { float: left; /* LTR */ width: 47%; @@ -31,21 +32,17 @@ div.admin .right { width: 47%; margin-right: 1em; /* LTR */ } - div.admin .expert-link { text-align: right; /* LTR */ margin-right: 1em; /* LTR */ padding-right: 4px; /* LTR */ } -table.package { - width: 100%; -} -table.package .description { - width: 100%; -} -table.package .version { - direction: ltr; +/** + * Modules listing + */ +#system-modules div.incompatible { + font-weight: bold; } div.admin-requirements, div.admin-required { @@ -61,9 +58,23 @@ span.admin-enabled { span.admin-missing { color: #f00; } +a.module-link { + display: block; + padding: 1px 0 1px 20px; /* LTR */ + white-space: nowrap; +} +a.module-link-help { + background: url(../../misc/help.png) 0 50% no-repeat; /* LTR */ +} +a.module-link-permissions { + background: url(../../misc/permissions.png) 0 50% no-repeat; /* LTR */ +} +a.module-link-configure { + background: url(../../misc/configure.png) 0 50% no-repeat; /* LTR */ +} /** - * Formatting for status report + * Status report */ table.system-status-report th { border-bottom: 1px solid #ccc; @@ -87,24 +98,19 @@ table.system-status-report tr.warning th table.system-status-report tr.ok th { background-image: url(../../misc/watchdog-ok.png); } - -/** - * Formatting for theme configuration - */ -.theme-settings-left { - float: left; - width: 49%; -} -.theme-settings-right { - float: right; - width: 49%; -} -.theme-settings-bottom { - clear: both; +tr.merge-down, +tr.merge-down td, +tr.merge-down th { + border-bottom-width: 0 !important; +} +tr.merge-up, +tr.merge-up td, +tr.merge-up th { + border-top-width: 0 !important; } /** - * Formatting for theme overview + * Appearance page */ table.screenshot { margin-right: 1em; /* LTR */ @@ -115,26 +121,100 @@ table.screenshot { .theme-info p { margin-top: 0; } - - -/** - * Date and time settings page - */ -.date-container { - overflow: auto; - clear: left; /* LTR */ +.system-themes-list { + margin-bottom: 20px; +} +.system-themes-list-disabled { + border-top: 1px solid #cdcdcd; + padding-top: 20px; +} +.system-themes-list h2 { + margin: 0; +} +.theme-selector { + padding-top: 20px; +} +.theme-selector .screenshot, +.theme-selector .no-screenshot { + border: 1px solid #e0e0d8; + padding: 2px; + vertical-align: bottom; + width: 294px; + height: 219px; + line-height: 219px; + text-align: center; +} +.theme-default .screenshot { + border: 1px solid #aaa; +} +.system-themes-list-enabled .theme-selector .screenshot, +.system-themes-list-enabled .theme-selector .no-screenshot { + float: left; /* LTR */ + margin: 0 20px 0 0; /* LTR */ } -.date-container .form-item { +.system-themes-list-disabled .theme-selector .screenshot, +.system-themes-list-disabled .theme-selector .no-screenshot { + width: 194px; + height: 144px; + line-height: 144px; +} +.theme-selector h3 { + font-weight: normal; +} +.theme-default h3 { + font-weight: bold; +} +.system-themes-list-enabled .theme-selector h3 { margin-top: 0; } -.date-container .select-container, -.date-container .custom-container { +.system-themes-list-disabled .theme-selector { + width: 300px; float: left; /* LTR */ + padding: 20px 20px 20px 0; /* LTR */ +} +.system-themes-list-enabled .theme-info { + max-width: 940px; } -.date-container .custom-container { - margin-left: 15px; /* LTR */ - width: 50%; +.system-themes-list-disabled .theme-info { + min-height: 170px; } -html.js .custom-container label { - visibility: hidden; +.theme-selector .incompatible { + margin-top: 10px; + font-weight: bold; +} +.theme-selector .operations { + margin: 10px 0 0 0; + padding: 0; +} +.theme-selector .operations li { + float: left; /* LTR */ + margin: 0; + padding: 0 0.7em; + 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 { + padding: 0 0.7em 0 0; /* LTR */ +} +#system-themes-admin-form { + clear: left; +} + +/** + * Theme Settings + */ +.theme-settings-left { + float: left; + width: 49%; +} +.theme-settings-right { + float: right; + width: 49%; +} +.theme-settings-bottom { + clear: both; } Index: modules/system/system-behavior.css =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system-behavior.css,v retrieving revision 1.13 diff -u -p -F '^f' -r1.13 system-behavior.css --- modules/system/system-behavior.css 9 Aug 2010 16:58:15 -0000 1.13 +++ modules/system/system-behavior.css 23 Aug 2010 04:23:18 -0000 @@ -133,12 +133,7 @@ div.tree-child-horizontal { .tabledrag-toggle-weight-wrapper { text-align: right; /* LTR */ } -.tabledrag-toggle-weight { - font-size: 0.9em; -} -body div.tabledrag-changed-warning { - margin-bottom: 0.5em; -} + /** * Progress bar @@ -262,6 +257,30 @@ div.password-confirm { visibility: hidden; } + +/** + * To be used with displace.js + * ?? There is no such file. I think this is for the overlay module so why is + * this code here? Unless there is a reason, which should be documented, this + * should go in overlay-parent.css. + */ +.displace-top, +.displace-bottom { + position: relative; + width: 100%; +} +.displace-processed .displace-top, +.displace-processed .displace-bottom { + position: fixed; + width: auto; + left: 0; + right: 0; +} +.displace-unsupported .displace-top, +.displace-unsupported .displace-bottom { + position: absolute; +} + /** * Inline items (need to override above) */ @@ -274,6 +293,10 @@ div.password-confirm { display: block; } +/** + * Helper class to prevent text wrapping. Currently used in the locale and path + * modules. + */ .nowrap { white-space: nowrap; } Index: modules/system/system-menus-rtl.css =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system-menus-rtl.css,v retrieving revision 1.3 diff -u -p -F '^f' -r1.3 system-menus-rtl.css --- modules/system/system-menus-rtl.css 28 Apr 2010 20:08:39 -0000 1.3 +++ modules/system/system-menus-rtl.css 23 Aug 2010 04:23:18 -0000 @@ -14,3 +14,6 @@ li.collapsed, li.leaf { padding: 0.2em 0 0 0.5em; } +.block ul { + padding: 0 1em 0.25em 0; +} Index: modules/system/system-menus.css =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system-menus.css,v retrieving revision 1.4 diff -u -p -F '^f' -r1.4 system-menus.css --- modules/system/system-menus.css 18 May 2010 11:56:59 -0000 1.4 +++ modules/system/system-menus.css 23 Aug 2010 04:23:18 -0000 @@ -48,3 +48,4 @@ ul.links li { margin: 0; padding: 0 0 0.25em 1em; /* LTR */ } + Index: modules/system/system-rtl.css =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system-rtl.css,v retrieving revision 1.19 diff -u -p -F '^f' -r1.19 system-rtl.css --- modules/system/system-rtl.css 7 Jan 2010 07:41:46 -0000 1.19 +++ modules/system/system-rtl.css 23 Aug 2010 04:23:18 -0000 @@ -5,13 +5,15 @@ th { padding-right: 0; padding-left: 1em; } - thead th { text-align: right; padding-left: 1em; padding-right: 0.5em; } +/** + * Lists generated by theme_item_list() + */ .item-list .icon { float: left; padding-left: 0; @@ -22,9 +24,18 @@ thead th { margin: 0 1.5em 0.25em 0; } +/** + * More link + * @see theme_more_link() + */ .more-link { text-align: left; } + +/** + * More help + * @see theme_more_help_link() + */ .more-help-link { text-align: left; } @@ -33,10 +44,11 @@ thead th { background-position: 100% 50%; } -.block ul { - padding: 0 1em 0.25em 0; -} - +/** + * Tab navigation + * @see theme_menu_local_tasks() + * @see theme_menu_local_task() + */ ul.primary { padding: 0 1em 0 0; } @@ -50,25 +62,3 @@ ul.secondary li { border-right: none; border-left: 1px solid #ccc; } - -.system-themes-list-enabled .theme-selector .screenshot, -.system-themes-list-enabled .theme-selector .no-screenshot { - float: right; - margin: 0 0 0 20px; -} -.system-themes-list-disabled .theme-selector { - float: right; - padding: 20px 0 20px 20px; -} -.theme-selector .operations li { - float: right; - border-right: none; - border-left: 1px solid #cdcdcd; -} -.theme-selector .operations li.last { - padding: 0 0.7em 0 0; - border-left: none; -} -.theme-selector .operations li.first { - padding: 0 0 0 0.7em; -} Index: modules/system/system.css =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.css,v retrieving revision 1.78 diff -u -p -F '^f' -r1.78 system.css --- modules/system/system.css 2 Aug 2010 11:22:22 -0000 1.78 +++ modules/system/system.css 23 Aug 2010 04:23:18 -0000 @@ -1,8 +1,14 @@ /* $Id: system.css,v 1.78 2010/08/02 11:22:22 dries Exp $ */ -/* -** HTML elements -*/ +/** + * @file + * The contents of this file should be generic and applicable site-wide. Styles + * meant to support JavaScript functionality belong in system-behavior.css + */ + +/** + * HTML elements + */ fieldset { margin-bottom: 1em; padding: .5em; @@ -26,8 +32,13 @@ th { padding-right: 1em; /* LTR */ border-bottom: 3px solid #ccc; } -th.active img { - display: inline; +thead th { + border-bottom: 3px solid #ccc; + padding-right: 1em; /* LTR */ + text-align: left; /* LTR */ +} +tbody { + border-top: 1px solid #ccc; } tr.even, tr.odd { @@ -35,37 +46,70 @@ tr.odd { border-bottom: 1px solid #ccc; padding: 0.1em 0.6em; } + +/** + * Styles for the currently sorted table column. + * @see theme_tablesort_indicator() + * @see theme_table() + */ +th.active img { + display: inline; +} +td.active { + background-color: #ddd; +} + +/** + * Table Drag + * @see tabledrag.js + */ tr.drag { background-color: #fffff0; } tr.drag-previous { background-color: #ffd; } -td.active { - background-color: #ddd; +.tabledrag-toggle-weight { + font-size: 0.9em; +} +body div.tabledrag-changed-warning { + margin-bottom: 0.5em; +} + +/** + * Table Select + * Used with tableselect.js which allows all or multiple table rows to be + * selected at the same time for batch operations. + */ +tr.selected td { + background: #ffc; } td.checkbox, th.checkbox { text-align: center; } -tbody { - border-top: 1px solid #ccc; -} -tbody th { - border-bottom: 1px solid #ccc; -} -thead th { - text-align: left; /* LTR */ - padding-right: 1em; /* LTR */ - border-bottom: 3px solid #ccc; + +/** + * Table Headers + * Used with tableheader.js on certain tables to keep column headers at the top + * of the screen when scrolling down. + */ +table.sticky-header { + margin-top: 0; + background: #fff; } -/* -** Other common styles -*/ +/** + * Breadcrumbs + * @see theme_breadcrumb() + */ .breadcrumb { - padding-bottom: .5em + padding-bottom: .5em; } + +/** + * Lists generated by theme_item_list() + */ .item-list .icon { color: #555; float: right; /* LTR */ @@ -84,6 +128,10 @@ thead th { padding: 0; list-style: disc; } + +/** + * Forms + */ .form-item { margin-top: 1em; margin-bottom: 1em; @@ -94,21 +142,6 @@ tr.even .form-item { margin-bottom: 0; white-space: nowrap; } -tr.merge-down, -tr.merge-down td, -tr.merge-down th { - border-bottom-width: 0 !important; -} -tr.merge-up, -tr.merge-up td, -tr.merge-up th { - border-top-width: 0 !important; -} -.form-item input.error, -.form-item textarea.error, -.form-item select.error { - border: 2px solid red; -} .form-item .description { font-size: 0.85em; } @@ -141,34 +174,39 @@ input.form-radio { .form-required { color: #f00; } -.more-help-link { - text-align: right; /* LTR */ -} -.more-help-link a, -a.module-link { - padding: 1px 0 1px 20px; /* LTR */ -} -a.module-link { - display: block; - white-space: nowrap; -} -.more-help-link a, -a.module-link-help { - background: url(../../misc/help.png) 0 50% no-repeat; /* LTR */ -} -a.module-link-permissions { - background: url(../../misc/permissions.png) 0 50% no-repeat; /* LTR */ +.form-item input.error, +.form-item textarea.error, +.form-item select.error { + border: 2px solid red; } -a.module-link-configure { - background: url(../../misc/configure.png) 0 50% no-repeat; /* LTR */ + +/** + * More link + * @see theme_more_link() + */ +.more-link { + text-align: right; /* LTR */ } + +/** + * More help link + * @see theme_more_link() + */ .more-link { + text-align: left; +} +.more-help-link { text-align: right; /* LTR */ } -.module-help { - margin-left: 1em; /* LTR */ - float: right; /* LTR */ +.more-help-link a { + background: url(../../misc/help.png) 0 50% no-repeat; /* LTR */ + padding: 1px 0 1px 20px; /* LTR */ } + +/** + * Pagers + * @see theme_pager() + */ .item-list .pager { clear: both; text-align: center; @@ -182,20 +220,20 @@ a.module-link-configure { .pager-current { font-weight:bold; } -.tips { - margin-top: 0; - margin-bottom: 0; - padding-top: 0; - padding-bottom: 0; - font-size: 0.9em; -} + +/** + * Compact links + * @see theme_system_compact_link() + */ .compact-link { margin: 0 0 0.5em 0; } -/* -** Tab navigation -*/ +/** + * Tab navigation + * @see theme_menu_local_tasks() + * @see theme_menu_local_task() + */ ul.primary { border-collapse: collapse; padding: 0 0 0 1em; /* LTR */ @@ -247,158 +285,10 @@ ul.secondary a.active { border-bottom: 4px solid #999; } -/* -** To be used with tableselect.js -*/ -tr.selected td { - background: #ffc; -} - -/* -** To be used with displace.js -*/ -.displace-top, -.displace-bottom { - position: relative; - width: 100%; -} -.displace-processed .displace-top, -.displace-processed .displace-bottom { - position: fixed; - width: auto; - left: 0; - right: 0; -} -.displace-unsupported .displace-top, -.displace-unsupported .displace-bottom { - position: absolute; -} - -/* -** To be used with displace.js -*/ -.displace-top, -.displace-bottom { - position: relative; - width: 100%; -} -.displace-processed .displace-top, -.displace-processed .displace-bottom { - position: fixed; - width: auto; - left: 0; - right: 0; -} -.displace-unsupported .displace-top, -.displace-unsupported .displace-bottom { - position: absolute; -} - -/* -** Floating header for tableheader.js -*/ -table.sticky-header { - margin-top: 0; - background: #fff; -} - -/* -** Styles for the system modules page (admin/modules) -*/ -#system-modules div.incompatible { - font-weight: bold; -} - -/* -** Styles for the system themes page (admin/appearance) -*/ -.system-themes-list { - margin-bottom: 20px; -} -.system-themes-list-disabled { - border-top: 1px solid #cdcdcd; - padding-top: 20px; -} -.system-themes-list h2 { - margin: 0; -} -.theme-selector { - padding-top: 20px; -} -.theme-selector .screenshot, -.theme-selector .no-screenshot { - border: 1px solid #e0e0d8; - padding: 2px; - vertical-align: bottom; - width: 294px; - height: 219px; - line-height: 219px; - text-align: center; -} -.theme-default .screenshot { - border: 1px solid #aaa; -} -.system-themes-list-enabled .theme-selector .screenshot, -.system-themes-list-enabled .theme-selector .no-screenshot { - float: left; /* LTR */ - margin: 0 20px 0 0; /* LTR */ -} -.system-themes-list-disabled .theme-selector .screenshot, -.system-themes-list-disabled .theme-selector .no-screenshot { - width: 194px; - height: 144px; - line-height: 144px; -} -.theme-selector h3 { - font-weight: normal; -} -.theme-default h3 { - font-weight: bold; -} -.system-themes-list-enabled .theme-selector h3 { - margin-top: 0; -} -.system-themes-list-disabled .theme-selector { - width: 300px; - float: left; /* LTR */ - padding: 20px 20px 20px 0; /* LTR */ -} -.system-themes-list-enabled .theme-info { - max-width: 940px; -} -.system-themes-list-disabled .theme-info { - min-height: 170px; -} -.theme-selector .incompatible { - margin-top: 10px; - font-weight: bold; -} -.theme-selector .operations { - margin: 10px 0 0 0; - padding: 0; -} -.theme-selector .operations li { - float: left; /* LTR */ - margin: 0; - padding: 0 0.7em; - 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 { - padding: 0 0.7em 0 0; /* LTR */ -} -#system-themes-admin-form { - clear: left; -} - -/* -** Markup free clearing -** Details: http://perishablepress.com/press/2009/12/06/new-clearfix-hack -*/ +/** + * Markup free clearing + * Details: http://perishablepress.com/press/2009/12/06/new-clearfix-hack + */ .clearfix:after { content: "."; display: block;