diff options
33 files changed, 616 insertions, 699 deletions
diff --git a/includes/common.inc b/includes/common.inc index cd63bcc55..c84d358a8 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -115,7 +115,6 @@ function drupal_set_html_head($data = NULL) { */ function drupal_get_html_head() { $output = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n"; - drupal_add_css('misc/drupal.css', 'core'); return $output . drupal_set_html_head(); } diff --git a/misc/drupal.css b/misc/drupal.css deleted file mode 100644 index 7b864ed5a..000000000 --- a/misc/drupal.css +++ /dev/null @@ -1,698 +0,0 @@ -/* $Id$ */ - -/* -** HTML elements -*/ -fieldset { - margin-bottom: 1em; - padding: .5em; -} -form { - margin: 0; - padding: 0; -} -hr { - height: 1px; - border: 1px solid gray; -} -img { - border: 0; -} -table { - border-collapse: collapse; -} -th { - text-align: left; - padding-right: 1em; - border-bottom: 3px solid #ccc; -} -th.active img { - display: inline; -} -tr.even, tr.odd { - background-color: #eee; - border-bottom: 1px solid #ccc; -} -tr.even, tr.odd { - padding: 0.1em 0.6em; -} -td.active { - background-color: #ddd; -} - -/* -** Menu styles -*/ -ul.menu { - list-style: none; - border: none; - text-align:left; -} -ul.menu li { - margin: 0 0 0 0.5em; -} -li.expanded { - list-style-type: circle; - list-style-image: url(menu-expanded.png); - padding: 0.2em 0.5em 0 0; - margin: 0; -} -li.collapsed { - list-style-type: disc; - list-style-image: url(menu-collapsed.png); - padding: 0.2em 0.5em 0 0; - margin: 0; -} -li.leaf { - list-style-type: square; - list-style-image: url(menu-leaf.png); - padding: 0.2em 0.5em 0 0; - margin: 0; -} -li a.active { - color: #000; -} -td.menu-disabled { - background: #ccc; -} - -/* -** Other common styles -*/ -.breadcrumb { - padding-bottom: .5em -} -.block-region { - background-color: #ff6; - margin-top: 4px; - margin-bottom: 4px; - padding: 3px; -} -.block ul { - margin: 0; - padding: 0 0 0.25em 1em; -} -br.clear { - clear: both; - height: 0; -} -.container-inline div { - display: inline; -} -.error { - color: red; -} -.item-list .icon { - color: #555; - float: right; - padding-left: 0.25em; - clear: right; -} -.item-list .icon a { - color: #000; - text-decoration: none; -} -.item-list .icon a:hover { - color: #000; - text-decoration: none; -} -.item-list .title { - font-weight: bold; -} -.item-list ul { - margin: 0 0 0.75em 0; - padding: 0; -} -.item-list ul li { - margin: 0 0 0.25em 1.5em; - padding: 0; - list-style: disc; -} -.form-item { - margin-top: 1em; - margin-bottom: 1em; -} -tr.odd .form-item, tr.even .form-item { - margin-top: 0; - margin-bottom: 0; - white-space: nowrap; -} -.form-item input.error, .form-item textarea.error { - border: 2px solid red; -} -.form-item .description { - font-size: 0.85em; -} -.form-item label { - display: block; - font-weight: bold; -} -.form-item label.option { - display: inline; - font-weight: normal; -} -.marker, .form-required { - color: #f00; -} -.more-link { - text-align: right; -} -.node-form .form-text { - display: block; - width: 95%; -} -.node-form .standard { - clear: both; -} -.node-form textarea { - display: block; - width: 95%; -} -.node-form .attachments fieldset { - float: none; - display: block; -} -.nowrap { - white-space: nowrap; -} -.ok { - color: #080; -} -#pager { - clear: both; - text-align: center; -} -#pager a, #pager strong.pager-current { - padding: 0.5em; -} -.path { - padding-bottom: 0.7em; - font-size: 1.1em; -} - -/* -** Module specific styles -*/ -#aggregator .feed-source .feed-title { - margin-top: 0; -} -#aggregator .feed-source .feed-image img { - margin-bottom: 0.75em; -} -#aggregator .feed-source .feed-icon { - float: right; - display: block; -} -#aggregator .feed-item { - margin-bottom: 1.5em; -} -#aggregator .feed-item-title { - margin-bottom: 0; - font-size: 1.3em; -} -#aggregator .feed-item-meta, #aggregator .feed-item-body { - margin-bottom: 0.5em; -} -#aggregator .feed-item-categories { - font-size: 0.9em; -} -#aggregator td { - vertical-align: bottom; -} -#aggregator td.categorize-item { - white-space: nowrap; -} -#aggregator .categorize-item .news-item .body { - margin-top: 0; -} -#aggregator .categorize-item h3 { - margin-bottom: 1em; - margin-top: 0; -} -.book-navigation .menu { - border-top: 1px solid #888; - padding: 1em 0 0 3em; -} -.book-navigation .page-links { - border-top: 1px solid #888; - border-bottom: 1px solid #888; - text-align: center; - padding: 0.5em; -} -.book-navigation .page-previous { - text-align: right; -} -.book-navigation .page-up { - margin: 0 4em; -} -.book-navigation .page-next { - text-align: left; -} -.node-unpublished, .comment-unpublished { - background-color: #fff4f4; -} -.preview .node, .preview .comment { - background-color: #ffffea; -} -.tips { - margin-top: 0; - margin-bottom: 0; - padding-top: 0; - padding-bottom: 0; - font-size: 0.9em; -} -#forum .description { - font-size: 0.9em; - margin: 0.5em; -} -#forum td.created, #forum td.posts, #forum td.topics, #forum td.last-reply, #forum td.replies, #forum td.pager { - white-space: nowrap; -} -#forum td.posts, #forum td.topics, #forum td.replies, #forum td.pager { - text-align: center; -} -.forum-topic-navigation { - padding: 1em 0 0 3em; - border-top: 1px solid #888; - border-bottom: 1px solid #888; - text-align: center; - padding: 0.5em; -} -.forum-topic-navigation .topic-previous { - margin-right: 4em; - text-align: right; -} -.forum-topic-navigation .topic-next { - text-align: left; -} -.locale-untranslated { - font-style: normal; - text-decoration: line-through; -} -#node-admin-filter ul { - list-style-type: none; - padding: 0; - margin: 0; - width: 100%; -} -#node-admin-buttons { - float: left; - margin-left: 0.5em; - clear: right; -} -td.revision-current { - background: #ffc; -} -dl.multiselect dd.b, dl.multiselect dd.b .form-item, dl.multiselect dd.b select { - font-family: inherit; - font-size: inherit; - width: 14em; -} -dl.multiselect dd.a, dl.multiselect dd.a .form-item { - width: 8em; -} -dl.multiselect dt, dl.multiselect dd { - float: left; - line-height: 1.75em; - padding: 0; - margin: 0 1em 0 0; -} -dl.multiselect .form-item { - height: 1.75em; - margin: 0; -} -#permissions td.module, #blocks td.region { - font-weight: bold; -} -#permissions td.permission, #blocks td.block, #taxonomy td.term, #taxonomy td.message { - padding-left: 1.5em; -} - -#access-rules .access-type, #access-rules .rule-type { - margin-right: 1em; - float: left; -} -#access-rules .access-type .form-item, #access-rules .rule-type .form-item { - margin-top: 0; -} -#access-rules .mask { - clear: both; -} -.poll .bar { - height: 1em; - margin: 1px 0; - background-color: #ddd; -} -.poll .bar .foreground { - background-color: #000; - height: 1em; - clear: left; - float: left; -} -.poll .links { - text-align: center; -} -.poll .percent { - text-align: right; -} -.poll .total { - text-align: center; -} -.poll .vote-form { - text-align: center; -} -.poll .vote-form .choices { - text-align: left; - margin: 0 auto; - display: table; -} -.profile { - clear: both; - margin: 1em 0; -} -.profile .picture { - float: right; - margin: 0 1em 1em 0; -} -.profile dt { - margin: 1em 0 0.2em 0; - font-weight: bold; -} -.profile dd { - margin:0; -} -.node-form .poll-form fieldset { - display: block; -} -img.screenshot { - border: 1px solid #808080; - display: block; - margin: 2px; -} -.search-form { - margin-bottom: 1em; -} -.search-form p { - margin-top: 0; - margin-bottom: 0.2em; - padding-top: 0; - padding-bottom: 0; -} -.search-form input { - margin-top: 0; - margin-bottom: 0; -} -.search-results p { - margin-top: 0; -} -.search-results dt { - font-size: 1.1em; -} -.search-results dd { - margin-bottom: 1em; -} -.search-results .search-info { - font-size: 0.85em; -} -.search-advanced .criterion { - float: left; - margin-right: 2em; -} -.search-advanced .action { - float: left; - clear: left; -} -#tracker td.replies { - text-align: center; -} -#tracker table { - width: 100%; -} -.theme-settings-left { - float: left; - width: 49%; -} -.theme-settings-right { - float: right; - width: 49%; -} -.theme-settings-bottom { - clear: both; -} -#user-login-form { - text-align: center; -} -.more-help-link { - font-size: 0.85em; - text-align: right; -} -table.watchdog-event th { - border-bottom: 1px solid #ccc; -} -tr.watchdog-user { - background: #ffd; -} -tr.watchdog-user .active { - background: #eed; -} -tr.watchdog-content { - background: #ddf; -} -tr.watchdog-content .active { - background: #cce; -} -tr.watchdog-page-not-found, tr.watchdog-access-denied { - background: #dfd; -} -tr.watchdog-page-not-found .active, tr.watchdog-access-denied .active { - background: #cec; -} -tr.watchdog-error { - background: #ffc9c9; -} -tr.watchdog-error .active { - background: #eeb9b9; -} - -/* Tab navigation */ -ul.primary { - border-collapse: collapse; - padding: 0 0 0 1em; - white-space: nowrap; - list-style: none; - margin: 5px; - height: auto; - line-height: normal; - border-bottom: 1px solid #bbb; -} -ul.primary li { - display: inline; -} -ul.primary li a { - background-color: #ddd; - border-color: #bbb; - border-width: 1px; - border-style: solid solid none solid; - height: auto; - margin-right: 0.5em; - padding: 0 1em; - text-decoration: none; -} -ul.primary li.active a { - background-color: #fff; - border: 1px solid #bbb; - border-bottom: #fff 1px solid; -} -ul.primary li a:hover { - background-color: #eee; - border-color: #ccc; - border-bottom-color: #eee; -} -ul.secondary { - border-bottom: 1px solid #bbb; - padding: 0.5em 1em; - margin: 5px; -} -ul.secondary li { - display: inline; - padding: 0 1em; - border-right: 1px solid #ccc; -} -ul.secondary a { - padding: 0; - text-decoration: none; -} -ul.secondary a.active { - border-bottom: 4px solid #999; -} - -/* -** Help module -*/ -.help-items { - float: left; - width: 22%; - padding-right: 3%; -} -.help-items-last { - padding-right: 0; -} - -/* -** Autocomplete styles -*/ -/* Suggestion list */ -#autocomplete { - position: absolute; - border: 1px solid; - overflow: hidden; -} -#autocomplete ul { - margin: 0; - padding: 0; - list-style: none; -} -#autocomplete li { - background: #fff; - color: #000; - white-space: pre; - cursor: default; -} -#autocomplete li.selected { - background: #0072b9; - color: #fff; -} -/* Animated throbber */ -html.js input.form-autocomplete { - background-image: url(throbber.gif); - background-repeat: no-repeat; - background-position: 100% 2px; -} -html.js input.throbbing { - background-position: 100% -18px; -} - -/* -** Progressbar styles -*/ -.progress { - font-weight: bold; -} -.progress .bar { - background: #fff url(progress.gif); - border: 1px solid #00375a; - height: 1.5em; - margin-top: 0.2em; -} -.progress .filled { - background: #0072b9; - height: 1em; - border-bottom: 0.5em solid #004a73; - width: 0%; -} -.progress .percentage { - float: right; -} - -/* -** Collapsing fieldsets -*/ -html.js fieldset.collapsed { - border-bottom-width: 0; - border-left-width: 0; - border-right-width: 0; - margin-bottom: 0; -} -html.js fieldset.collapsed * { - display: none; -} -html.js fieldset.collapsed table *, -html.js fieldset.collapsed legend, -html.js fieldset.collapsed legend * { - display: inline; -} -html.js fieldset.collapsible legend a { - padding-left: 15px; - background: url(menu-expanded.png) 5px 50% no-repeat; -} -html.js fieldset.collapsed legend a { - background-image: url(menu-collapsed.png); -} -/* Note: IE-only fix due to '* html' (breaks Konqueror otherwise). */ -* html.js fieldset.collapsible legend a { - display: block; -} - -/* -** Resizable text areas -*/ -.resizable-textarea { - width: 95%; -} -.resizable-textarea .grippie { - height: 14px; - background: #eee url(grippie.png) no-repeat 100% 100%; - border: 1px solid #ddd; - border-top-width: 0; - cursor: s-resize; -} - -/* -** Formatting for welcome page -*/ -#first-time strong { - display: block; - padding: 1.5em 0 .5em; -} - -/* -** Formatting for administration page -- this should probably be its own file -*/ -div.admin-panel { - margin: 0px 0px 0px 0px; - padding: 5px 5px 15px 5px; -} - -div.admin-panel .description { - margin: 0px 0px 3px; - padding: 2px 0 3px 0; - font-weight: normal; - text-align: left; - color: #999; -} - -div.admin-panel .body { - padding: 0 4px 2px 8px; - background-color: #f4f4f4; - line-height: 1.2em; -} - -div.admin-panel .head { - background-color: #6699CC; - color: #FFFFFF; - font-weight: bold; - font-size: 14px; - margin: 0px 0px 0px 0px; - padding: 4px 4px 4px 8px; -} - -div.admin { - padding-top: 15px; -} - -div.admin .left { - float: left; - width: 47%; - margin-left: 1em; -} -div.admin .right { - float: right; - width: 47%; - margin-right: 1em; -} - -div.admin .expert-link { - text-align: right; - margin-right: 1em; - padding-right: 4px; -} diff --git a/modules/aggregator/aggregator.css b/modules/aggregator/aggregator.css new file mode 100644 index 000000000..0efefdf7a --- /dev/null +++ b/modules/aggregator/aggregator.css @@ -0,0 +1,38 @@ +/* $Id$ */ + +#aggregator .feed-source .feed-title { + margin-top: 0; +} +#aggregator .feed-source .feed-image img { + margin-bottom: 0.75em; +} +#aggregator .feed-source .feed-icon { + float: right; + display: block; +} +#aggregator .feed-item { + margin-bottom: 1.5em; +} +#aggregator .feed-item-title { + margin-bottom: 0; + font-size: 1.3em; +} +#aggregator .feed-item-meta, #aggregator .feed-item-body { + margin-bottom: 0.5em; +} +#aggregator .feed-item-categories { + font-size: 0.9em; +} +#aggregator td { + vertical-align: bottom; +} +#aggregator td.categorize-item { + white-space: nowrap; +} +#aggregator .categorize-item .news-item .body { + margin-top: 0; +} +#aggregator .categorize-item h3 { + margin-bottom: 1em; + margin-top: 0; +} diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index 0b7d3cbd2..99d09940c 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -117,6 +117,10 @@ function aggregator_menu($may_cache) { } } else { + // Add the CSS for this module + // We put this in !$may_cache so it's only added once per request + drupal_add_css(drupal_get_path('module', 'aggregator') .'/aggregator.css'); + if (arg(0) == 'aggregator' && is_numeric(arg(2))) { if (arg(1) == 'sources') { $feed = aggregator_get_feed(arg(2)); diff --git a/modules/block/block.css b/modules/block/block.css new file mode 100644 index 000000000..1ff1b76ee --- /dev/null +++ b/modules/block/block.css @@ -0,0 +1,18 @@ +/* $Id$ */ + +#blocks td.region { + font-weight: bold; +} +#blocks td.block { + padding-left: 1.5em; +} +.block-region { + background-color: #ff6; + margin-top: 4px; + margin-bottom: 4px; + padding: 3px; +} +.block ul { + margin: 0; + padding: 0 0 0.25em 1em; +} diff --git a/modules/block/block.module b/modules/block/block.module index c22667b6e..39e54828f 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -99,6 +99,11 @@ function block_menu($may_cache) { } } } + else { + // Add the CSS for this module + // We put this in !$may_cache so it's only added once per request + drupal_add_css(drupal_get_path('module', 'block') .'/block.css'); + } return $items; } diff --git a/modules/book/book.css b/modules/book/book.css new file mode 100644 index 000000000..618eac774 --- /dev/null +++ b/modules/book/book.css @@ -0,0 +1,21 @@ +/* $Id$ */ + +.book-navigation .menu { + border-top: 1px solid #888; + padding: 1em 0 0 3em; +} +.book-navigation .page-links { + border-top: 1px solid #888; + border-bottom: 1px solid #888; + text-align: center; + padding: 0.5em; +} +.book-navigation .page-previous { + text-align: right; +} +.book-navigation .page-up { + margin: 0 4em; +} +.book-navigation .page-next { + text-align: left; +} diff --git a/modules/book/book.module b/modules/book/book.module index a6c59fdf5..51b906f4e 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -118,6 +118,10 @@ function book_menu($may_cache) { 'type' => MENU_CALLBACK); } else { + // Add the CSS for this module + // We put this in !$may_cache so it's only added once per request + drupal_add_css(drupal_get_path('module', 'book') .'/book.css'); + // To avoid SQL overhead, check whether we are on a node page and whether the // user is allowed to outline posts in books. if (arg(0) == 'node' && is_numeric(arg(1)) && user_access('outline posts in books')) { diff --git a/modules/forum/forum.css b/modules/forum/forum.css new file mode 100644 index 000000000..4bee6c4b2 --- /dev/null +++ b/modules/forum/forum.css @@ -0,0 +1,26 @@ +/* $Id$ */ + +#forum .description { + font-size: 0.9em; + margin: 0.5em; +} +#forum td.created, #forum td.posts, #forum td.topics, #forum td.last-reply, #forum td.replies, #forum td.pager { + white-space: nowrap; +} +#forum td.posts, #forum td.topics, #forum td.replies, #forum td.pager { + text-align: center; +} +.forum-topic-navigation { + padding: 1em 0 0 3em; + border-top: 1px solid #888; + border-bottom: 1px solid #888; + text-align: center; + padding: 0.5em; +} +.forum-topic-navigation .topic-previous { + margin-right: 4em; + text-align: right; +} +.forum-topic-navigation .topic-next { + text-align: left; +} diff --git a/modules/forum/forum.module b/modules/forum/forum.module index f2a4b4725..bf3801e13 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -97,6 +97,11 @@ function forum_menu($may_cache) { 'type' => MENU_CALLBACK); } } + else { + // Add the CSS for this module + // We put this in !$may_cache so it's only added once per request + drupal_add_css(drupal_get_path('module', 'forum') .'/forum.css'); + } return $items; } diff --git a/modules/help/help.css b/modules/help/help.css new file mode 100644 index 000000000..3536167f0 --- /dev/null +++ b/modules/help/help.css @@ -0,0 +1,10 @@ +/* $Id$ */ + +.help-items { + float: left; + width: 22%; + padding-right: 3%; +} +.help-items-last { + padding-right: 0; +} diff --git a/modules/help/help.module b/modules/help/help.module index e8ef6ce39..98dc1635f 100644 --- a/modules/help/help.module +++ b/modules/help/help.module @@ -28,6 +28,11 @@ function help_menu($may_cache) { 'access' => $admin_access); } } + else { + // Add the CSS for this module + // We put this in !$may_cache so it's only added once per request + drupal_add_css(drupal_get_path('module', 'help') .'/help.css'); + } return $items; } diff --git a/modules/locale/locale.css b/modules/locale/locale.css new file mode 100644 index 000000000..c9c8df509 --- /dev/null +++ b/modules/locale/locale.css @@ -0,0 +1,6 @@ +/* $Id$ */ + +.locale-untranslated { + font-style: normal; + text-decoration: line-through; +} diff --git a/modules/locale/locale.module b/modules/locale/locale.module index cf721d43d..42c69508d 100644 --- a/modules/locale/locale.module +++ b/modules/locale/locale.module @@ -111,6 +111,10 @@ function locale_menu($may_cache) { 'type' => MENU_CALLBACK); } else { + // Add the CSS for this module + // We put this in !$may_cache so it's only added once per request + drupal_add_css(drupal_get_path('module', 'locale') .'/locale.css'); + if (is_numeric(arg(4))) { // String related callbacks $items[] = array('path' => 'admin/settings/locale/string/edit/'. arg(4), diff --git a/modules/menu/menu.css b/modules/menu/menu.css new file mode 100644 index 000000000..51e54869d --- /dev/null +++ b/modules/menu/menu.css @@ -0,0 +1,88 @@ +/* $Id$ */ + +ul.menu { + list-style: none; + border: none; + text-align:left; +} +ul.menu li { + margin: 0 0 0 0.5em; +} +li.expanded { + list-style-type: circle; + list-style-image: url(menu-expanded.png); + padding: 0.2em 0.5em 0 0; + margin: 0; +} +li.collapsed { + list-style-type: disc; + list-style-image: url(menu-collapsed.png); + padding: 0.2em 0.5em 0 0; + margin: 0; +} +li.leaf { + list-style-type: square; + list-style-image: url(menu-leaf.png); + padding: 0.2em 0.5em 0 0; + margin: 0; +} +li a.active { + color: #000; +} +td.menu-disabled { + background: #ccc; +} + +/* +** Tab navigation +*/ +ul.primary { + border-collapse: collapse; + padding: 0 0 0 1em; + white-space: nowrap; + list-style: none; + margin: 5px; + height: auto; + line-height: normal; + border-bottom: 1px solid #bbb; +} +ul.primary li { + display: inline; +} +ul.primary li a { + background-color: #ddd; + border-color: #bbb; + border-width: 1px; + border-style: solid solid none solid; + height: auto; + margin-right: 0.5em; + padding: 0 1em; + text-decoration: none; +} +ul.primary li.active a { + background-color: #fff; + border: 1px solid #bbb; + border-bottom: #fff 1px solid; +} +ul.primary li a:hover { + background-color: #eee; + border-color: #ccc; + border-bottom-color: #eee; +} +ul.secondary { + border-bottom: 1px solid #bbb; + padding: 0.5em 1em; + margin: 5px; +} +ul.secondary li { + display: inline; + padding: 0 1em; + border-right: 1px solid #ccc; +} +ul.secondary a { + padding: 0; + text-decoration: none; +} +ul.secondary a.active { + border-bottom: 4px solid #999; +} diff --git a/modules/menu/menu.module b/modules/menu/menu.module index 3936ba821..d0167119d 100644 --- a/modules/menu/menu.module +++ b/modules/menu/menu.module @@ -112,6 +112,11 @@ function menu_menu($may_cache) { 'weight' => 5, ); } + else { + // Add the CSS for this module + // We put this in !$may_cache so it's only added once per request + drupal_add_css(drupal_get_path('module', 'menu') .'/menu.css'); + } return $items; } diff --git a/modules/node/node.css b/modules/node/node.css new file mode 100644 index 000000000..95eb73496 --- /dev/null +++ b/modules/node/node.css @@ -0,0 +1,37 @@ +/* $Id$ */ + +.node-unpublished, .comment-unpublished { + background-color: #fff4f4; +} +.preview .node, .preview .comment { + background-color: #ffffea; +} +#node-admin-filter ul { + list-style-type: none; + padding: 0; + margin: 0; + width: 100%; +} +#node-admin-buttons { + float: left; + margin-left: 0.5em; + clear: right; +} +td.revision-current { + background: #ffc; +} +.node-form .form-text { + display: block; + width: 95%; +} +.node-form .standard { + clear: both; +} +.node-form textarea { + display: block; + width: 95%; +} +.node-form .attachments fieldset { + float: none; + display: block; +} diff --git a/modules/node/node.module b/modules/node/node.module index 8cd0c694e..c05e8dc3e 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1074,6 +1074,10 @@ function node_menu($may_cache) { } } else { + // Add the CSS for this module + // We put this in !$may_cache so it's only added once per request + drupal_add_css(drupal_get_path('module', 'node') .'/node.css'); + if (arg(0) == 'node' && is_numeric(arg(1))) { $node = node_load(arg(1)); if ($node->nid) { diff --git a/modules/poll/poll.css b/modules/poll/poll.css new file mode 100644 index 000000000..3b5544580 --- /dev/null +++ b/modules/poll/poll.css @@ -0,0 +1,33 @@ +/* $Id$ */ + +.poll .bar { + height: 1em; + margin: 1px 0; + background-color: #ddd; +} +.poll .bar .foreground { + background-color: #000; + height: 1em; + clear: left; + float: left; +} +.poll .links { + text-align: center; +} +.poll .percent { + text-align: right; +} +.poll .total { + text-align: center; +} +.poll .vote-form { + text-align: center; +} +.poll .vote-form .choices { + text-align: left; + margin: 0 auto; + display: table; +} +.node-form .poll-form fieldset { + display: block; +} diff --git a/modules/poll/poll.module b/modules/poll/poll.module index 9499a6764..5b75f69d8 100644 --- a/modules/poll/poll.module +++ b/modules/poll/poll.module @@ -207,6 +207,10 @@ function poll_menu($may_cache) { 'type' => MENU_CALLBACK); } else { + // Add the CSS for this module + // We put this in !$may_cache so it's only added once per request + drupal_add_css(drupal_get_path('module', 'poll') .'/poll.css'); + if (arg(0) == 'node' && is_numeric(arg(1))) { $node = node_load(arg(1)); if ($node->type == 'poll') { diff --git a/modules/profile/profile.css b/modules/profile/profile.css new file mode 100644 index 000000000..fee1f370f --- /dev/null +++ b/modules/profile/profile.css @@ -0,0 +1,17 @@ +/* $Id$ */ + +.profile { + clear: both; + margin: 1em 0; +} +.profile .picture { + float: right; + margin: 0 1em 1em 0; +} +.profile dt { + margin: 1em 0 0.2em 0; + font-weight: bold; +} +.profile dd { + margin:0; +} diff --git a/modules/profile/profile.module b/modules/profile/profile.module index a10f2cf69..0f3044072 100644 --- a/modules/profile/profile.module +++ b/modules/profile/profile.module @@ -85,6 +85,11 @@ function profile_menu($may_cache) { 'access' => 1, 'type' => MENU_CALLBACK); } + else { + // Add the CSS for this module + // We put this in !$may_cache so it's only added once per request + drupal_add_css(drupal_get_path('module', 'profile') .'/profile.css'); + } return $items; } diff --git a/modules/search/search.css b/modules/search/search.css new file mode 100644 index 000000000..fb05bdd07 --- /dev/null +++ b/modules/search/search.css @@ -0,0 +1,35 @@ +/* $Id$ */ + +.search-form { + margin-bottom: 1em; +} +.search-form p { + margin-top: 0; + margin-bottom: 0.2em; + padding-top: 0; + padding-bottom: 0; +} +.search-form input { + margin-top: 0; + margin-bottom: 0; +} +.search-results p { + margin-top: 0; +} +.search-results dt { + font-size: 1.1em; +} +.search-results dd { + margin-bottom: 1em; +} +.search-results .search-info { + font-size: 0.85em; +} +.search-advanced .criterion { + float: left; + margin-right: 2em; +} +.search-advanced .action { + float: left; + clear: left; +} diff --git a/modules/search/search.module b/modules/search/search.module index eb2aff9d0..34f70c551 100644 --- a/modules/search/search.module +++ b/modules/search/search.module @@ -182,6 +182,11 @@ function search_menu($may_cache) { } } } + else { + // Add the CSS for this module + // We put this in !$may_cache so it's only added once per request + drupal_add_css(drupal_get_path('module', 'search') .'/search.css'); + } return $items; } diff --git a/modules/system/defaults.css b/modules/system/defaults.css new file mode 100644 index 000000000..58f17d7b7 --- /dev/null +++ b/modules/system/defaults.css @@ -0,0 +1,32 @@ +/* $Id$ */ + +/* +** HTML elements +*/ +fieldset { + margin-bottom: 1em; + padding: .5em; +} +form { + margin: 0; + padding: 0; +} +hr { + height: 1px; + border: 1px solid gray; +} +img { + border: 0; +} +table { + border-collapse: collapse; +} +th { + text-align: left; + padding-right: 1em; + border-bottom: 3px solid #ccc; +} +br.clear { + clear: both; + height: 0; +} diff --git a/modules/system/system.css b/modules/system/system.css new file mode 100644 index 000000000..3153290d1 --- /dev/null +++ b/modules/system/system.css @@ -0,0 +1,126 @@ +/* $Id$ */ + +/* +** HTML elements +*/ +th.active img { + display: inline; +} +tr.even, tr.odd { + background-color: #eee; + border-bottom: 1px solid #ccc; + padding: 0.1em 0.6em; +} +td.active { + background-color: #ddd; +} + +/* +** Other common styles +*/ +.breadcrumb { + padding-bottom: .5em +} +.container-inline div { + display: inline; +} +.error { + color: red; +} +.item-list .icon { + color: #555; + float: right; + padding-left: 0.25em; + clear: right; +} +.item-list .icon a { + color: #000; + text-decoration: none; +} +.item-list .icon a:hover { + color: #000; + text-decoration: none; +} +.item-list .title { + font-weight: bold; +} +.item-list ul { + margin: 0 0 0.75em 0; + padding: 0; +} +.item-list ul li { + margin: 0 0 0.25em 1.5em; + padding: 0; + list-style: disc; +} +.form-item { + margin-top: 1em; + margin-bottom: 1em; +} +tr.odd .form-item, tr.even .form-item { + margin-top: 0; + margin-bottom: 0; + white-space: nowrap; +} +.form-item input.error, .form-item textarea.error { + border: 2px solid red; +} +.form-item .description { + font-size: 0.85em; +} +.form-item label { + display: block; + font-weight: bold; +} +.form-item label.option { + display: inline; + font-weight: normal; +} +.marker, .form-required { + color: #f00; +} +.more-link { + text-align: right; +} +.more-help-link { + font-size: 0.85em; + text-align: right; +} +.nowrap { + white-space: nowrap; +} +.ok { + color: #080; +} +#pager { + clear: both; + text-align: center; +} +#pager a, #pager strong.pager-current { + padding: 0.5em; +} +.tips { + margin-top: 0; + margin-bottom: 0; + padding-top: 0; + padding-bottom: 0; + font-size: 0.9em; +} +dl.multiselect dd.b, dl.multiselect dd.b .form-item, dl.multiselect dd.b select { + font-family: inherit; + font-size: inherit; + width: 14em; +} +dl.multiselect dd.a, dl.multiselect dd.a .form-item { + width: 8em; +} +dl.multiselect dt, dl.multiselect dd { + float: left; + line-height: 1.75em; + padding: 0; + margin: 0 1em 0 0; +} +dl.multiselect .form-item { + height: 1.75em; + margin: 0; +} diff --git a/modules/system/system.module b/modules/system/system.module index 30f4c9108..11ebead49 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -246,6 +246,12 @@ function system_menu($may_cache) { $custom_theme = variable_get('admin_theme', 'bluemarine'); } } + else { + // Add the CSS for this module + // We put this in !$may_cache so it's only added once per request + drupal_add_css(drupal_get_path('module', 'system') .'/defaults.css', 'core'); + drupal_add_css(drupal_get_path('module', 'system') .'/system.css', 'core'); + } return $items; } diff --git a/modules/taxonomy/taxonomy.css b/modules/taxonomy/taxonomy.css new file mode 100644 index 000000000..365adc97f --- /dev/null +++ b/modules/taxonomy/taxonomy.css @@ -0,0 +1,5 @@ +/* $Id$ */ + +#taxonomy td.term, #taxonomy td.message { + padding-left: 1.5em; +} diff --git a/modules/tracker/tracker.css b/modules/tracker/tracker.css new file mode 100644 index 000000000..3a2d30f47 --- /dev/null +++ b/modules/tracker/tracker.css @@ -0,0 +1,8 @@ +/* $Id$ */ + +#tracker td.replies { + text-align: center; +} +#tracker table { + width: 100%; +} diff --git a/modules/tracker/tracker.module b/modules/tracker/tracker.module index cdaf2df73..c590582a8 100644 --- a/modules/tracker/tracker.module +++ b/modules/tracker/tracker.module @@ -48,6 +48,10 @@ function tracker_menu($may_cache) { } } else { + // Add the CSS for this module + // We put this in !$may_cache so it's only added once per request + drupal_add_css(drupal_get_path('module', 'tracker') .'/tracker.css'); + if (arg(0) == 'user' && is_numeric(arg(1))) { $items[] = array('path' => 'user/'. arg(1) .'/track', 'title' => t('track'), 'callback' => 'tracker_track_user', 'access' => user_access('access content'), diff --git a/modules/user/user.css b/modules/user/user.css new file mode 100644 index 000000000..fa56a64ac --- /dev/null +++ b/modules/user/user.css @@ -0,0 +1,21 @@ +/* $Id$ */ + +#permissions td.module { + font-weight: bold; +} +#permissions td.permission { + padding-left: 1.5em; +} +#access-rules .access-type, #access-rules .rule-type { + margin-right: 1em; + float: left; +} +#access-rules .access-type .form-item, #access-rules .rule-type .form-item { + margin-top: 0; +} +#access-rules .mask { + clear: both; +} +#user-login-form { + text-align: center; +} diff --git a/modules/watchdog/watchdog.css b/modules/watchdog/watchdog.css new file mode 100644 index 000000000..708a25567 --- /dev/null +++ b/modules/watchdog/watchdog.css @@ -0,0 +1,29 @@ +/* $Id$ */ + +table.watchdog-event th { + border-bottom: 1px solid #ccc; +} +tr.watchdog-user { + background: #ffd; +} +tr.watchdog-user .active { + background: #eed; +} +tr.watchdog-content { + background: #ddf; +} +tr.watchdog-content .active { + background: #cce; +} +tr.watchdog-page-not-found, tr.watchdog-access-denied { + background: #dfd; +} +tr.watchdog-page-not-found .active, tr.watchdog-access-denied .active { + background: #cec; +} +tr.watchdog-error { + background: #ffc9c9; +} +tr.watchdog-error .active { + background: #eeb9b9; +} diff --git a/modules/watchdog/watchdog.module b/modules/watchdog/watchdog.module index 05e738371..07a4c9cba 100644 --- a/modules/watchdog/watchdog.module +++ b/modules/watchdog/watchdog.module @@ -55,6 +55,12 @@ function watchdog_menu($may_cache) { 'callback' => 'watchdog_event', 'type' => MENU_CALLBACK); } + else { + // Add the CSS for this module + // We put this in !$may_cache so it's only added once per request + drupal_add_css(drupal_get_path('module', 'watchdog') .'/watchdog.css'); + } + return $items; } |