Commit 937f9099 authored by Dries's avatar Dries

- Patch #77183 by m3vrck: cleaned up some of the CSS mess.

parent 5b455a2e
......@@ -10,19 +10,19 @@ ul.menu li {
}
li.expanded {
list-style-type: circle;
list-style-image: url(menu-expanded.png);
list-style-image: url(../../misc/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);
list-style-image: url(../../misc/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);
list-style-image: url(../../misc/menu-leaf.png);
padding: 0.2em 0.5em 0 0;
margin: 0;
}
......
/*
** 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;
}
/*
** Formatting for administration page
*/
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;
}
......@@ -124,3 +124,88 @@ dl.multiselect .form-item {
height: 1.75em;
margin: 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(../../misc/throbber.gif);
background-repeat: no-repeat;
background-position: 100% 2px;
}
html.js input.throbbing {
background-position: 100% -18px;
}
/*
** 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(../../misc/menu-expanded.png) 5px 50% no-repeat;
}
html.js fieldset.collapsed legend a {
background-image: url(../../misc/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(../../misc/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;
}
......@@ -244,6 +244,7 @@ function system_menu($may_cache) {
if (arg(0) == 'admin') {
global $custom_theme;
$custom_theme = variable_get('admin_theme', 'bluemarine');
drupal_add_css(drupal_get_path('module', 'system') .'/admin.css', 'core');
}
// Add the CSS for this module. We put this in !$may_cache so it is only
......
......@@ -756,6 +756,10 @@ function user_menu($may_cache) {
'weight' => 10);
}
else {
// Add the CSS for this module. We put this in !$may_cache so it is only
// added once per request.
drupal_add_css(drupal_get_path('module', 'user') .'/user.css', 'core');
if (arg(0) == 'user' && is_numeric(arg(1)) && arg(1) > 0) {
$account = user_load(array('uid' => arg(1)));
......
# robots.txt
#
# This file aims to prevent the crawling and idexing of certain parts
# of your site by web crawlers and spiders run by sites like Yahoo!
# and Google. By telling these "robots" where not to go on your site,
# of your site by web crawlers and spiders run by sites like Yahoo!
# and Google. By telling these "robots" where not to go on your site,
# you save bandwidth and server resources.
#
# For more information about the robots.txt standard, see:
......
......@@ -402,6 +402,7 @@ function update_progress_page() {
// Prevent browser from using cached drupal.js or update.js
drupal_add_js('misc/progress.js', TRUE);
drupal_add_js('misc/update.js', TRUE);
drupal_add_css(drupal_get_path('module', 'system') .'/admin.css', 'core');
drupal_set_title('Updating');
$output = '<div id="progress"></div>';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment