diff options
| author | Evan Prodromou <git@evanprodromou.name> | 2009-01-23 11:52:05 +0100 |
|---|---|---|
| committer | Evan Prodromou <git@evanprodromou.name> | 2009-01-23 11:52:05 +0100 |
| commit | 8638479cb6287a4c22e485ba71fab4b12a6fc40f (patch) | |
| tree | d6a65cb989fe3c92f27d9c937878f6c7b847fdf0 | |
| parent | 447e2b8e353398c7b42c8e7449c98ffce9af3e9b (diff) | |
| parent | 1e5ad33f7232a64ba847387587ea7efd41c4c7c3 (diff) | |
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
| -rw-r--r-- | actions/grouplogo.php | 2 | ||||
| -rw-r--r-- | theme/base/css/display.css | 8 | ||||
| -rw-r--r-- | theme/base/css/facebookapp.css | 4 |
3 files changed, 13 insertions, 1 deletions
diff --git a/actions/grouplogo.php b/actions/grouplogo.php index 393070d5d..fe42ab36c 100644 --- a/actions/grouplogo.php +++ b/actions/grouplogo.php @@ -182,7 +182,7 @@ class GrouplogoAction extends Action $this->elementStart('form', array('enctype' => 'multipart/form-data', 'method' => 'post', - 'id' => 'form_settings_logo', + 'id' => 'form_settings_avatar', 'class' => 'form_settings', 'action' => common_local_url('grouplogo', diff --git a/theme/base/css/display.css b/theme/base/css/display.css index f8dbd7941..36e72a74f 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -666,6 +666,8 @@ margin-bottom:0; .section .entities li .fn { display:none; } + +.aside .section p, .aside .section .more { clear:both; } @@ -944,6 +946,12 @@ padding-left:20px; } +.pagination { +float:left; +clear:both; +width:100%; +margin-top:18px; +} .pagination dt { font-weight:bold; diff --git a/theme/base/css/facebookapp.css b/theme/base/css/facebookapp.css new file mode 100644 index 000000000..0d8c879cd --- /dev/null +++ b/theme/base/css/facebookapp.css @@ -0,0 +1,4 @@ +@import url("display.css"); +@import url("../../identica/css/display.css"); + +span.facebook-button { border: 2px solid #777; padding: 5px; display: block; float: left; margin-right: 20px; -moz-border-radius: 4px; border-radius:4px; -webkit-border-radius:4px; font-weight: bold; background-color:#A9BF4F; color:#fff; font-size:1.2em } |