- Patch #862854 by rjgoldsborough, tim.plunkett, reglogge, Jeff Burnz, amateescu, theresaanna, yoroy: no styling for sticky.

4 files changed, 18 insertions, 7 deletions

diff --git a/themes/bartik/css/ie.css b/themes/bartik/css/ie.css
index e2c6b6044..cb6f99829 100644
--- a/themes/bartik/css/ie.css
+++ b/themes/bartik/css/ie.css
@@ -60,3 +60,6 @@ fieldset legend {
 #footer-wrapper a:focus {
   color: #fefefe;
 }
+.node-teaser {
+  margin-top: 10px;
+}
diff --git a/themes/bartik/css/ie6.css b/themes/bartik/css/ie6.css
index ea11867db..ab31b164b 100644
--- a/themes/bartik/css/ie6.css
+++ b/themes/bartik/css/ie6.css
@@ -7,17 +7,13 @@
   width: 50%;
 }
 .tabs ul.primary,
-.region-header .block-menu li a {
+.region-header .block-menu li a,
+.comment-form .form-item {
   zoom: 1;
 }
 #block-search-form .form-item-search-block-form input {
   width: 67%;
 }
-.node-sticky {
-  background: transparent;
-  border: none;
-  padding: 0 0 15px;
-}
 .node-teaser {
   border-bottom: 1px solid #d3d7d9;
 }
diff --git a/themes/bartik/css/style.css b/themes/bartik/css/style.css
index 65049e25f..85954601d 100644
--- a/themes/bartik/css/style.css
+++ b/themes/bartik/css/style.css
@@ -521,6 +521,10 @@ h1#page-title {
 .node-teaser .content {
   font-size: 1em;
 }
+.node-teaser h2 {
+  margin-top: 0;
+  padding-top: 0.5em;
+}
 .node-teaser h2 a {
   color: #181818;
 }
@@ -529,12 +533,17 @@ h1#page-title {
   margin-bottom: 30px;
   padding-bottom: 15px;
 }
-.node-teaser.node-sticky {
+.node-sticky {
   background: #f9f9f9;
   background: rgba(0, 0, 0, 0.024);
   border: 1px solid #d3d7d9;
   padding: 0 15px 15px;
 }
+.node-full {
+  background: none;
+  border: none;
+  padding: 0;
+}
 .node-teaser .content {
   clear: none;
   line-height: 1.6;
diff --git a/themes/bartik/template.php b/themes/bartik/template.php
index a3393a426..d60aeb6a5 100644
--- a/themes/bartik/template.php
+++ b/themes/bartik/template.php
@@ -107,6 +107,9 @@ function bartik_process_maintenance_page(&$variables) {
  */
 function bartik_preprocess_node(&$variables) {
   $variables['submitted'] = t('published by !username on !datetime', array('!username' => $variables['name'], '!datetime' => $variables['date']));
+  if ($variables['view_mode'] == 'full' && node_is_page($variables['node'])) {
+    $variables['classes_array'][] = 'node-full';
+  }
 }
 
 /**