Merge branch '0.9.x' into 1.0.x

7 files changed, 137 insertions, 4 deletions

diff --git a/theme/clean/css/display.css b/theme/clean/css/display.css
index be72993b5..260ee5926 100644
--- a/theme/clean/css/display.css
+++ b/theme/clean/css/display.css
@@ -117,7 +117,8 @@ address {
     top: 74px;
     right:0;
     height: 2.4em;
-    width: 106px;
+    width: 96px;
+    right: 10px;
 }
 
 #core {
diff --git a/theme/clean/css/ie.css b/theme/clean/css/ie.css
new file mode 100644
index 000000000..ede8f078a
--- /dev/null
+++ b/theme/clean/css/ie.css
@@ -0,0 +1,62 @@
+/* IE specific styles */
+
+/* base theme overrides */
+
+input.checkbox,
+input.radio {
+top:0;
+}
+.form_notice textarea {
+    width: 364px;
+}
+.form_notice .form_note + label {
+position:absolute;
+top:25px;
+left:83%;
+text-indent:-9999px;
+height:16px;
+width:16px;
+display:block;
+        top: 31px;
+        right: 88px;
+}
+.form_notice #notice_action-submit {
+    width: 96px;
+    max-width: 96px;
+}
+.form_notice #notice_data-attach_selected,
+.form_notice #notice_data-geo_selected {
+width:78.75%;
+}
+.form_notice #notice_data-attach_selected button,
+.form_notice #notice_data-geo_selected button {
+padding:0 4px;
+}
+.notice-options input.submit {
+font-size:0;
+text-align:right;
+text-indent:0;
+}
+.notice div.entry-content .timestamp a {
+margin-right:4px;
+}
+.entity_profile {
+width:64%;
+}
+.notice {
+z-index:1;
+}
+.notice:hover {
+z-index:9999;
+}
+.notice .thumbnail img {
+z-index:9999;
+}
+
+.form_settings fieldset fieldset legend {
+line-height:auto;
+}
+
+.form_notice #notice_data-attach {
+filter: alpha(opacity=0);
+}
diff --git a/theme/rebase/css/display.css b/theme/rebase/css/display.css
index bc0b5a4f2..b532be5d0 100644
--- a/theme/rebase/css/display.css
+++ b/theme/rebase/css/display.css
@@ -196,6 +196,7 @@ address .poweredby {
     width: 485px;
     height: 63px;
     padding-bottom: 15px;
+    z-index: 9;
 }
 
 .form_notice label[for=notice_data-attach],
diff --git a/theme/rebase/css/ie.css b/theme/rebase/css/ie.css
index 48b5cd6af..88985efb7 100644
--- a/theme/rebase/css/ie.css
+++ b/theme/rebase/css/ie.css
@@ -58,3 +58,8 @@ z-index:9999;
 .form_settings fieldset fieldset legend {
 line-height:auto;
 }
+
+
+.form_notice #notice_data-attach {
+filter: alpha(opacity=0);
+}
diff --git a/theme/shiny/css/display.css b/theme/shiny/css/display.css
index 5b51b530d..ec98a049c 100644
--- a/theme/shiny/css/display.css
+++ b/theme/shiny/css/display.css
@@ -209,7 +209,8 @@ address {
     top: 74px;
     right:0;
     height: 2.4em;
-    width: 106px;
+    width: 96px;
+    right: 10px;
 }
 
 #content {
diff --git a/theme/shiny/css/ie.css b/theme/shiny/css/ie.css
index ca6c09d44..3c8e2230d 100644
--- a/theme/shiny/css/ie.css
+++ b/theme/shiny/css/ie.css
@@ -1,9 +1,72 @@
 /* IE specific styles */
 
+/* IE specific styles */
+
+/* base theme overrides */
+
+input.checkbox,
+input.radio {
+top:0;
+}
+.form_notice textarea {
+    width: 374px;
+}
+.form_notice .form_note + label {
+position:absolute;
+top:25px;
+left:83%;
+text-indent:-9999px;
+height:16px;
+width:16px;
+display:block;
+        top: 31px;
+        right: 88px;
+}
+.form_notice #notice_action-submit {
+    width: 96px;
+    max-width: 96px;
+}
+.form_notice #notice_data-attach_selected,
+.form_notice #notice_data-geo_selected {
+width:78.75%;
+}
+.form_notice #notice_data-attach_selected button,
+.form_notice #notice_data-geo_selected button {
+padding:0 4px;
+}
+.notice-options input.submit {
+font-size:0;
+text-align:right;
+text-indent:0;
+}
+.notice div.entry-content .timestamp a {
+margin-right:4px;
+}
+.entity_profile {
+width:64%;
+}
+.notice {
+z-index:1;
+}
+.notice:hover {
+z-index:9999;
+}
+.notice .thumbnail img {
+z-index:9999;
+}
+
+.form_settings fieldset fieldset legend {
+line-height:auto;
+}
+
+.form_notice #notice_data-attach {
+filter: alpha(opacity=0);
+}
+
 #wrap {
-	background-color: #c9c9c9;
+    background: url(../images/wrap_bg.png) repeat top left;
 }
 
 #aside_primary .section {
-    background-color: #c9c9c9;
+    background: url(../images/wrap_bg.png) repeat top left;
 }
diff --git a/theme/shiny/images/wrap_bg.png b/theme/shiny/images/wrap_bg.png
new file mode 100644
index 000000000..ce9e4ecee
--- /dev/null
+++ b/theme/shiny/images/wrap_bg.png