diff options
author | Brion Vibber <brion@pobox.com> | 2010-10-04 12:54:36 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-10-04 12:54:36 -0700 |
commit | 59119482ca34540bd7f0a2a1aa994de1d5328ea2 (patch) | |
tree | 864fdc9dda3da54a78d868339c32479b5296b6d0 /theme/shiny/css/mp-screen.css | |
parent | 2db8aa3ec3f6804f8f16efe754aafb149f4035c9 (diff) | |
parent | 1652ded48c9c62c40157a5142e5231adbc574ddb (diff) |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
actions/hostmeta.php
actions/imsettings.php
classes/User.php
lib/adminpanelaction.php
lib/channel.php
lib/default.php
lib/router.php
lib/util.php
Diffstat (limited to 'theme/shiny/css/mp-screen.css')
-rw-r--r-- | theme/shiny/css/mp-screen.css | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/theme/shiny/css/mp-screen.css b/theme/shiny/css/mp-screen.css new file mode 100644 index 000000000..c9fb6dcc4 --- /dev/null +++ b/theme/shiny/css/mp-screen.css @@ -0,0 +1,7 @@ +/* just a placeholder for now */ + +address img + .fn { +display:block; +margin-top:1em; +float:left; +} |