summaryrefslogtreecommitdiff
path: root/theme/base
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-01-01 11:30:44 -1000
committerEvan Prodromou <evan@status.net>2010-01-01 11:30:44 -1000
commit2851296c8df7ad8fb9394d9d087ce04867e30d92 (patch)
tree8a4f02707ca7a9d11bedd1ed83a5fd9b607e2cf1 /theme/base
parenta9d835920824c48caef2a66686d6605ff54586b3 (diff)
parent1b3917c6a7f3f12394e93f5388210df185b419e7 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'theme/base')
-rw-r--r--theme/base/css/display.css5
-rw-r--r--theme/base/images/icons/icon_geo.pngbin0 -> 894 bytes
-rw-r--r--theme/base/images/icons/icons-01.gifbin3201 -> 3443 bytes
3 files changed, 2 insertions, 3 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index d6a50ac60..d876460e1 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -569,6 +569,7 @@ font-size:0.8em;
.form_notice #notice_data-location_wrap input {
margin-right:7px;
float:left;
+top:3px;
}
.form_notice #notice_data-location_wrap label {
font-weight:normal;
@@ -577,9 +578,7 @@ font-size:1em;
.form_notice #notice_data-location_name {
display:block;
line-height:1.6;
-}
-.form_notice span#notice_data-location_name {
-padding-left:18px;
+padding-left:21px;
}
button.close {
diff --git a/theme/base/images/icons/icon_geo.png b/theme/base/images/icons/icon_geo.png
new file mode 100644
index 000000000..8df245699
--- /dev/null
+++ b/theme/base/images/icons/icon_geo.png
Binary files differ
diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif
index 417327881..cda932161 100644
--- a/theme/base/images/icons/icons-01.gif
+++ b/theme/base/images/icons/icons-01.gif
Binary files differ