diff options
author | Craig Andrews <candrews@integralblue.com> | 2010-03-08 17:22:23 -0500 |
---|---|---|
committer | Craig Andrews <candrews@integralblue.com> | 2010-03-08 17:22:23 -0500 |
commit | 714d920faea302b55857cc3bec4e9e6160ea136a (patch) | |
tree | cffa5ee7a3261ad24b272cb3ced16a6c1dcafad1 /plugins/OStatus/theme/base/css/ostatus.css | |
parent | c187bf55974347f7ddb4f28714af57861dce8f08 (diff) | |
parent | 51a245f18c1e4a830c5eb94f3e60c6b4b3e560ee (diff) |
Merge branch '0.9.x' into 1.0.x
Conflicts:
classes/statusnet.ini
db/statusnet.sql
lib/jabber.php
lib/xmppmanager.php
Diffstat (limited to 'plugins/OStatus/theme/base/css/ostatus.css')
-rw-r--r-- | plugins/OStatus/theme/base/css/ostatus.css | 32 |
1 files changed, 29 insertions, 3 deletions
diff --git a/plugins/OStatus/theme/base/css/ostatus.css b/plugins/OStatus/theme/base/css/ostatus.css index feeeb47d3..c2d724158 100644 --- a/plugins/OStatus/theme/base/css/ostatus.css +++ b/plugins/OStatus/theme/base/css/ostatus.css @@ -38,11 +38,37 @@ display:none; min-width:96px; } -#subscriptions #entity_remote_subscribe { +#entity_remote_subscribe { padding:0; float:right; +position:relative; } -#subscriptions .entity_remote_subscribe { -float:right; +.section .entity_actions { +margin-bottom:0; +margin-right:7px; +} + +#entity_remote_subscribe .dialogbox { +width:405px; +} + +.aside #entity_subscriptions .more, +.aside #entity_groups .more { +float:left; +} + +.section #entity_remote_subscribe { +border:0; +} + +.section .entity_remote_subscribe { +color:#002FA7; +box-shadow:none; +-moz-box-shadow:none; +-webkit-box-shadow:none; +background-color:transparent; +background-position:0 -1183px; +padding:0 0 0 23px; +border:0; } |