#988184 by Jeff Burnz: Remove duplicate IDs from preview.html in Bartik.

3 files changed, 43 insertions, 41 deletions

diff --git a/themes/bartik/color/preview.css b/themes/bartik/color/preview.css
index 6315f77a3..c7c383b53 100644
--- a/themes/bartik/color/preview.css
+++ b/themes/bartik/color/preview.css
@@ -21,36 +21,38 @@ html.js #preview {
   line-height: 1.5;
   overflow: hidden;
   word-wrap: break-word;
+  margin-bottom: 10px;
 }
-#preview #preview-header {
+#preview-header {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   position: relative;
 }
-#preview #preview-logo {
+#preview-logo {
   float: left;
   padding: 15px 30px 15px 10px;
 }
-#preview #preview-site-name {
+#preview-site-name {
   color: #686868;
   font-weight: normal;
+  font-size: 1.821em;
   line-height: 1;
   margin-bottom: 30px;
   padding-top: 34px;
 }
-#preview #main-menu {
+#preview-main-menu {
   clear: both;
   padding: 0 15px 3px;
 }
-#preview #main-menu-links a {
+#preview-main-menu-links a {
   color: #d9d9d9;
   padding: 0.6em 1em 0.4em;
 }
-#preview #main-menu-links {
+#preview-main-menu-links {
   font-size: 0.929em;
   margin: 0;
   padding: 0;
 }
-#preview #main-menu-links a {
+#preview-main-menu-links a {
   color: #333;
   background: #ccc;
   background: rgba(255, 255, 255, 0.7);
@@ -64,43 +66,43 @@ html.js #preview {
   -webkit-border-top-right-radius: 8px;
   border-top-right-radius: 8px;
 }
-#preview #main-menu-links a:hover,
-#preview #main-menu-links a:focus {
+#preview-main-menu-links a:hover,
+#preview-main-menu-links a:focus {
   background: #fff;
   background: rgba(255, 255, 255, 0.95);
 }
-#preview #main-menu-links a:active {
+#preview-main-menu-links a:active {
   background: #b3b3b3;
   background: rgba(255, 255, 255, 1);
 }
-#preview #main-menu-links li a.active {
+#preview-main-menu-links li a.active {
   border-bottom: none;
 }
-#preview #main-menu-links li {
+#preview-main-menu-links li {
   display: inline;
   list-style-type: none;
   padding: 0.6em 0 0.4em;
 }
-#preview #preview-sidebar,
-#preview #preview-content {
+#preview-sidebar,
+#preview-content {
   display: inline;
   float: left;
   position: relative;
 }
-#preview #preview-sidebar {
+#preview-sidebar {
   margin-left: 15px;
   width: 210px;
 }
-#preview #preview-content {
+#preview-content {
   margin-left: 30px;
   width: 26.5em;
 }
-#preview #preview-sidebar .preview-block {
+#preview-sidebar .preview-block {
   border: 1px solid;
   margin: 20px 0;
   padding: 15px 20px;
 }
-#preview #preview-sidebar h2 {
+#preview-sidebar h2 {
   border-bottom: 1px solid #d6d6d6;
   font-size: 1.071em;
   font-weight: normal;
@@ -116,52 +118,52 @@ html.js #preview {
 #preview .preview-block-menu .preview-content ul {
   margin-top: 0;
 }
-#preview #preview-main {
+#preview-main {
   margin-bottom: 40px;
   margin-top: 20px;
 }
-#preview #preview-page-title {
+#preview-page-title {
   font-size: 2em;
   font-weight: normal;
   line-height: 1;
   margin: 1em 0 0.5em;
 }
-#preview #footer-wrapper {
+#preview-footer-wrapper {
   color: #c0c0c0;
   color: rgba(255, 255, 255, 0.65);
   display: block !important;
   font-size: 0.857em;
   padding: 20px 20px 25px;
 }
-#preview #footer-wrapper a {
+#preview-footer-wrapper a {
   color: #fcfcfc;
   color: rgba(255, 255, 255, 0.8);
 }
-#preview #footer-wrapper a:hover,
-#preview #footer-wrapper a:focus {
+#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 .footer-column {
+#preview-footer-wrapper .preview-footer-column {
   display: inline;
   float: left;
   padding: 0 10px;
   position: relative;
   width: 220px;
 }
-#preview #footer-wrapper .preview-block {
+#preview-footer-wrapper .preview-block {
   border: 1px solid #444;
   border-color: rgba(255,255,255,0.1);
   margin: 20px 0;
   padding: 10px;
 }
-#preview #footer-columns .preview-block-menu {
+#preview-footer-columns .preview-block-menu {
   border: none;
   margin: 0;
   padding: 0;
 }
-#preview #footer-columns h2 {
+#preview-footer-columns h2 {
   border-bottom: 1px solid #555;
   border-color: rgba(255, 255, 255, 0.15);
   font-size: 1em;
@@ -169,20 +171,20 @@ html.js #preview {
   padding-bottom: 3px;
   text-transform: uppercase;
 }
-#preview #footer-columns .preview-content {
+#preview-footer-columns .preview-content {
   margin-top: 0;
 }
-#preview #footer-columns .preview-content ul {
+#preview-footer-columns .preview-content ul {
   margin-left: 0;
   padding-left: 0;
 }
-#preview #footer-columns .preview-content li {
+#preview-footer-columns .preview-content li {
   list-style: none;
   list-style-image: none;
   margin: 0;
   padding: 0;
 }
-#preview #footer-columns .preview-content li a {
+#preview-footer-columns .preview-content li a {
   border-bottom: 1px solid #555;
   border-color: rgba(255, 255, 255, 0.15);
   display: block;
@@ -190,8 +192,8 @@ html.js #preview {
   padding: 0.8em 2px 0.8em 20px;
   text-indent: -15px;
 }
-#preview #footer-columns .preview-content li a:hover,
-#preview #footer-columns .preview-content li a:focus {
+#preview-footer-columns .preview-content li a:hover,
+#preview-footer-columns .preview-content li a:focus {
   background-color: #1f1f21;
   background-color: rgba(255,255,255,.05);
   text-decoration: none;
diff --git a/themes/bartik/color/preview.html b/themes/bartik/color/preview.html
index 0bb18db41..52ea5664a 100644
--- a/themes/bartik/color/preview.html
+++ b/themes/bartik/color/preview.html
@@ -3,8 +3,8 @@
   <div id="preview-header">
     <div id="preview-logo"><img src="../../../themes/bartik/logo.png" alt="Site Logo" /></div>
     <div id="preview-site-name">Bartik</div>
-    <div id="main-menu">
-      <ul id="main-menu-links">
+    <div id="preview-main-menu">
+      <ul id="preview-main-menu-links">
         <li><a>Home</a></li>
         <li><a>Te Quidne</a></li>
         <li><a>Vel Torqueo Quae Erat</a></li>
@@ -35,9 +35,9 @@
     </div>
   </div>
 
-  <div id="footer-wrapper">
-    <div id="footer-columns" class="clearfix">
-      <div class="footer-column">
+  <div id="preview-footer-wrapper">
+    <div id="preview-footer-columns" class="clearfix">
+      <div class="preview-footer-column">
         <div class="preview-block">
           <h2>Etiam est risus</h2>
           <div class="content">
@@ -46,7 +46,7 @@
           </div>
         </div>
       </div>
-      <div class="footer-column">
+      <div class="preview-footer-column">
         <div class="preview-block preview-block-menu">
           <h2>Erisus dolor</h2>
           <div class="preview-content">
diff --git a/themes/bartik/color/preview.js b/themes/bartik/color/preview.js
index 8459b2804..bfdadd2a7 100644
--- a/themes/bartik/color/preview.js
+++ b/themes/bartik/color/preview.js
@@ -22,7 +22,7 @@
       $('#preview #preview-sidebar #preview-block', form).css('border-color', $('#palette input[name="palette[sidebarborders]"]', form).val());
 
       // Footer wrapper background.
-      $('#preview #footer-wrapper', form).css('background-color', $('#palette input[name="palette[footer]"]', form).val());
+      $('#preview #preview-footer-wrapper', form).css('background-color', $('#palette input[name="palette[footer]"]', form).val());
 
       // CSS3 Gradients.
       var gradient_start = $('#palette input[name="palette[top]"]', form).val();