Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

3 files changed, 41 insertions, 10 deletions

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index d876460e1..0bb3479cc 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -554,34 +554,54 @@ width:81.5%;
 margin-bottom:0;
 line-height:1.618;
 }
-.form_notice #notice_data-attach_selected code {
+.form_notice #notice_data-attach_selected code,
+.form_notice #notice_data-location_name {
 float:left;
-width:90%;
+width:80%;
 display:block;
-font-size:1.1em;
 line-height:1.8;
 overflow:auto;
+margin-right:2.5%;
+}
+.form_notice #notice_data-attach_selected code {
+font-size:1.1em;
 }
-.form_notice #notice_data-attach_selected button {
+.form_notice #notice_data-attach_selected button.close,
+.form_notice #notice_data-geo_selected button.close {
 float:right;
 font-size:0.8em;
 }
-.form_notice #notice_data-location_wrap input {
-margin-right:7px;
+,
+.form_notice #notice_data-geo_selected button.minimize {
 float:left;
-top:3px;
+}
+
+.form_notice #notice_data-location_wrap label {
+position:absolute;
+top:25px;
+right:4px;
+left:auto;
+cursor:pointer;
+width:16px;
+height:16px;
+display:block;
+}
+.form_notice #notice_data-location_wrap input {
+display:none;
 }
 .form_notice #notice_data-location_wrap label {
 font-weight:normal;
 font-size:1em;
+margin-bottom:0;
+text-indent:-9999px;
 }
 .form_notice #notice_data-location_name {
 display:block;
-line-height:1.6;
 padding-left:21px;
 }
 
-button.close {
+button.close,
+button.minimize {
 width:16px;
 height:16px;
 text-indent:-9999px;
diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif
index cda932161..06202a047 100644
--- a/theme/base/images/icons/icons-01.gif
+++ b/theme/base/images/icons/icons-01.gif
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 34be6eefa..a3e0f7ec3 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -117,6 +117,12 @@ background-position:0 47%;
 .form_notice a#notice_data-location_name {
 background-position:0 -1711px;
 }
+.form_notice label[for=notice_data-geo] {
+background-position:0 -1780px;
+}
+.form_notice label[for=notice_data-geo].checked {
+background-position:0 -1846px;
+}
 
 a,
 .form_settings input.form_action-primary,
@@ -185,7 +191,9 @@ button.close,
 .entity_silence input.submit,
 .entity_delete input.submit,
 .notice-options .repeated,
-.form_notice a#notice_data-location_name {
+.form_notice a#notice_data-location_name,
+.form_notice label[for=notice_data-geo],
+button.minimize {
 background-image:url(../../base/images/icons/icons-01.gif);
 background-repeat:no-repeat;
 background-color:transparent;
@@ -246,6 +254,9 @@ background-color:#EFF3DC;
 button.close {
 background-position:0 -1120px;
 }
+button.minimize {
+background-position:0 -1912px;
+}
 
 #anon_notice {
 background-color:#87B4C8;