diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-01-15 20:54:03 +0000 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-01-15 20:54:03 +0000 |
| commit | 7233e89be621c2b9ad80b8a7eb2bc16185596cca (patch) | |
| tree | 0adedc8accd9f90ea26fd008d3c4f4cf371ef839 /theme | |
| parent | c42b88308683fccfc7710a39a363d98270ade39b (diff) | |
| parent | c08eadc774c2231e6b434ba067e2d7115404606f (diff) | |
Merge ../csarven into uiredesign
Conflicts:
lib/action.php
Diffstat (limited to 'theme')
| -rw-r--r-- | theme/base/css/display.css | 3 | ||||
| -rw-r--r-- | theme/identica/css/display.css | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 5fc24779b..8b2e2f801 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -127,6 +127,7 @@ font-weight:bold; address { float:left; margin-bottom:18px; +margin-left:18px; } address .fn, address .email { @@ -316,7 +317,7 @@ padding:18px 4px 18px 18px; #form_notice { width:384px; float:left; -margin-left:86px; +margin-left:68px; position:relative; line-height:1; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 4659c7f2a..f6a4747c7 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -83,16 +83,16 @@ background-repeat:no-repeat; background-position:0 45%; } #export_data li a.rss { -background-image:url(../images/icons/icon_rss.jpg); +background-image:url(../../base/images/icons/icon_rss.jpg); } #export_data li a.atom { -background-image:url(../images/icons/icon_atom.jpg); +background-image:url(../../base/images/icons/icon_atom.jpg); } #export_data li a.foaf { -background-image:url(../images/icons/icon_foaf.gif); +background-image:url(../../base/images/icons/icon_foaf.gif); =} #export_data li a.export_vcard { -background-image:url(../images/icons/icon_vcard.gif); +background-image:url(../../base/images/icons/icon_vcard.gif); } |