diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-02 09:57:50 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-02 09:57:50 -0800 |
| commit | f4c81fa1e138cbcbab27e6135f464a06d0209a37 (patch) | |
| tree | 6af05efd09b29f0a3600e6d77f563b3fa68c4ff0 /theme/base | |
| parent | 2be00ce64221197f3c8ad1458eba2488c8836e5c (diff) | |
| parent | 027c7e61fd6ecbb866a4f18111662902942d046e (diff) | |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'theme/base')
| -rw-r--r-- | theme/base/css/display.css | 6 | ||||
| -rw-r--r-- | theme/base/images/icons/icons-01.gif | bin | 3650 -> 3758 bytes | |||
| -rw-r--r-- | theme/base/images/icons/twotone/green/clear.gif | bin | 0 -> 82 bytes | |||
| -rw-r--r-- | theme/base/images/icons/twotone/green/flag.gif | bin | 0 -> 80 bytes | |||
| -rw-r--r-- | theme/base/logo.png | bin | 4988 -> 10107 bytes |
5 files changed, 5 insertions, 1 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 0d6395d05..b5cfab7e9 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -632,7 +632,8 @@ margin-bottom:18px; .entity_profile .entity_url, .entity_profile .entity_note, .entity_profile .entity_tags, -.entity_profile .entity_aliases { +.entity_profile .entity_aliases, +.entity_profile .entity_statistics { margin-left:113px; margin-bottom:4px; } @@ -1411,6 +1412,9 @@ margin-bottom:18px; .hentry .entry-content li li { margin-left:18px; } +.hentry .entry-content .form_settings ul { +margin-left:0; +} #content #plugin_authors { min-width:122px; diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif Binary files differindex f93d33d79..01a729c10 100644 --- a/theme/base/images/icons/icons-01.gif +++ b/theme/base/images/icons/icons-01.gif diff --git a/theme/base/images/icons/twotone/green/clear.gif b/theme/base/images/icons/twotone/green/clear.gif Binary files differnew file mode 100644 index 000000000..2666430ef --- /dev/null +++ b/theme/base/images/icons/twotone/green/clear.gif diff --git a/theme/base/images/icons/twotone/green/flag.gif b/theme/base/images/icons/twotone/green/flag.gif Binary files differnew file mode 100644 index 000000000..68c8aee25 --- /dev/null +++ b/theme/base/images/icons/twotone/green/flag.gif diff --git a/theme/base/logo.png b/theme/base/logo.png Binary files differindex 7c68b34f6..cf1839194 100644 --- a/theme/base/logo.png +++ b/theme/base/logo.png |
