? patch-575294.patch
? sys-diff.txt
? sites/default/files
? sites/default/private
? sites/default/settings.php
? themes/seven/reset-changes.txt
Index: themes/seven/reset-drupal.css
===================================================================
RCS file: themes/seven/reset-drupal.css
diff -N themes/seven/reset-drupal.css
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/seven/reset-drupal.css	13 Sep 2009 01:50:08 -0000
@@ -0,0 +1,84 @@
+/* Drupal: system-menus.css */
+td.menu-disabled,
+ul.links,
+ul.links.inline,
+ul.links li,
+.block ul,
+
+/* Drupal: admin.css */
+div.admin,
+
+/* Drupal: system.css */
+tr.even,
+tr.odd,
+tr.drag,
+tbody,
+tbody th,
+thead th,
+.breadcrumb,
+.item-list .icon,
+.item-list .title,
+.item-list ul,
+.item-list ul li,
+ol.task-list li.active,
+.form-item,
+tr.odd .form-item,
+tr.even .form-item,
+.form-item .description,
+.form-item label,
+.form-item label.option,
+.form-checkboxes,
+.form-radios,
+.form-checkboxes .form-item,
+.form-radios .form-item,
+.marker,
+.form-required,
+.more-link,
+.more-help-link,
+.item-list .pager,
+.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 .form-item,
+ul.primary,
+ul.primary li,
+ul.primary li a,
+ul.primary li.active a,
+ul.primary li a:hover,
+ul.secondary,
+ul.secondary li,
+ul.secondary a,
+ul.secondary a.active,
+.resizable-textarea {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  outline: 0;
+  font-size: 100%;
+  vertical-align: baseline;
+  background: transparent;
+  line-height: inherit;
+  text-align: left;
+}
+
+/* Drupal: system-menus.css */
+ul.links,
+ul.links.inline,
+ul.links li,
+.block ul,
+
+
+/* Drupal: system-menus.css */
+ul.links,
+ul.links.inline,
+ul.links li,
+.block ul {
+  list-style: none;
+}
Index: themes/seven/reset.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/seven/reset.css,v
retrieving revision 1.1
diff -u -p -r1.1 reset.css
--- themes/seven/reset.css	31 Jul 2009 19:35:57 -0000	1.1
+++ themes/seven/reset.css	13 Sep 2009 01:50:08 -0000
@@ -81,67 +81,7 @@ tfoot,
 thead,
 tr,
 th,
-td,
-
-/* Drupal: system-menus.css */
-td.menu-disabled,
-ul.links,
-ul.links.inline,
-ul.links li,
-.block ul,
-
-/* Drupal: admin.css */
-div.admin,
-
-/* Drupal: system.css */
-tr.even,
-tr.odd,
-tr.drag,
-tbody,
-tbody th,
-thead th,
-.breadcrumb,
-.item-list .icon,
-.item-list .title,
-.item-list ul,
-.item-list ul li,
-ol.task-list li.active,
-.form-item,
-tr.odd .form-item,
-tr.even .form-item,
-.form-item .description,
-.form-item label,
-.form-item label.option,
-.form-checkboxes,
-.form-radios,
-.form-checkboxes .form-item,
-.form-radios .form-item,
-.marker,
-.form-required,
-.more-link,
-.more-help-link,
-.item-list .pager,
-.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 .form-item,
-ul.primary,
-ul.primary li,
-ul.primary li a,
-ul.primary li.active a,
-ul.primary li a:hover,
-ul.secondary,
-ul.secondary li,
-ul.secondary a,
-ul.secondary a.active,
-.resizable-textarea {
+td {
   margin: 0;
   padding: 0;
   border: 0;
@@ -153,14 +93,7 @@ ul.secondary a.active,
   text-align: left;
 }
 
-
-/* Drupal: system-menus.css */
-ul.links,
-ul.links.inline,
-ul.links li,
-.block ul,
-
-ol,
+ol
 ul,
 .item-list ul,
 .item-list ul li {
@@ -199,7 +132,7 @@ table {
 }
 
 /**
- * Font reset =========================================================
+ * Font reset.
  *
  * Specifically targets form elements which browsers often times give
  * special treatment.
@@ -207,54 +140,7 @@ table {
 input,
 select,
 textarea,
-body { 
-  font: 13px/20px "Helvetica Neue", Helvetica, Arial, sans-serif; 
+body {
+  font: 13px/20px "Helvetica Neue", Helvetica, Arial, sans-serif;
 }
 
-/**
- * Markup free clearing ===============================================
- *
- * Consider adding your own selectors to this instead of finding ways
- * to sneak the clearfix class into Drupal's markup.
- * From http://www.positioniseverything.net/easyclearing.html
- */
-div.form-item:after,
-ul.links:after,
-div.admin-panel .body:after,
-.clearfix:after {
-  content: ".";
-  display: block;
-  height: 0;
-  clear: both;
-  visibility: hidden;
-}
-
-/* Exclude inline links from clearfix behavior */
-ul.inline:after {
-  content: "";
-  display: none;
-  clear: none;
-}
-
-div.form-item,
-ul.links,
-div.admin-panel .body,
-.clearfix {
-  display: inline-block;
-}
-
-/* Hides from IE-mac \*/
-* html div.form-item,
-* html ul.links,
-* html div.admin-panel .body,
-* html .clearfix {
-  height: 1%;
-}
-
-div.form-item,
-ul.links,
-div.admin-panel .body,
-.clearfix {
-  display: block;
-}
-/* End hide from IE-mac */
Index: themes/seven/seven.info
===================================================================
RCS file: /cvs/drupal/drupal/themes/seven/seven.info,v
retrieving revision 1.1
diff -u -p -r1.1 seven.info
--- themes/seven/seven.info	31 Jul 2009 19:35:57 -0000	1.1
+++ themes/seven/seven.info	13 Sep 2009 01:50:08 -0000
@@ -4,9 +4,10 @@ description = A simple one-column, table
 core = 7.x
 version = VERSION
 engine = phptemplate
-stylesheets[screen][] = reset.css
-stylesheets[screen][] = style.css
+stylesheets[all][] = reset-drupal.css
 stylesheets[all][] = vertical-tabs.css
+stylesheets[all][] = system-menus.css
+stylesheets[all][] = style.css
 regions[content] = Content
 regions[help] = Help
 regions[page_top] = Page top
Index: themes/seven/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/seven/style.css,v
retrieving revision 1.18
diff -u -p -r1.18 style.css
--- themes/seven/style.css	11 Sep 2009 13:48:44 -0000	1.18
+++ themes/seven/style.css	13 Sep 2009 01:50:08 -0000
@@ -5,26 +5,21 @@
  */
 body {
   color: #000;
-  background: #fff;
+  background-color: #fff;
   font-style: normal;
   line-height: 20px;
   font-size: 0.8em;
   font-family: Lucida Grande, Lucida Sans Unicode, sans-serif;
 }
-
 a {
   color: #0074BD;
-  text-decoration: none;
 }
-
-a:hover {
-  text-decoration: underline;
+a, a:hover {
+  text-decoration: none;
 }
-
 hr {
   display: none;
 }
-
 legend {
   font-weight: bold;
 }
@@ -39,11 +34,9 @@ legend {
   font-weight: bold;
   margin:  10px 0;
 }
-
 #block-system-main dl {
   margin: 0 0 20px;
 }
-
 #block-system-main dl dd,
 #block-system-main dl dl {
   margin-left: 20px;
@@ -54,17 +47,15 @@ legend {
  * Branding.
  */
 #branding {
+  background-color: #e0e0d8;
   overflow: hidden;
   padding: 20px 40px 0 40px;
   position: relative;
-  background-color: #e0e0d8;
 }
-
 #branding div.breadcrumb {
   font-size: 11px;
   padding-bottom: 5px;
 }
-
 #branding div.block {
   position: relative;
   float: right;
@@ -72,23 +63,19 @@ legend {
   padding-left: 10px;
   background: #333;
 }
-
 #branding div.block form label {
   display: none;
 }
-
 #branding div.block form div.form-item {
   float: left;
   border: 0;
   margin: 0;
   padding: 0;
 }
-
 #branding div.block form input.form-text {
   width: 140px;
   margin-right: 10px;
 }
-
 #branding div.block form input.form-submit {
   text-align: center;
   width: 80px;
@@ -101,11 +88,9 @@ legend {
   font-size: 0.9em;
   margin-top: 1em;
 }
-
 #help p {
   margin: 0 0 10px;
 }
-
 #help div.more-help-link {
   text-align: right;
 }
@@ -120,19 +105,16 @@ legend {
   background: #bdf;
   border: 1px solid #ace;
 }
-
 #console div.warning {
   color: #840;
   background: #fe6;
   border-color: #ed5;
 }
-
 #console div.error {
   color: #fff;
   background: #e63;
   border-color: #d52;
 }
-
 #console div.status {
   color: #360;
   background: #cf8;
@@ -146,7 +128,6 @@ legend {
   background: #333;
   padding-top: 20px;
 }
-
 #branding h1.page-title {
   color: #000;
   padding-bottom: 10px;
@@ -175,12 +156,10 @@ ul.primary {
   text-transform: uppercase;
   font-size: 12px;
 }
-
 ul.primary li {
   display: inline;
   list-style: none;
 }
-
 ul.primary li a,
 ul.primary li a.active,
 ul.primary li a:active,
@@ -198,7 +177,6 @@ ul.primary li a:hover {
   border-style: solid;
   border-color: #a6a7a2;
 }
-
 ul.primary li.active a,
 ul.primary li.active a.active,
 ul.primary li.active a:active,
@@ -206,44 +184,33 @@ ul.primary li.active a:visited {
   background-color: #fff;
   border-color: #c9cac4;
 }
-
 ul.primary li a:hover {
   color: #fff;
 }
-
 ul.primary li.active a:hover {
   color: #000;
 }
 
 ul.secondary {
-  float: none;
-  clear: both;
-  font-size: 12px;
   text-align: right;
-  padding: 5px 10px 4px;
-  line-height: 20px;
-  overflow: hidden;
-  border-bottom: 1px solid #ccc;
-  background: #fff;
+  margin: 0.5em 0;
 }
-
 ul.secondary li {
-  padding-left: 10px;
+  display: inline;
+  margin: 0 0 0 1em;
 }
-
 ul.secondary li a {
   color: #05a;
 }
-
 ul.secondary li a,
 ul.secondary li a:hover,
 ul.secondary li.active a,
 ul.secondary li.active a.active {
-  padding: 0 10px;
+  border: 1px solid #ddd;
+  padding: 2px 10px;
   -moz-border-radius: 10px;
   -webkit-border-radius: 7px;
 }
-
 ul.secondary li.active a,
 ul.secondary li.active a.active {
   color: #fff;
@@ -254,15 +221,11 @@ ul.secondary li.active a.active {
  * Page layout.
  */
 #page {
-  padding-bottom: 40px;
-  margin-right: 40px;
-  margin-left: 40px;
+  background-color: #fff;
+  padding: 20px 40px 30px;
   position: relative;
 }
-
 #block-system-main {
-  padding: 20px 0;
-  background: #fff;
   color: #333;
 }
 
@@ -272,12 +235,10 @@ ul.secondary li.active a.active {
 #secondary-links ul.links li a {
   float: left;
 }
-
 #block-system-main ul.menu li,
 #secondary-links ul.links li {
   padding: 0 10px 10px 0;
 }
-
 #block-system-main ul.menu li a,
 #secondary-links ul.links li a {
   font-size: 9px;
@@ -292,25 +253,20 @@ ul.secondary li.active a.active {
   -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
 }
-
 #secondary-links ul.links li a:hover {
   background: #999;
 }
-
 #block-system-main ul.menu li a {
   background: #f8f8f8;
   color: #05a;
 }
-
 #block-system-main ul.menu li a:hover {
   background: #eee;
 }
-
 #secondary-links ul.links li.active-trail a,
 #secondary-links ul.links li a.active {
   background: #333;
 }
-
 #block-system-main ul.node-type-list li,
 #block-system-main ul.admin-list li {
   position: relative;
@@ -323,22 +279,18 @@ ul.secondary li.active a.active {
   list-style-type: none;
   list-style-image: none;
 }
-
 #block-system-main ul.admin-list.compact {
   margin-bottom: 8px;
 }
-
 #block-system-main ul.admin-list.compact li {
   border: 0;
   background: none;
   margin-bottom: 2px;
   padding-top: 2px;
 }
-
 #block-system-main ul.admin-list li:last-child {
   border-bottom: none;
 }
-
 #block-system-main ul.node-type-list .label {
   font-size: 15px;
 }
@@ -349,81 +301,64 @@ ul.secondary li.active a.active {
 table {
   width: 100%;
   font-size: 12px;
-  margin: 0 0 10px;
+  margin: 0 0 1em;
   border: 1px solid #bebfb9;
   border-top: 0;
 }
-
 table.system-status-report th,
 table td,
 table th {
   vertical-align: middle;
   padding: 8px 5px 8px 10px;
 }
-
 table.system-status-report th {
   padding-left: 30px;
 }
-
 table.system-status-report tr.ok > * {
   background-color: #dfd;
 }
-
 table.system-status-report tr.info > * {
   background-color: #bdf;
 }
-
 table.system-status-report tr.warning > * {
   background-color: #ffd;
 }
-
 table.system-status-report tr.error > * {
   background-color: #fdd;
 }
-
 tr.even, tr.odd {
   border-width: 0 1px 0 1px;
   border-style: solid;
   border-color: #bebfb9;
   background: #f3f4ee;
 }
-
 tr.odd {
   background: #fff;
 }
-
 table th {
   font-size: 12px;
   text-transform: uppercase;
   background: #e1e2dc;
   font-weight: normal;
-  border-width: 0 1px 1px 1px;
-  border-style: solid;
-  border-color: #bebfb9;
+  border: 1px solid #bebfb9;
   padding: 3px 3px 3px 10px;
 }
-
 table th.active {
   background: #bdbeb9;
 }
-
 table th a {
   display: block;
 }
-
 table th.active img {
   float: right;
   margin-top: 3px;
 }
-
 table td.active {
   background: #e9e9dd;
 }
-
 table tr.odd td.active {
   background: #f3f4ee;
 }
-
 table tr.selected td.active,
 table tr.selected td {
   background: #ffc;
@@ -431,31 +366,25 @@ table tr.selected td {
 }
 
 /**
- * Forms.
+ * Fieldsets.
  */
-
-/* Fieldsets & Form items */
 fieldset {
   border: 1px solid #ccc;
   padding: 30px 13px 13px 14px;
-  margin: 0 0 10px;
+  margin: 1em 0;
 }
-
 fieldset legend span,
 fieldset legend a {
   position: absolute;
   margin-top: 9px;
 }
-
 fieldset legend a span {
   position: relative;
   margin-top: 0;
 }
-
 fieldset.collapsed {
   background: transparent;
 }
-
 html.js fieldset.collapsed legend,
 html.js fieldset.collapsed legend * {
   display: block;
@@ -465,53 +394,38 @@ html.js fieldset.collapsed {
   margin-bottom: 10px;
   padding: 13px;
 }
-
 fieldset fieldset {
   background: #fff;
 }
-
 fieldset fieldset fieldset {
   background: #f8f8f8;
 }
-
 html.js fieldset.collapsible .fieldset-wrapper {
   overflow: visible;
 }
 
-div.form-item {
-  padding: 9px;
-  margin: 0 0 10px;
+/**
+ * Forms.
+ */
+.form-item {
+  margin: 1em 0;
 }
-
-.filter-wrapper div.form-item,
-div.teaser-checkbox div.form-item,
-div.form-item div.form-item,
-fieldset div.form-item {
-  padding: 5px 0;
+.form-item .form-type-checkbox, .form-item .form-type-radio {
   margin: 0;
-  border: 0;
 }
-
-.text-format-wrapper .form-item {
-  padding-bottom: 0;
+.form-type-password-confirm .form-item {
+  display: inline-block;
+  width: 17.5em;
+  vertical-align: middle;
 }
-
-div.form-item label {
+.filter-wrapper .form-item,
+div.teaser-checkbox .form-item {
   margin: 0;
-  padding: 0;
+  border: 0;
 }
-
 fieldset legend {
   text-transform: uppercase;
 }
-
-div.form-item label.option {
-  text-transform: none;
-}
-
-div.form-item label.option {
-  font-size: 12px;
-}
 div.form-item label.option input {
   vertical-align: middle;
 }
@@ -519,31 +433,20 @@ div.form-item label.option input {
 /* Filter */
 .filter-wrapper {
   border-top: 0;
-  width: 95%;
-  padding: 10px 2px 10px 2px;
-}
-
-.filter-wrapper > div {
-  padding-right: 6px;
-  padding-left: 6px;
 }
-
-.filter-wrapper div.form-item,
+.filter-wrapper .form-item,
 .filter-wrapper .filter-guidelines,
 .filter-wrapper .filter-help {
   font-size: 12px;
-  padding: 0;
 }
-
 ul.tips,
-div.description,
-div.form-item div.description {
+.fieldset-description,
+.form-item .description {
   margin: 5px 0;
   line-height: 15px;
   font-size: 12px;
   color: #666;
 }
-
 body div.form-type-radio div.description, body div.form-type-checkbox div.description {
   margin-left: 1.5em;
 }
@@ -551,21 +454,19 @@ body div.form-type-radio div.description
 /* Buttons */
 input.form-submit {
   cursor: pointer;
-  padding: 4px 17px;
+  padding: 3px 13px;
   color: #5a5a5a;
   text-align: center;
-  font-weight: normal;
   font-family: "Lucida Grande", Verdana, sans-serif;
   border: 1px solid #e4e4e4;
   border-bottom: 1px solid #b4b4b4;
   border-left-color: #D2D2D2;
   border-right-color: #D2D2D2;
   background: url(images/buttons.png) 0 0 repeat-x;
-  -moz-border-radius: 20px;
+  -moz-border-radius: 16px;
   -webkit-border-radius: 15px;
   font-size: 1.1em;
 }
-
 div.node-form input#edit-submit,
 div.node-form input#edit-submit-1 {
   border: 1px solid #8eB7cd;
@@ -575,57 +476,41 @@ div.node-form input#edit-submit-1 {
   background: url(images/buttons.png) 0px -40px repeat-x;
   color: #133B54;
 }
-
 input.form-submit:active {
   background: #666;
   color: #fff;
   border-color: #555;
   text-shadow: #222 0px -1px 0px;
 }
-
 form input#edit-delete {
   background: #eee;
   border-color: #fff #ddd #ccc;
   text-shadow: none;
   color: #999;
 }
-
 input.form-autocomplete,
 input.form-text,
 textarea.form-textarea,
 select.form-select {
-  padding: 2px;
   border: 1px solid #ccc;
   border-top-color: #999;
   background: #fff;
   color: #333;
 }
-
 input.form-text:focus,
 textarea.form-textarea:focus,
 select.form-select:focus {
   color: #000;
   border-color: #ace;
 }
-
-html.js input.form-autocomplete {
-  background-position: 100% 4px;
-}
-
-html.js input.throbbing {
-  background-position: 100% -16px;
-}
-
 ul.action-links {
   margin: 1em 0;
   overflow: hidden;
 }
-
 ul.action-links li {
   float: left;
   margin: 0 1em 0 0;
 }
-
 ul.action-links a {
   padding-left: 15px;
   background: transparent url(images/add.png) no-repeat 0 center;
@@ -646,27 +531,23 @@ div.admin .left {
   width: 49%;
   margin: 0;
 }
-
 div.admin-panel,
 div.admin-panel .body {
   padding: 0;
   clear: left;
 }
-
 div.admin-panel {
   margin: 0 0 20px;
   padding: 9px;
   background: #f8f8f8;
   border: 1px solid #ccc;
 }
-
 #block-system-main div.admin-panel h3 {
   font-size: 12px;
   text-transform: uppercase;
   margin: 0;
   padding-bottom: 9px;
 }
-
 .container-inline fieldset {
   display: block;
 }
@@ -677,7 +558,6 @@ div.admin-panel {
 #block-system-main dl.multiselect dd {
   margin: 0 10px 0 0;
 }
-
 #block-system-main dl.multiselect select {
   font-size: 12px;
   background: #fff;
@@ -693,18 +573,15 @@ div.admin-options {
   border: 1px solid #ccc;
   margin: 0 0 10px;
 }
-
 div.admin-options label {
   text-transform: uppercase;
   font: 12px/30px Lucida Grande, Lucida Sans Unicode, sans-serif;
 }
-
 div.admin-options label,
 div.admin-options div.form-item {
   margin-right: 10px;
   float: left;
 }
-
 div.admin-options div.form-item {
   padding: 0;
   border: 0;
@@ -715,23 +592,7 @@ div.admin-options div.form-item {
   border: none;
 }
 
-/* Overlay theming */
-body.overlay {
-  background: #fff;
-}
-
-body.overlay #branding,
-body.overlay #page-title,
-body.overlay #page #left,
-body.overlay #page #footer {
-  display: none;
-}
-
-body.overlay #page {
-  margin: 0;
-  padding: 0;
-}
-
-body.overlay #block-system-main {
-  padding: 20px;
+/* Warning elements */
+div.warning, table tr.warning {
+  margin: 0.5em 0;
 }
Index: themes/seven/template.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/seven/template.php,v
retrieving revision 1.5
diff -u -p -r1.5 template.php
--- themes/seven/template.php	22 Aug 2009 14:34:23 -0000	1.5
+++ themes/seven/template.php	13 Sep 2009 01:50:08 -0000
@@ -8,7 +8,10 @@ function seven_preprocess_page(&$vars) {
   $vars['primary_local_tasks'] = menu_primary_local_tasks();
   $vars['secondary_local_tasks'] = menu_secondary_local_tasks();
   $vars['ie_styles'] = '<!--[if lt IE 7]><style type="text/css" media="screen">@import ' . path_to_theme() . '/ie6.css";</style><![endif]-->';
-}
+  $data = path_to_theme() . '/reset.css';
+  $options['weight'] = CSS_SYSTEM -1;
+  drupal_add_css($data, $options);
+ }
 
 /**
  * Display the list of available node types for node creation.
Index: themes/seven/vertical-tabs.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/seven/vertical-tabs.css,v
retrieving revision 1.1
diff -u -p -r1.1 vertical-tabs.css
--- themes/seven/vertical-tabs.css	31 Jul 2009 19:35:57 -0000	1.1
+++ themes/seven/vertical-tabs.css	13 Sep 2009 01:50:08 -0000
@@ -12,6 +12,7 @@ div.vertical-tabs {
 
 div.vertical-tabs fieldset {
   border: 0;
+  margin: 0;
   padding: 0 0 0 20px;
 }