summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-06-25 23:01:30 -0700
committerEvan Prodromou <evan@controlyourself.ca>2009-06-25 23:01:30 -0700
commit97ee517680979bf12e82eab99ecf943712fe97c9 (patch)
treec4084ec3baa49cf6127f41def896d14282cbb0a2
parent994768b82101fdd2a08a92e30967ded6714b87dc (diff)
parent74d9b0f820c588f2959457e83aaf5b9d4f2ea399 (diff)
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
-rw-r--r--js/userdesign.go.js5
-rw-r--r--theme/base/css/ie.css6
2 files changed, 8 insertions, 3 deletions
diff --git a/js/userdesign.go.js b/js/userdesign.go.js
index b54b492cc..833b19adc 100644
--- a/js/userdesign.go.js
+++ b/js/userdesign.go.js
@@ -89,11 +89,10 @@ $(document).ready(function() {
$('body').css({'background-image':'none'});
});
$('#design_background-image_on').focus(function() {
- var bis = $('#design_background-image_onoff img')[0].src;
- $('body').css({'background-image':'url('+bis+')'});
+ $('body').css({'background-image':'url('+$('#design_background-image_onoff img')[0].src+')'});
});
$('#design_background-image_repeat').click(function() {
($(this)[0].checked) ? $('body').css({'background-repeat':'repeat'}) : $('body').css({'background-repeat':'no-repeat'});
});
-}); \ No newline at end of file
+});
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index da200388e..43fb01492 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -19,6 +19,12 @@ display:block;
width:17%;
max-width:17%;
}
+#form_notice #notice_data-attach_selected {
+width:78.5%;
+}
+#form_notice #notice_data-attach_selected button {
+padding:0 4px;
+}
#anon_notice {
max-width:39%;
}