? .DS_Store
? maint-page-june.patch
Index: css/maintenance-page.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/bartik/css/maintenance-page.css,v
retrieving revision 1.4
diff -u -p -r1.4 maintenance-page.css
--- css/maintenance-page.css	23 May 2010 14:57:24 -0000	1.4
+++ css/maintenance-page.css	20 Jun 2010 15:05:01 -0000
@@ -8,36 +8,55 @@ body.maintenance-page {
   margin-left: auto;
   margin-right: auto;
   width: 800px;
-  border: 1px solid #666;
+  border: 1px solid #cbcbcb;
   margin-top: 40px;
 }
 .maintenance-page #page {
-  margin: 20px 40px 50px;
+  margin: 20px 40px 40px;
+}
+.maintenance-page #main-wrapper {
+  min-height: inherit;
 }
 .maintenance-page #header,
 .maintenance-page #messages,
 .maintenance-page #main {
   width: auto;
 }
+.maintenance-page #header div.section, 
+.maintenance-page #navigation div.section, 
+.maintenance-page #messages, 
+.maintenance-page #main {
+  width: 700px;
+}
+.maintenance-page #main {
+  margin: 0;
+}
+.maintenance-page #content .section {
+  padding: 0 0 0 10px;
+}
 .maintenance-page #header {
   background-color: #fff;
   background-image: none;
 }
+.maintenance-page #header #name-and-slogan {
+  margin-bottom: 50px;
+  padding-top: 20px;
+  font-size: 90%;
+}
 .maintenance-page #header,
 .maintenance-page #header a,
 .maintenance-page #header a:hover,
 .maintenance-page #header a:hover {
-  color: #000;
-}
-.maintenance-page #main {
-  margin: 0;
+  color: #777;
 }
 .maintenance-page  h1#page-title {
   line-height: 1em;
+  margin-top: 0;
 }
 .maintenance-page #messages {
   padding: 0;
+  margin-top: 30px;
 }
-.maintenance-page #footer-wrapper {
-  display: none;
+.maintenance-page #messages div.section {
+  padding: 0;
 }
Index: templates/maintenance-page.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/bartik/templates/maintenance-page.tpl.php,v
retrieving revision 1.1
diff -u -p -r1.1 maintenance-page.tpl.php
--- templates/maintenance-page.tpl.php	17 May 2010 11:15:51 -0000	1.1
+++ templates/maintenance-page.tpl.php	20 Jun 2010 15:05:01 -0000
@@ -33,12 +33,6 @@
 
   <div id="header"><div class="section clearfix">
 
-    <?php if ($logo): ?>
-      <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home" id="logo">
-        <img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" />
-      </a>
-    <?php endif; ?>
-
     <?php if ($site_name || $site_slogan): ?>
       <div id="name-and-slogan"<?php if ($hide_site_name && $hide_site_slogan) { print ' class="element-invisible"'; } ?>>
 
@@ -69,18 +63,6 @@
 
   </div></div> <!-- /.section, /#header -->
 
-  <?php if ($messages): ?>
-    <div id="messages"><div class="section clearfix">
-      <?php print $messages; ?>
-    </div></div> <!-- /.section, /#messages -->
-  <?php endif; ?>
-
-  <?php if ($featured): ?>
-    <div id="featured" class="region"><div class="section clearfix">
-      <?php print $featured; ?>
-    </div></div> <!-- /.section, /#featured -->
-  <?php endif; ?>
-
   <div id="main-wrapper"><div id="main" class="clearfix">
 
     <div id="content" class="column"><div class="section">
@@ -92,81 +74,18 @@
         </h1>
       <?php endif; ?>
       <?php print $content; ?>
+      
+      <?php if ($messages): ?>
+        <div id="messages"><div class="section clearfix">
+          <?php print $messages; ?>
+        </div></div> <!-- /.section, /#messages -->
+      <?php endif; ?>
 
     </div></div> <!-- /.section, /#content -->
 
-    <?php if ($sidebar_first): ?>
-      <div id="sidebar-first" class="column sidebar"><div class="section">
-        <?php print $sidebar_first; ?>
-      </div></div> <!-- /.section, /#sidebar-first -->
-    <?php endif; ?>
 
   </div></div> <!-- /#main, /#main-wrapper -->
 
-  <?php if ($triptych_first || $triptych_middle || $triptych_last): ?>
-    <div id="triptych-wrapper"><div id="triptych" class="clearfix">
-
-      <?php if ($triptych_first): ?>
-        <div id="triptych-first" class="region triptych"><div class="section">
-          <?php print $triptych_first; ?>
-        </div></div> <!-- /.section, /#triptych-first -->
-      <?php endif; ?>
-
-      <?php if ($triptych_middle): ?>
-        <div id="triptych-middle" class="region triptych"><div class="section">
-          <?php print $triptych_middle; ?>
-        </div></div> <!-- /.section, /#triptych-middle -->
-      <?php endif; ?>
-
-      <?php if ($triptych_last): ?>
-        <div id="triptych-last" class="region triptych"><div class="section">
-          <?php print $triptych_last; ?>
-        </div></div> <!-- /.section, /#triptych-last -->
-      <?php endif; ?>
-
-    </div></div> <!-- /#triptych, /#triptych-wrapper -->
-  <?php endif; ?>
-
-  <div id="footer-wrapper"><div class="section">
-
-    <?php if ($footer_firstcolumn || $footer_secondcolumn || $footer_thirdcolumn || $footer_fourthcolumn): ?>
-      <div id="footer-columns" class="clearfix">
-
-        <?php if ($footer_firstcolumn): ?>
-          <div id="footer-firstcolumn" class="region sitemap"><div class="section">
-            <?php print $footer_firstcolumn; ?>
-          </div></div> <!-- /.section, /#footer-firstcolumn -->
-        <?php endif; ?>
-
-        <?php if ($footer_secondcolumn): ?>
-          <div id="footer-secondcolumn" class="region sitemap"><div class="section">
-            <?php print $footer_secondcolumn; ?>
-          </div></div> <!-- /.section, /#footer-secondcolumn -->
-        <?php endif; ?>
-
-        <?php if ($footer_thirdcolumn): ?>
-          <div id="footer-thirdcolumn" class="region sitemap"><div class="section">
-            <?php print $footer_thirdcolumn; ?>
-          </div></div> <!-- /.section, /#footer-thirdcolumn -->
-        <?php endif; ?>
-
-        <?php if ($footer_fourthcolumn): ?>
-          <div id="footer-fourthcolumn" class="region sitemap"><div class="section">
-            <?php print $footer_fourthcolumn; ?>
-          </div></div> <!-- /.section, /#footer-fourthcolumn -->
-        <?php endif; ?>
-
-      </div><!-- /#footer-columns -->
-    <?php endif; ?>
-
-    <?php if ($footer): ?>
-      <div id="footer" class="clearfix">
-        <?php print $footer; ?>
-      </div><!-- /#footer -->
-    <?php endif; ?>
-
-  </div></div> <!-- /.section, /#footer-wrapper -->
-
 </div></div> <!-- /#page, /#page-wrapper -->
 
   <?php print $page_bottom; ?>