? .svn
? css/.svn
? images/.svn
? translations/.svn
Index: template.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/seven/template.php,v
retrieving revision 1.4
diff -u -p -r1.4 template.php
--- template.php	20 Nov 2009 21:36:14 -0000	1.4
+++ template.php	8 Dec 2009 20:45:48 -0000
@@ -14,6 +14,20 @@ function seven_process_html(&$vars) {
 function seven_preprocess_page(&$vars) {
   $vars['primary_local_tasks'] = menu_primary_local_tasks();
   $vars['secondary_local_tasks'] = menu_secondary_local_tasks();
+  
+  // get all the current css information into an array
+  $css = drupal_add_css();
+
+  // Removing the css files of some contributed modules that are included in the D7 core css
+  $rm[] = drupal_get_path('module','vertical_tabs').'/vertical_tabs.css';
+
+  // now we can remove the contribs from the array
+  foreach ($rm as $key => $value) {
+    unset($css['all']['module'][$value]);
+  }
+
+  // now place the remaining css files back into the template variable for rendering
+  $vars['styles'] = drupal_get_css($css);
 }
 
 /**
Index: css/default.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/seven/css/default.css,v
retrieving revision 1.1
diff -u -p -r1.1 default.css
--- css/default.css	22 Oct 2009 21:25:51 -0000	1.1
+++ css/default.css	8 Dec 2009 20:45:48 -0000
@@ -1,4 +1,4 @@
-/* $Id: default.css,v 1.1 2009/10/22 21:25:51 mcrittenden Exp $ */
+/* $Id: reset.css,v 1.4 2009/11/17 02:50:41 webchick Exp $ */
 
 /**
  * Reset CSS styles.
@@ -124,13 +124,10 @@ tr.even .form-item,
 .item-list .pager li,
 .pager-current,
 .tips,
-dl.multiselect dd.b,
-dl.multiselect dd.b .form-item,
-dl.multiselect dd.b select,
-dl.multiselect dd.a,
-dl.multiselect dd.a .form-item,
-dl.multiselect dt,
 dl.multiselect dd,
+dl.multiselect dd .form-item,
+dl.multiselect dd select,
+dl.multiselect dt,
 dl.multiselect .form-item,
 ul.primary,
 ul.primary li,
@@ -257,4 +254,3 @@ div.admin-panel .body,
   display: block;
 }
 /* End hide from IE-mac */
-
Index: css/pretty.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/seven/css/pretty.css,v
retrieving revision 1.4
diff -u -p -r1.4 pretty.css
--- css/pretty.css	4 Dec 2009 13:41:37 -0000	1.4
+++ css/pretty.css	8 Dec 2009 20:45:48 -0000
@@ -1,9 +1,711 @@
 /* $Id: pretty.css,v 1.4 2009/12/04 13:41:37 mcrittenden Exp $ */
 
+/* $Id: system.css,v 1.68 2009/12/01 00:39:34 dries Exp $ */
+
+/**
+ * Styles adapted from system.css.
+ */
+ 
+/*
+** HTML elements
+*/
+body.drag {
+  cursor: move;
+}
+th.active img {
+  display: inline;
+}
+tr.even, tr.odd {
+  background-color: #eee;
+  border-bottom: 1px solid #ccc;
+  padding: 0.1em 0.6em;
+}
+tr.drag {
+  background-color: #fffff0;
+}
+tr.drag-previous {
+  background-color: #ffd;
+}
+td.active {
+  background-color: #ddd;
+}
+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;
+}
+
+/*
+** Other common styles
+*/
+.breadcrumb {
+  padding-bottom: .5em
+}
+div.indentation {
+  width: 20px;
+  height: 1.7em;
+  margin: -0.4em 0.2em -0.4em -0.4em; /* LTR */
+  padding: 0.42em 0 0.42em 0.6em; /* LTR */
+  float: left; /* LTR */
+}
+div.tree-child {
+  background: url(../../misc/tree.png) no-repeat 11px center; /* LTR */
+}
+div.tree-child-last {
+  background: url(../../misc/tree-bottom.png) no-repeat 11px center; /* LTR */
+}
+div.tree-child-horizontal {
+  background: url(../../misc/tree.png) no-repeat -11px center;
+}
+.error {
+  color: #e55;
+}
+div.error {
+  border: 1px solid #d77;
+}
+div.error, tr.error {
+  background: #fcc;
+  color: #200;
+  padding: 2px;
+}
+.warning {
+  color: #e09010;
+}
+div.warning {
+  border: 1px solid #f0c020;
+}
+div.warning, table tr.warning {
+  background: #ffd;
+  color: #220;
+  padding: 2px;
+}
+.ok {
+  color: #008000;
+}
+div.ok {
+  border: 1px solid #00aa00;
+}
+div.ok, tr.ok {
+  background: #dfd;
+  color: #020;
+  padding: 2px;
+}
+.item-list .icon {
+  color: #555;
+  float: right; /* LTR */
+  padding-left: 0.25em; /* LTR */
+  clear: right; /* LTR */
+}
+.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; /* LTR */
+  padding: 0;
+  list-style: disc;
+}
+ol.task-list li.active {
+  font-weight: bold;
+}
+.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;
+}
+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;
+}
+.form-item label {
+  display: block;
+  font-weight: bold;
+}
+.form-item label.option {
+  display: inline;
+  font-weight: normal;
+}
+.form-checkboxes, .form-radios {
+  margin: 1em 0;
+}
+.form-checkboxes .form-item, .form-radios .form-item {
+  margin-top: 0.4em;
+  margin-bottom: 0.4em;
+}
+.form-type-radio .description, .form-type-checkbox .description {
+  margin-left: 2.4em;
+}
+.marker, .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 */
+}
+a.module-link-configure {
+  background: url(../../misc/configure.png) 0 50% no-repeat; /* LTR */
+}
+.more-link {
+  text-align: right; /* LTR */
+}
+.module-help {
+  margin-left: 1em; /* LTR */
+  float: right; /* LTR */
+}
+.nowrap {
+  white-space: nowrap;
+}
+.item-list .pager {
+  clear: both;
+  text-align: center;
+}
+.item-list .pager li {
+  background-image:none;
+  display:inline;
+  list-style-type:none;
+  padding: 0.5em;
+}
+.pager-current {
+  font-weight:bold;
+}
+.tips {
+  margin-top: 0;
+  margin-bottom: 0;
+  padding-top: 0;
+  padding-bottom: 0;
+  font-size: 0.9em;
+}
+dl.multiselect dd, dl.multiselect dd .form-item, dl.multiselect dd select {
+  font-family: inherit;
+  font-size: inherit;
+  width: 14em;
+}
+dl.multiselect dt, dl.multiselect dd {
+  float: left; /* LTR */
+  line-height: 1.75em;
+  padding: 0;
+  margin: 0 1em 0 0; /* LTR */
+}
+dl.multiselect .form-item {
+  height: 1.75em;
+  margin: 0;
+}
+
+/*
+** Inline items (need to override above)
+*/
+.container-inline div, .container-inline label {
+  display: inline;
+}
+
+/*
+** Tab navigation
+*/
+ul.primary {
+  border-collapse: collapse;
+  padding: 0 0 0 1em; /* LTR */
+  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; /* LTR */
+  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; /* LTR */
+}
+ul.secondary a {
+  padding: 0;
+  text-decoration: none;
+}
+ul.secondary a.active {
+  border-bottom: 4px solid #999;
+}
+
+/*
+** Autocomplete styles
+*/
+/* Suggestion list */
+#autocomplete {
+  position: absolute;
+  border: 1px solid;
+  overflow: hidden;
+  z-index: 100;
+}
+#autocomplete ul {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  list-style-image: 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; /* LTR */
+}
+html.js input.throbbing {
+  background-position: 100% -18px; /* LTR */
+}
+
+/*
+** Collapsing fieldsets
+*/
+html.js fieldset.collapsed {
+  border-bottom-width: 0;
+  border-left-width: 0;
+  border-right-width: 0;
+  margin-bottom: 0;
+  height: 1em;
+}
+html.js fieldset.collapsed * {
+  display: none;
+}
+html.js fieldset.collapsed legend, html.js fieldset.collapsed legend a span.element-invisible {
+  display: block;
+  overflow: hidden;
+}
+html.js fieldset.collapsible legend a {
+  display: inline;
+  padding-left: 15px; /* LTR */
+  background: url(../../misc/menu-expanded.png) 5px 75% no-repeat; /* LTR */
+}
+html.js fieldset.collapsible legend span.summary {
+  display: inline;
+  font-size: 0.9em;
+  color: #999;
+  margin-left: 0.5em;
+}
+html.js fieldset.collapsed legend a {
+  background-image: url(../../misc/menu-collapsed.png); /* LTR */
+  background-position: 5px 50%; /* LTR */
+}
+/* Note: IE-only fix due to '* html' (breaks Konqueror otherwise). */
+* html.js fieldset.collapsed legend,
+* html.js fieldset.collapsed legend *,
+* html.js fieldset.collapsed table * {
+  display: inline;
+}
+/* For Safari 2 to prevent collapsible fieldsets containing tables from dissapearing due to tableheader.js. */
+html.js fieldset.collapsible {
+  position: relative;
+}
+/* Avoid jumping around due to margins collapsing into collapsible fieldset border */
+html.js fieldset.collapsible .fieldset-wrapper {
+  overflow: auto;
+}
+
+/*
+** Resizable text areas
+*/
+.resizable-textarea {
+  width: 95%;
+}
+.resizable-textarea .grippie {
+  height: 9px;
+  overflow: hidden;
+  background: #eee url(../../misc/grippie.png) no-repeat center 2px;
+  border: 1px solid #ddd;
+  border-top-width: 0;
+  cursor: s-resize;
+}
+html.js .resizable-textarea textarea {
+  margin-bottom: 0;
+  width: 100%;
+  display: block;
+}
+
+/*
+** Table drag and drop.
+*/
+.draggable a.tabledrag-handle {
+  cursor: move;
+  float: left; /* LTR */
+  height: 1.7em;
+  margin: -0.4em 0 -0.4em -0.5em; /* LTR */
+  padding: 0.42em 1.5em 0.42em 0.5em; /* LTR */
+  text-decoration: none;
+}
+a.tabledrag-handle:hover {
+  text-decoration: none;
+}
+a.tabledrag-handle .handle {
+  margin-top: 4px;
+  height: 13px;
+  width: 13px;
+  background: url(../../misc/draggable.png) no-repeat 0 0;
+}
+a.tabledrag-handle-hover .handle {
+  background-position: 0 -20px;
+}
+
+/*
+** Teaser splitter
+*/
+.joined + .grippie {
+  height: 5px;
+  background-position: center 1px;
+  margin-bottom: -2px;
+}
+/* Keeps inner content contained in Opera 9. */
+.teaser-checkbox {
+  padding-top: 1px;
+}
+.teaser-checkbox div.form-item {
+  float: right; /* LTR */
+  margin: 0 5% 0 0; /* LTR */
+  padding: 0;
+}
+textarea.teaser {
+  display: none;
+}
+html.js .no-js {
+  display: none;
+}
+
+/*
+** Progressbar styles
+*/
+.progress {
+  font-weight: bold;
+}
+.progress .bar {
+  background: #fff url(../../misc/progress.gif);
+  border: 1px solid #00375a;
+  height: 1.5em;
+  margin: 0 0.2em;
+}
+.progress .filled {
+  background: #0072b9;
+  height: 1.1em;
+  border-bottom: 0.5em solid #004a73;
+  width: 0%;
+}
+.progress .percentage {
+  float: right; /* LTR */
+}
+.progress-disabled {
+  float: left; /* LTR */
+}
+.ajax-progress {
+  float: left; /* LTR */
+}
+.ajax-progress .throbber {
+  width: 15px;
+  height: 15px;
+  margin: 2px;
+  background: transparent url(../../misc/throbber.gif) no-repeat 0px -18px;
+  float: left; /* LTR */
+}
+tr .ajax-progress .throbber {
+  margin: 0 2px;
+}
+.ajax-progress-bar {
+  width: 16em;
+}
+
+/*
+** Formatting for welcome page
+*/
+#first-time strong {
+  display: block;
+  padding: 1.5em 0 .5em;
+}
+
+/*
+** To be used with tableselect.js
+*/
+tr.selected td {
+  background: #ffc;
+}
+
+/*
+** Floating header for tableheader.js
+*/
+table.sticky-header {
+  margin-top: 0;
+  background: #fff;
+}
+
+/*
+** Installation clean URLs
+*/
+#clean-url.install {
+  display: none;
+}
+
+/*
+** For anything you want to hide on page load when JS is enabled, so
+** that you can use the JS to control visibility and avoid flicker.
+*/
+html.js .js-hide {
+  display: none;
+}
+
+/*
+** Styles for the system modules page (admin/config/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;
+}
+
+/*
+** Password strength indicator
+*/
+#password-strength {
+  width: 17em;
+  float: right;  /* LTR */
+  margin-top: 1.4em;
+}
+.password-strength-title {
+  display: inline;
+}
+#password-strength-text {
+  float: right; /* LTR */
+  font-weight: bold;
+}
+#password-indicator {
+  background-color: #C4C4C4;
+  height: 0.3em;
+  width: 100%;
+}
+#password-indicator div {
+  height: 100%;
+  width: 0%;
+  background-color: #47C965;
+}
+input.password-confirm, input.password-field {
+  width: 16em;
+  margin-bottom: 0.4em;
+}
+div.password-confirm {
+  display: inline;
+  padding-left: 1em;
+}
+div.password-suggestions {
+  padding: 0.2em 0.5em;
+  margin: 0.7em 0;
+  width: 38.5em;
+  border: 1px solid #B4B4B4;
+}
+div.password-suggestions ul {
+  margin-bottom: 0;
+}
+.password-parent {
+  margin: 0;
+  width: 34.3em;
+}
+
+/*
+** Password confirmation checker
+*/
+.confirm-parent {
+  margin: 0;
+}
+div.password-confirm {
+  visibility: hidden;
+}
+
+/**
+ * Hide elements from all users.
+ *
+ * Used for elements which should not be immediately displayed to any user. An
+ * example would be a collapsible fieldset that will be expanded with a click
+ * from a user. The effect of this class can be toggled with the jQuery show()
+ * and hide() functions.
+ */
+.element-hidden {
+  display: none;
+}
+
+/**
+ * Hide elements visually, but keep them available for screen-readers.
+ *
+ * Used for information required for screen-reader users to understand and use
+ * the site where visual display is undesirable. Information provided in this
+ * manner should be kept concise, to avoid unnecessary burden on the user. Must
+ * not be used for focusable elements (such as links and form elements) as this
+ * causes issues for keyboard only or voice recognition users.
+ */
+.element-invisible {
+  height: 0;
+  overflow: hidden;
+  position: absolute;
+}
+
+/* $Id: pretty.css,v 1.4 2009/12/04 13:41:37 mcrittenden Exp $ */
+
+/**
+ * Override of style.css.
+ */
+ 
 /**
  * Generic elements
  */
-body {
+body,
+#page {
   color: #000;
   background: #fff;
   font-style: normal;
@@ -29,45 +731,74 @@ legend {
   font-weight: bold;
 }
 
-#blocks tr {
-  border: 1px solid #ddd;
-}
-
-#blocks tr.region {
-  background: #e6e6e6;
-}
-
-.block-region {
-  background: #e6e6e6;
-  border: 2px dashed #333;
-  padding: 7px;
-  font-size: 14px;
-  font-weight: bold;
-  color: #333;
-}
-
-#block-system-main h1,
-#block-system-main h2,
-#block-system-main h3,
-#block-system-main h4,
-#block-system-main h5,
-#block-system-main h6 {
+#page h1,
+#page h2,
+#page h3,
+#page h4,
+#page h5,
+#page h6 {
   font-size: 15px;
   font-weight: bold;
   margin:  10px 0;
 }
 
-#block-system-main dl {
+#page dl {
   margin: 0 0 20px;
 }
 
-#block-system-main dl dd,
-#block-system-main dl dl {
+#page dl dd,
+#page dl dl {
   margin-left: 20px;
   margin-bottom: 10px;
 }
 
 /**
+ * Skip link.
+ */
+#skip-link {
+  margin-top: 0;
+  position: absolute;
+  left: 50%;
+  margin-left: -5.25em;
+  width: auto;
+  z-index: 50;
+}
+
+#skip-link a,
+#skip-link a:link,
+#skip-link a:visited {
+  position: absolute;
+  display: block;
+  top: auto;
+  left: -10000px;
+  width: 1px;
+  height: 1px;
+  -moz-border-radius-bottomleft: 10px;
+  -moz-border-radius-bottomright: 10px;
+  -moz-border-radius-topleft: 0;
+  -moz-border-radius-topright: 0;
+  -webkit-border-top-left-radius: 0;
+  -webkit-border-top-right-radius: 0;
+  -webkit-border-bottom-left-radius: 10px;
+  -webkit-border-bottom-right-radius: 10px;
+  border-radius:0 0 10px 10px;
+  background: #444;
+  color: #fff;
+  font-size: 0.94em;
+  text-decoration: none;
+}
+
+#skip-link a:hover,
+#skip-link a:active,
+#skip-link a:focus {
+  position: static;
+  width: auto;
+  height: auto;
+  overflow: visible;
+  padding: 1px 10px 2px 10px;
+}
+
+/**
  * Branding.
  */
 #branding {
@@ -150,6 +881,10 @@ div.error {
   border-color: #d52;
 }
 
+div.error p.error {
+  color: #333;
+}
+
 div.status {
   color: #360;
   background: #cf8;
@@ -198,7 +933,7 @@ ul.primary li {
 }
 
 ul.primary li a,
-ul.primary li.active a,
+ul.primary li a.active,
 ul.primary li a:active,
 ul.primary li a:visited,
 ul.primary li a:hover {
@@ -276,29 +1011,25 @@ ul.secondary li.active a.active {
   position: relative;
 }
 
-#block-system-main {
+#page {
   padding: 20px 0;
   background: #fff;
   color: #333;
 }
 
-#block-system-main ul.menu li,
-#block-system-main ul.menu li a,
+#pageul.menu li,
+#page ul.menu li a,
 #secondary-links ul.links li,
 #secondary-links ul.links li a {
   float: left;
 }
 
-#block-system-main ul.menu li,
+#page ul.menu li,
 #secondary-links ul.links li {
   padding: 0 10px 10px 0;
 }
 
-.admin-list li {
-  list-style: none;
-}
-
-#block-system-main ul.menu li a,
+#page ul.menu li a,
 #secondary-links ul.links li a {
   font-size: 9px;
   line-height: 10px;
@@ -317,12 +1048,12 @@ ul.secondary li.active a.active {
   background: #999;
 }
 
-#block-system-main ul.menu li a {
+#page ul.menu li a {
   background: #f8f8f8;
   color: #05a;
 }
 
-#block-system-main ul.menu li a:hover {
+#page ul.menu li a:hover {
   background: #eee;
 }
 
@@ -331,38 +1062,50 @@ ul.secondary li.active a.active {
   background: #333;
 }
 
-#block-system-main ul.node-type-list li,
-#block-system-main ul.admin-list li {
+#page ul.node-type-list li,
+#page ul.admin-list li {
   position: relative;
   padding-left: 30px;
   padding-top: 9px;
   border-top: 1px solid #ccc;
   margin-left: 0;
   margin-bottom: 10px;
-  background: url(../images/list-item.png) no-repeat 0 11px;
+  background: url(images/list-item.png) no-repeat 0 11px;
   list-style-type: none;
   list-style-image: none;
 }
 
-#block-system-main ul.admin-list.compact {
+#page ul.admin-list.compact {
   margin-bottom: 8px;
 }
 
-#block-system-main ul.admin-list.compact li {
+#page ul.admin-list.compact li {
   border: 0;
   background: none;
   margin-bottom: 2px;
   padding-top: 2px;
 }
 
-#block-system-main ul.admin-list li:last-child {
+#page ul.admin-list li:last-child {
   border-bottom: none;
 }
 
-#block-system-main ul.node-type-list .label {
+#page ul.node-type-list .label {
   font-size: 15px;
 }
 
+#page ul.node-type-list li a, #page ul.admin-list li a {
+  margin-left: -30px;
+  padding: 0px 0 4px 30px;
+  min-height: 0;
+}
+
+#page ul.node-type-list li div.description a, #page ul.admin-list li div.description a {
+  margin-left: 0px;
+  padding: 0px;
+  min-height: inherit;
+}
+
 /**
  * Tables.
  */
@@ -417,7 +1160,7 @@ table th {
   text-transform: uppercase;
   background: #e1e2dc;
   font-weight: normal;
-  border-width: 0 1px 1px 1px;
+  border-width: 1px;
   border-style: solid;
   border-color: #bebfb9;
   padding: 3px 3px 3px 10px;
@@ -429,11 +1172,13 @@ table th.active {
 
 table th a {
   display: block;
+  position: relative;
 }
 
 table th.active img {
-  float: right;
-  margin-top: 3px;
+  position: absolute;
+  top: 3px;
+  right: 3px;
 }
 
 table td.active {
@@ -499,7 +1244,7 @@ html.js fieldset.collapsible .fieldset-w
 }
 
 div.form-item {
-  padding: 9px;
+  padding: 9px 0;
   margin: 0 0 10px;
 }
 
@@ -540,7 +1285,7 @@ div.form-item label.option input {
 .filter-wrapper {
   border-top: 0;
   width: 95%;
-  padding: 10px 2px 10px 2px;
+  padding: 10px 2px;
 }
 
 .filter-wrapper > div {
@@ -580,7 +1325,7 @@ input.form-submit, a.button {
   border-bottom: 1px solid #b4b4b4;
   border-left-color: #D2D2D2;
   border-right-color: #D2D2D2;
-  background: url(../images/buttons.png) 0 0 repeat-x;
+  background: url(images/buttons.png) 0 0 repeat-x;
   -moz-border-radius: 20px;
   -webkit-border-radius: 15px;
   font-size: 1.1em;
@@ -597,7 +1342,7 @@ div.node-form input#edit-submit-1 {
   border-left-color: #8eB7cd;
   border-right-color: #8eB7cd;
   border-bottom-color: #7691a2;
-  background: url(../images/buttons.png) 0px -40px repeat-x;
+  background: url(images/buttons.png) 0px -40px repeat-x;
   color: #133B54;
 }
 
@@ -633,6 +1378,11 @@ select.form-select:focus {
   border-color: #ace;
 }
 
+.resizable-textarea .grippie {
+  width: 100%; 
+  padding: 0 2px;
+}
+
 html.js input.form-autocomplete {
   background-position: 100% 4px;
 }
@@ -647,7 +1397,7 @@ ul.action-links {
   overflow: hidden;
 }
 
-#block-system-main ul.action-links {
+#page ul.action-links {
   padding: 0;
 }
 
@@ -658,13 +1408,13 @@ ul.action-links li {
 
 ul.action-links a {
   padding-left: 15px;
-  background: transparent url(../images/add.png) no-repeat 0 center;
+  background: transparent url(images/add.png) no-repeat 0 center;
   line-height: 30px;
 }
 
 /* Exceptions */
 #diff-inline-form select,
-#block-system-main div.filter-options select {
+#page div.filter-options select {
   padding: 0;
 }
 
@@ -690,7 +1440,7 @@ div.admin-panel {
   border: 1px solid #ccc;
 }
 
-#block-system-main div.admin-panel h3 {
+#page div.admin-panel h3 {
   font-size: 12px;
   text-transform: uppercase;
   margin: 0;
@@ -701,14 +1451,29 @@ div.admin-panel {
   display: block;
 }
 
+/* admin/appearance */
+#page #system-themes-page h2 {
+  font-weight: normal;
+  text-transform: uppercase;
+}
+#page .theme-selector h3 {
+  font-weight: normal;
+}
+#page .theme-default h3 {
+  font-weight: bold;
+}
+#page .system-themes-list-enabled .theme-selector h3 {
+  margin-top: 0;
+}
+
 /* admin/content and admin/people */
-#block-system-main dl.multiselect,
-#block-system-main dl.multiselect dt,
-#block-system-main dl.multiselect dd {
+#page dl.multiselect,
+#page dl.multiselect dt,
+#page dl.multiselect dd {
   margin: 0 10px 0 0;
 }
 
-#block-system-main dl.multiselect select {
+#page dl.multiselect select {
   font-size: 12px;
   background: #fff;
   border: 1px solid #ccc;
@@ -745,8 +1510,100 @@ div.admin-options div.form-item {
   border: none;
 }
 
+/* Maintenance theming */
+body.in-maintenance #sidebar-first {
+  float: right;
+  width: 200px;
+}
+body.in-maintenance #content {
+  float: left;
+  width: 550px;
+  padding-right: 20px;
+}
+body.in-maintenance #page {
+  width: 770px;
+  margin: 0 auto;
+  padding-top: 2em;
+}
+body.in-maintenance #branding h1 {
+  width: 770px;
+  margin: 0 auto;
+  float: none;
+}
+
+body.in-maintenance .form-radios .form-type-radio {
+  padding: 2px 0;
+}
+
+body.in-maintenance .form-submit {
+  display: block;
+}
+
+body.in-maintenance #logo {
+  margin-bottom: 1.5em;
+}
+
+ol.task-list {
+  margin-left: 0; /* LTR */
+  list-style-type: none;
+  list-style-image: none;
+}
+ol.task-list li {
+  padding: 0.5em 1em 0.5em 20px; /* LTR */
+  color: #adadad;
+}
+ol.task-list li.active {
+  background: transparent url(images/task-item.png) no-repeat 3px 50%; /* LTR */
+  padding: 0.5em 1em 0.5em 20px; /* LTR */
+  color: #000;
+}
+ol.task-list li.done {
+  color: #393;
+  background: transparent url(images/task-check.png) no-repeat 0px 50%; /* LTR */
+  color: green;
+}
+
+/* Overlay theming */
+.overlay #branding {
+  background-color: #fff;
+  padding-top: 15px;
+}
+.overlay .primary,
+.overlay #branding h1.page-title,
+.overlay #page #left,
+.overlay #page #footer {
+  display: none;
+}
+.overlay #page {
+  margin: 0;
+}
+.overlay #branding div.breadcrumb {
+  float: left;
+  position: relative;
+  z-index: 10;
+}
+.overlay ul.secondary {
+  background: transparent none;
+  margin: -2.4em 0 0;
+  padding: 3px 10px;
+}
+.overlay #content {
+  padding: 0 20px;
+}
+.overlay #page {
+  padding: 0;
+}
+
+/* Shortcut theming */
+div.add-or-remove-shortcuts {
+  float: left;
+  padding-top: 6px;
+  padding-left: 6px;
+}
+
 /* $Id: pretty.css,v 1.4 2009/12/04 13:41:37 mcrittenden Exp $ */
 
+
 /**
  * Override of misc/vertical-tabs.css.
  */
@@ -783,10 +1640,12 @@ div.vertical-tabs ul li.vertical-tab-but
   display: block;
   font-size: 9px;
   color: #666;
+  padding-top: 0.5em;
 }
 
 div.vertical-tabs ul li.vertical-tab-button a:hover {
   background: #fff;
+  text-decoration: none;
 }
 
 div.vertical-tabs ul li.selected a,
@@ -802,4 +1661,3 @@ div.vertical-tabs .vertical-tabs-panes {
 div.vertical-tabs .vertical-tabs-panes legend {
   display: none;
 }
-