Index: themes/bartik/color/preview.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/color/preview.css,v
retrieving revision 1.1
diff -u -p -r1.1 preview.css
--- themes/bartik/color/preview.css	6 Jul 2010 05:25:51 -0000	1.1
+++ themes/bartik/color/preview.css	18 Sep 2010 03:43:19 -0000
@@ -1,8 +1,5 @@
 /* $Id: preview.css,v 1.1 2010/07/06 05:25:51 webchick Exp $ */
 
-/* Bring in the rest of the theme's CSS styles. */
-@import url("../css/style.css");
-
 /* From color.css. */
 #preview, #preview-header {
   background-color: #000000;
@@ -17,35 +14,162 @@
 #preview {
   width: 640px;
   overflow: hidden;
-  font-size: 1em;
+  line-height: 1.4em;
+  font-size: medium; /* reset to 16px*/
+  word-wrap: break-word;
+  margin: 0;
+  padding: 0;
+  border: 0;
+  outline: 0;
+  font-family: Georgia, "Times New Roman", Times, serif;
 }
-#preview #preview-header div.section,
-#preview #preview-navigation div.section,
-#preview #preview-featured div.section,
-#preview #preview-main {
-  width: 960px;
+#preview #preview-header,
+#preview #preview-main-wrapper,
+#preview #preview-footer-wrapper {
+  font-size: 80%;
+}
+#preview h1,
+#preview h2,
+#preview h3,
+#preview h4,
+#preview h5,
+#preview h6 {
+  margin: 1.0em 0 0.5em;
+  font-weight: inherit;
+}
+#preview h1 {
+  font-size: 120%;
+}
+#preview p {
+  margin: 0 0 1.2em;
+}
+#preview-header {
+  color: #fff;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+#preview-header a {
+  color: #fff;
+}
+#preview-header #preview-logo {
+  float: left;
+  padding: 15px 30px 15px 0;
+}
+#preview-header #preview-name-and-slogan {
+  padding-top: 38px;
+  margin-bottom: 30px;
+  margin-left: 15px;
+}
+#preview-header #preview-site-name {
+  font-size: 200%;
+  color: #686868;
+}
+#preview-header h1#preview-site-name {
+  margin: 0;
+}
+#preview-header #preview-site-name a {
+  font-weight: normal;
+}
+#preview-header div.section,
+#preview-navigation div.section,
+#preview-featured div.section,
+#preview-main {
   margin-left: auto;
   margin-right: auto;
   padding: 0 20px;
 }
-#preview #preview-content,
+#preview #preview-main {
+  margin-top: 20px;
+  margin-bottom: 40px;
+}
+
+#preview #preview-block-system-main {
+  font-size: 115%;
+  line-height: 1.5em;
+}
+#preview h1#preview-page-title {
+  font-size: 220%;
+  line-height: 1.2em;
+}
+#preview #preview-block-system-main h2 {
+  margin-bottom: 2px;
+  font-size: 137%;
+  line-height: 1.4em;
+}
+#preview-content,
 #preview .sidebar {
   display: inline;
-  float: left; /* LTR */
+  float: left;
   position: relative;
 }
-#preview #preview-content {
-  width: 720px;
+#preview-content {
+  width: 360px;
 }
 #preview .sidebar {
   width: 240px;
 }
-#preview #preview-content .section,
-.sidebar .section {
+#preview .sidebar h2 {
+  margin: 0 0 0.5em;
+  border-bottom: 1px solid #d6d6d6;
+  padding-bottom: 5px;
+  text-shadow: 0 1px 0 #fff;
+}
+#preview-content .section,
+#preview-content .sidebar .section {
   padding: 0 10px;
+  margin: 0 15px;
+}
+#preview .sidebar .block {
+  border: 1px solid;
+  margin: 20px 0;
+  padding: 15px 20px;
 }
+
 #preview #footer-wrapper {
-  padding: 35px 20px 30px;
+  color: #c0c0c0;
+  color: rgba(255,255,255,0.65);  
+  font-size: 90%;
+}
+#preview #footer-wrapper a {
+  color: #fcfcfc;
+  color: rgba(255,255,255,0.8);
+}
+#preview #footer-wrapper a:hover,
+#preview #footer-wrapper a:focus {
+  color: #fefefe;
+  color: rgba(255,255,255,0.95);  
+  text-decoration: underline;
+}
+#preview #footer-wrapper .block {
+  margin: 20px 0;
+  border: 1px solid #444;
+  border-color: rgba(255,255,255,0.1);  
+  padding: 10px;
+}
+#preview #footer-columns h2 {
+  border-bottom: 1px solid #555;
+  border-color: rgba(255,255,255,0.15);  
+  font-size: 104%;
+  margin-bottom: 0;
+  padding-bottom: 3px;
+  text-transform: uppercase;
+}
+#preview #footer-columns a {
+  display: block;
+  border-bottom: 1px solid #555;
+  border-color: rgba(255,255,255,0.15);  
+  line-height: 1.2em;
+  padding: 0.8em 2px 0.8em 20px;
+  text-indent: -15px;
+}
+#preview #footer-columns ul {
+  list-style: none;
+  padding-left: 0;
+  margin-left: 0
+}
+#preview #footer-columns li {
+  list-style: none;
+  margin: 0;
+  padding: 0;
 }
 #preview #footer-firstcolumn,
 #preview #footer-secondcolumn,
@@ -54,9 +178,14 @@
   padding: 0 10px;
   width: 220px;
   display: inline;
-  float: left; /* LTR */
+  float: left;
   position: relative;
 }
-#preview #footer {
-  width: 940px;
+#preview #footer,
+ .overlay #preview #footer {
+  display: block;
+  font-size: 92%;
+  letter-spacing: 0.2px;
+  padding: 10px;
+  overflow: hidden;
 }
Index: themes/bartik/color/preview.html
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/color/preview.html,v
retrieving revision 1.1
diff -u -p -r1.1 preview.html
--- themes/bartik/color/preview.html	6 Jul 2010 05:25:51 -0000	1.1
+++ themes/bartik/color/preview.html	18 Sep 2010 03:43:19 -0000
@@ -6,9 +6,9 @@
         <div id="preview-site-name">
           <strong><a href="#" title="Home" rel="home"><span>Bartik</span></a></strong>
         </div>
-      </div><!-- /#name-and-slogan -->
+      </div>
     </div>
-  </div><!-- /.section, /#header -->
+  </div>
   <div id="preview-main-wrapper">
     <div id="preview-main" class="clearfix">
       <div id="preview-sidebar-first" class="column sidebar">
@@ -27,7 +27,7 @@
             </div>
           </div>
         </div>
-      </div><!-- /.section, /#sidebar-first -->
+      </div>
       <div id="preview-content" class="column">
         <div class="section">
           <a id="preview-main-content" name="main-content"></a>
@@ -57,21 +57,25 @@
             </div>
           </div>
         </div>
-      </div><!-- /.section, /#content -->
+      </div>
     </div>
-  </div><!-- /#main, /#main-wrapper -->
-
+  </div>
   <div id="footer-wrapper"><div class="section">
       <div id="footer-columns" class="clearfix">
-          <div id="footer-firstcolumn" class="region sitemap"><div class="section">
+        <div id="footer-firstcolumn">
+          <div class="block">
+            <h2>Donec Placerat</h2>
             <ul>
               <li><a>Donec placerat</a></li>
               <li><a>Nullam nibh dolor</a></li>
               <li><a>Blandit sed</a></li>
               <li><a>Fermentum id</a></li>
             </ul>
-          </div></div> <!-- /.section, /#footer-firstcolumn -->
-          <div id="footer-secondcolumn" class="region sitemap"><div class="section">
+          </div>
+        </div>
+        <div id="footer-secondcolumn">
+          <div class="block">
+            <h2>Imperdiet Amet</h2>
             <ul>
               <li><a>Imperdiet sit amet</a></li>
               <li><a>Nam mollis</a></li>
@@ -79,27 +83,11 @@
               <li><a>Sed tempor</a></li>
               </ul>
             <ul>
-          </div></div> <!-- /.section, /#footer-secondcolumn -->
-          <div id="footer-thirdcolumn" class="region sitemap"><div class="section">
-           <ul>
-              <li><a>Sit amet</a></li>
-              <li><a>Gravida eget</a></li>
-              <li><a>Porta at</a></li>
-              <li><a>Nam non</a></li>
-            </ul>
-          </div></div> <!-- /.section, /#footer-thirdcolumn -->
-          <div id="footer-fourthcolumn" class="region sitemap"><div class="section">
-            <ul>
-              <li><a>Sed vitae</a></li>
-              <li><a>Tellus</a></li>
-              <li><a>Etiam sem</a></li>
-              <li><a>Arcu eleifend</a></li>
-            </ul>
-          </div></div> <!-- /.section, /#footer-fourthcolumn -->
-      </div><!-- /#footer-columns -->
+          </div>
+        </div>
+      </div>
       <div id="footer" class="clearfix">
         Aliquam aliquet, est <a>a ullamcorper</a> condimentum.
-    </div><!-- /#footer -->
-  </div></div> <!-- /.section, /#footer-wrapper -->
-
-</div><!-- /#preview -->
+    </div>
+  </div></div>
+</div>
Index: themes/bartik/css/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/css/style.css,v
retrieving revision 1.13
diff -u -p -r1.13 style.css
--- themes/bartik/css/style.css	10 Sep 2010 17:56:20 -0000	1.13
+++ themes/bartik/css/style.css	18 Sep 2010 03:43:19 -0000
@@ -2,8 +2,7 @@
 
 /* ---------- Overall Specifications ---------- */
 
-body,
-#preview {
+body {
   background-color: #fff;
   line-height: 1.4em;
   font-size: 0.8em;
@@ -27,27 +26,18 @@ h2,
 h3,
 h4,
 h5,
-h6,
-#preview h1,
-#preview h2,
-#preview h3,
-#preview h4,
-#preview h5,
-#preview h6 {
+h6 {
   margin: 1.0em 0 0.5em;
   font-weight: inherit;
 }
-h1,
-#preview h1 {
+h1 {
   font-size: 140%;
   color: #000;
 }
-h2,
-#preview h1 {
+h2 {
   font-size: 120%;
 }
-p,
-#preview p {
+p {
   margin: 0 0 1.2em;
 }
 del {
@@ -56,22 +46,19 @@ del {
 tr.odd {
   background-color: #dddddd;
 }
-img,
-#preview img {
+img {
   outline: 0;
 }
 
 /* ------------------ Fonts ------------------ */
 
 body,
-#preview,
 #header #site-slogan,
 .ui-widget {
   font-family: Georgia, "Times New Roman", Times, serif;
 }
 #header,
 #footer-wrapper,
-#preview #preview-header,
 #skip-link,
 ul.contextual-links,
 ul.links,
@@ -243,36 +230,29 @@ ul.tips {
   position: static;
   width: auto;
 }
-#header,
-#preview #preview-header {
+#header {
   color: #fff;
 }
-#header a,
-#preview #preview-header a {
+#header a {
   color: #fff;
 }
-#header #logo,
-#preview #preview-header #preview-logo {
+#header #logo {
   float: left; /* LTR */
   padding: 15px 30px 15px 0; /* LTR */
 }
-#header #name-and-slogan,
-#preview #preview-header #preview-name-and-slogan {
+#header #name-and-slogan {
   padding-top: 38px;
   margin-bottom: 30px;
   margin-left: 15px;
 }
-#header #site-name,
-#preview #preview-header #preview-site-name {
+#header #site-name {
   font-size: 200%;
   color: #686868;
 }
-#header h1#site-name,
-#preview #preview-header h1#preview-site-name {
+#header h1#site-name {
   margin: 0;
 }
-#header #site-name a,
-#preview-header #preview-site-name a {
+#header #site-name a {
   font-weight: normal;
 }
 #header #site-slogan {
@@ -444,8 +424,7 @@ ul.tips {
 
 /* ------------------- Main ------------------- */
 
-#main,
-#preview #preview-main {
+#main {
   margin-top: 20px;
   margin-bottom: 40px;
 }
@@ -473,21 +452,18 @@ ul.tips {
 .content {
   margin-top: 1em;
 }
-#block-system-main,
-#preview #preview-block-system-main {
+#block-system-main {
   font-size: 115%;
   line-height: 1.5em;
 }
 body.page-admin-appearance-settings-bartik #block-system-main {
   font-size: 100%;
 }
-h1#page-title,
-#preview h1#preview-page-title {
+h1#page-title {
   font-size: 220%;
   line-height: 1.2em;
 }
-#block-system-main h2,
-#preview #preview-block-system-main h2 {
+#block-system-main h2 {
   margin-bottom: 2px;
   font-size: 137%;
   line-height: 1.4em;
@@ -620,8 +596,7 @@ h1#page-title,
   padding: 15px 20px;
   margin: 20px 0;
 }
-.sidebar h2,
-#preview .sidebar h2 {
+.sidebar h2 {
   margin: 0 0 0.5em;
   border-bottom: 1px solid #d6d6d6;
   padding-bottom: 5px;