From 3361b3bfc26c8deb23f439ff7ecf8db6b8df0845 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Sat, 11 Dec 2010 21:37:41 +0000
Subject: [PATCH] #987102 by Jeff Burnz, tim.plunkett: Fixed Preview logo not
removed when logo theme setting is off in Bartik
---
themes/bartik/color/preview.css | 3 ++-
themes/bartik/color/preview.js | 4 ++++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/themes/bartik/color/preview.css b/themes/bartik/color/preview.css
index c7c383b532a1..7377eb7f7517 100644
--- a/themes/bartik/color/preview.css
+++ b/themes/bartik/color/preview.css
@@ -29,7 +29,7 @@ html.js #preview {
}
#preview-logo {
float: left;
- padding: 15px 30px 15px 10px;
+ padding: 15px 15px 15px 10px;
}
#preview-site-name {
color: #686868;
@@ -37,6 +37,7 @@ html.js #preview {
font-size: 1.821em;
line-height: 1;
margin-bottom: 30px;
+ margin-left: 15px;
padding-top: 34px;
}
#preview-main-menu {
diff --git a/themes/bartik/color/preview.js b/themes/bartik/color/preview.js
index bfdadd2a70c2..37d3b80f0f4e 100644
--- a/themes/bartik/color/preview.js
+++ b/themes/bartik/color/preview.js
@@ -9,6 +9,10 @@
$('#preview #preview-logo img').attr('src', Drupal.settings.color.logo);
this.logoChanged = true;
}
+ // Remove the logo if the setting is toggled off.
+ if (Drupal.settings.color.logo == null) {
+ $('div').remove('#preview-logo');
+ }
// Solid background.
$('#preview', form).css('backgroundColor', $('#palette input[name="palette[bg]"]', form).val());
--
GitLab