diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-12-11 21:37:41 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-12-11 21:37:41 +0000 |
| commit | 3361b3bfc26c8deb23f439ff7ecf8db6b8df0845 (patch) | |
| tree | 115a11e62504e5241db03a25f21a03100790f70c /themes | |
| parent | b9a0db2fb29a826d8319631cf24418a23e397e8e (diff) | |
| download | brdo-3361b3bfc26c8deb23f439ff7ecf8db6b8df0845.tar.gz brdo-3361b3bfc26c8deb23f439ff7ecf8db6b8df0845.tar.bz2 | |
#987102 by Jeff Burnz, tim.plunkett: Fixed Preview logo not removed when logo theme setting is off in Bartik
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/bartik/color/preview.css | 3 | ||||
| -rw-r--r-- | themes/bartik/color/preview.js | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/themes/bartik/color/preview.css b/themes/bartik/color/preview.css index c7c383b53..7377eb7f7 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 bfdadd2a7..37d3b80f0 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()); |