From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Sun, 12 Apr 2009 21:50:57 +0000 (+0000)
Subject: Merge branch '0.7.x' into 0.8.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2341f99224a0809a14bfb2832d9889ca3aceb6e2;p=quix0rs-gnu-social.git

Merge branch '0.7.x' into 0.8.x
---

2341f99224a0809a14bfb2832d9889ca3aceb6e2
diff --cc theme/default/base/css/display.css
index ec9e6097fa,0000000000..1440a60b40
mode 100644,000000..100644
--- a/theme/default/base/css/display.css
+++ b/theme/default/base/css/display.css
@@@ -1,1161 -1,0 +1,1163 @@@
 +/** theme: base
 + *
 + * @package   Laconica
 + * @author Sarven Capadisli <csarven@controlyourself.ca>
 + * @copyright 2009 Control Yourself, Inc.
 + * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
 + * @link      http://laconi.ca/
 + */
 +
 +* { margin:0; padding:0; }
 +img { display:block; border:0; }
 +a abbr { cursor: pointer; border-bottom:0; }
 +table { border-collapse:collapse; }
 +ol { list-style-position:inside; }
 +html { font-size: 87.5%; background-color:#fff; height:100%; }
 +body {
 +background-color:#fff;
 +color:#000;
 +font-family:sans-serif;
 +font-size:1em;
 +line-height:1.65;
 +position:relative;
 +}
 +h1,h2,h3,h4,h5,h6 {
 +margin-bottom:7px;
 +overflow:hidden;
 +}
 +h1 {
 +font-size:1.4em;
 +margin-bottom:18px;
 +}
 +h2 { font-size:1.3em; }
 +h3 { font-size:1.2em; }
 +h4 { font-size:1.1em; }
 +h5 { font-size:1em; }
 +h6 { font-size:0.9em; }
 +
 +caption {
 +font-weight:bold;
 +}
 +legend {
 +font-weight:bold;
 +font-size:1.3em;
 +}
 +input, textarea, select, option {
 +padding:4px;
 +font-family:sans-serif;
 +font-size:1em;
 +}
 +input, textarea, select {
 +border-width:2px;
 +border-style: solid;
 +border-radius:4px;
 +-moz-border-radius:4px;
 +-webkit-border-radius:4px;
 +}
 +
 +input.submit {
 +font-weight:bold;
 +cursor:pointer;
 +}
 +textarea {
 +overflow:auto;
 +}
 +option {
 +padding-bottom:0;
 +}
 +fieldset {
 +padding:0;
 +border:0;
 +}
 +form ul li {
 +list-style-type:none;
 +margin:0 0 18px 0;
 +}
 +form label {
 +font-weight:bold;
 +}
 +input.checkbox {
 +position:relative;
 +top:2px;
 +left:0;
 +border:0;
 +}
 +
 +.error,
 +.success {
 +padding:4px 7px;
 +border-radius:4px;
 +-moz-border-radius:4px;
 +-webkit-border-radius:4px;
 +margin-bottom:18px;
 +}
 +form label.submit {
 +display:none;
 +}
 +
 +.form_settings {
 +clear:both;
 +}
 +
 +.form_settings fieldset {
 +margin-bottom:29px;
 +}
 +.form_settings input.remove {
 +margin-left:11px;
 +}
 +.form_settings .form_data li {
 +width:100%;
 +float:left;
 +}
 +.form_settings .form_data label {
 +float:left;
 +}
 +.form_settings .form_data textarea,
 +.form_settings .form_data select,
 +.form_settings .form_data input {
 +margin-left:11px;
 +float:left;
 +}
 +.form_settings .form_data input.submit {
 +margin-left:0;
 +}
 +
 +.form_settings label {
 +margin-top:2px;
 +width:152px;
 +}
 +
 +.form_actions label {
 +display:none;
 +}
 +.form_guide {
 +font-style:italic;
 +}
 +
 +.form_settings #settings_autosubscribe label {
 +display:inline;
 +font-weight:bold;
 +}
 +
 +#form_settings_profile legend,
 +#form_login legend,
 +#form_register legend,
 +#form_password legend,
 +#form_settings_avatar legend,
 +#newgroup legend,
 +#editgroup legend,
 +#form_tag_user legend,
 +#form_remote_subscribe legend,
 +#form_openid_login legend,
 +#form_search legend,
 +#form_invite legend,
 +#form_notice_delete legend,
 +#form_password_recover legend,
 +#form_password_change legend {
 +display:none;
 +}
 +
 +.form_settings .form_data p.form_guide {
 +clear:both;
 +margin-left:163px;
 +margin-bottom:0;
 +}
 +
 +.form_settings p {
 +margin-bottom:11px;
 +}
 +
 +.form_settings input.checkbox {
 +margin-top:3px;
 +margin-left:0;
 +}
 +.form_settings label.checkbox {
 +font-weight:normal;
 +margin-top:0;
 +margin-right:0;
 +margin-left:11px;
 +float:left;
 +width:90%;
 +}
 +
 +
 +#form_login p.form_guide,
 +#form_register #settings_rememberme p.form_guide,
 +#form_openid_login #settings_rememberme p.form_guide,
 +#settings_twitter_remove p.form_guide,
 +#form_search ul.form_data #q {
 +margin-left:0;
 +}
 +
 +.form_settings .form_note {
 +border-radius:4px;
 +-moz-border-radius:4px;
 +-webkit-border-radius:4px;
 +padding:0 7px;
 +}
 +
 +
 +.form_settings input.form_action-secondary {
 +margin-left:29px;
 +padding:0;
 +}
 +
 +#form_search .submit {
 +margin-left:11px;
 +}
 +
 +address {
 +float:left;
 +margin-bottom:18px;
 +margin-left:18px;
 +}
 +address.vcard img.logo {
 +margin-right:0;
 +}
 +address .fn {
 +font-weight:bold;
 +}
 +address img + .fn {
 +display:none;
 +}
 +
 +#header {
 +width:100%;
 +position:relative;
 +float:left;
 +padding-top:18px;
 +margin-bottom:29px;
 +}
 +
 +#site_nav_global_primary {
 +float:right;
 +margin-right:18px;
 +margin-bottom:11px;
 +margin-left:18px;
 +}
 +#site_nav_global_primary ul li {
 +display:inline;
 +margin-left:11px;
 +}
 +
 +.system_notice dt {
 +font-weight:bold;
 +text-transform:uppercase;
 +display:none;
 +}
 +
 +#site_notice {
 +position:absolute;
 +top:65px;
 +right:18px;
 +width:250px;
 +width:24%;
 +}
 +#page_notice {
 +clear:both;
 +margin-bottom:18px;
 +}
 +
 +
 +#anon_notice {
 +float:left;
 +width:43.2%;
 +padding:1.1%;
 +border-radius:7px;
 +-moz-border-radius:7px;
 +-webkit-border-radius:7px;
 +border-width:2px;
 +border-style:solid;
 +line-height:1.5;
 +font-size:1.1em;
 +font-weight:bold;
 +}
 +
 +
 +#footer {
 +float:left;
 +width:64%;
 +padding:18px;
 +}
 +
 +#site_nav_local_views {
 +width:100%;
 +float:left;
 +}
 +#site_nav_local_views dt {
 +display:none;
 +}
 +#site_nav_local_views li {
 +float:left;
 +margin-right:18px;
 +list-style-type:none;
 +}
 +#site_nav_local_views a {
 +float:left;
 +text-decoration:none;
 +padding:4px 11px;
 +-moz-border-radius-topleft:4px;
 +-moz-border-radius-topright:4px;
 +-webkit-border-top-left-radius:4px;
 +-webkit-border-top-right-radius:4px;
 +border-width:1px;
 +border-style:solid;
 +border-bottom:0;
 +text-shadow: 2px 2px 2px #ddd;
 +font-weight:bold;
 +}
 +#site_nav_local_views .nav {
 +float:left;
 +width:100%;
 +}
 +
 +#site_nav_global_primary dt,
 +#site_nav_global_secondary dt {
 +display:none;
 +}
 +
 +#site_nav_global_secondary {
 +margin-bottom:11px;
 +}
 +
 +#site_nav_global_secondary ul li {
 +display:inline;
 +margin-right:11px;
 +}
 +#export_data li a {
 +padding-left:20px;
 +}
 +#export_data li a.foaf {
 +padding-left:30px;
 +}
 +#export_data li a.export_vcard {
 +padding-left:28px;
 +}
 +
 +#export_data ul {
 +display:inline;
 +}
 +#export_data li {
 +list-style-type:none;
 +display:inline;
 +margin-left:11px;
 +}
 +#export_data li:first-child {
 +margin-left:0;
 +}
 +
 +#licenses {
 +font-size:0.9em;
 +}
 +
 +#licenses dt {
 +font-weight:bold;
 +display:none;
 +}
 +#licenses dd {
 +margin-bottom:11px;
 +line-height:1.5;
 +}
 +
 +#site_content_license_cc {
 +margin-bottom:0;
 +}
 +#site_content_license_cc img {
 +display:inline;
 +vertical-align:top;
 +margin-right:4px;
 +}
 +
 +#wrap {
 +margin:0 auto;
 +width:100%;
 +min-width:760px;
 +max-width:1003px;
 +overflow:hidden;
 +}
 +
 +#core {
 +position:relative;
 +width:100%;
 +float:left;
 +margin-bottom:1em;
 +}
 +
 +#content {
 +width:64.009%;
 +min-height:259px;
 +padding:1.795%;
 +float:left;
 +border-radius:7px;
 +-moz-border-radius:7px;
 +-moz-border-radius-topleft:0;
 +-webkit-border-radius:7px;
 +-webkit-border-top-left-radius:0;
 +border-style:solid;
 +border-width:1px;
 +}
 +
 +#content_inner {
 +position:relative;
 +width:100%;
 +float:left;
 +}
 +
 +#aside_primary {
 +width:27.917%;
 +min-height:259px;
 +float:left;
 +margin-left:0.385%;
 +padding:1.795%;
 +border-radius:7px;
 +-moz-border-radius:7px;
 +-webkit-border-radius:7px;
 +border-width:1px;
 +border-style:solid;
 +}
 +
 +#form_notice {
 +width:45.664%;
 +float:left;
 +position:relative;
 +line-height:1;
 +}
 +#form_notice fieldset {
 +border:0;
 +padding:0;
 +}
 +#form_notice legend {
 +display:none;
 +}
 +#form_notice textarea {
 +float:left;
 +border-radius:7px;
 +-moz-border-radius:7px;
 +-webkit-border-radius:7px;
 +width:80.789%;
 +height:67px;
 +line-height:1.5;
 +padding:7px 7px 16px 7px;
 +}
 +#form_notice label {
 +display:block;
 +float:left;
 +font-size:1.3em;
 +margin-bottom:7px;
 +}
 +#form_notice #notice_submit label {
 +display:none;
 +}
 +#form_notice .form_note {
 +position:absolute;
 +top:99px;
 +right:98px;
 +z-index:9;
 +}
 +#form_notice .form_note dt {
 +font-weight:bold;
 +display:none;
 +}
 +#notice_text-count {
 +font-weight:bold;
 +line-height:1.15;
 +padding:1px 2px;
 +}
 +#form_notice #notice_action-submit {
 +width:14%;
 +height:47px;
 +padding:0;
 +position:absolute;
 +bottom:0;
 +right:0;
 +}
 +#form_notice label[for=to] {
 +margin-top:7px;
 +}
 +#form_notice select[id=to] {
 +margin-bottom:7px;
 +margin-left:18px;
 +float:left;
 +}
 +
 +
 +/* entity_profile */
 +.entity_profile {
 +position:relative;
 +width:67.702%;
 +min-height:123px;
 +float:left;
 +margin-bottom:18px;
 +margin-left:0;
 +overflow:hidden;
 +}
 +.entity_profile dt,
 +#entity_statistics dt {
 +font-weight:bold;
 +}
 +.entity_profile dd {
 +display:inline;
 +}
 +
 +.entity_profile .entity_depiction {
 +float:left;
 +width:96px;
 +margin-right:18px;
 +margin-bottom:18px;
 +}
 +
 +.entity_profile .entity_fn,
 +.entity_profile .entity_nickname,
 +.entity_profile .entity_location,
 +.entity_profile .entity_url,
 +.entity_profile .entity_note,
 +.entity_profile .entity_tags {
 +margin-left:113px;
 +margin-bottom:4px;
 +}
 +
 +.entity_profile .entity_fn,
 +.entity_profile .entity_nickname {
 +margin-left:11px;
 +display:inline;
 +font-weight:bold;
 +}
 +.entity_profile .entity_nickname {
 +margin-left:0;
 +}
 +
 +.entity_profile .entity_fn dd:before {
 +content: "(";
 +font-weight:normal;
 +}
 +.entity_profile .entity_fn dd:after {
 +content: ")";
 +font-weight:normal;
 +}
 +
 +.entity_profile dt {
 +display:none;
 +}
 +.entity_profile h2 {
 +display:none;
 +}
 +/* entity_profile */
 +
 +
 +/*entity_actions*/
 +.entity_actions {
 +float:right;
 +margin-left:4.35%;
 +max-width:25%;
 +}
 +.entity_actions h2 {
 +display:none;
 +}
 +.entity_actions ul {
 +list-style-type:none;
 +}
 +.entity_actions li {
 +margin-bottom:4px;
 +}
 +.entity_actions li:first-child {
 +border-top:0;
 +}
 +.entity_actions fieldset {
 +border:0;
 +padding:0;
 +}
 +.entity_actions legend {
 +display:none;
 +}
 +
 +.entity_actions input.submit {
 +display:block;
 +text-align:left;
 +width:100%;
 +}
 +.entity_actions a,
 +.entity_nudge p,
 +.entity_remote_subscribe {
 +text-decoration:none;
 +font-weight:bold;
 +display:block;
 +}
 +
 +.form_user_block input.submit,
 +.form_user_unblock input.submit,
 +.entity_send-a-message a,
 +.entity_edit a,
 +.form_user_nudge input.submit,
 +.entity_nudge p {
 +border:0;
 +padding-left:20px;
 +}
 +
 +.entity_edit a,
 +.entity_send-a-message a,
 +.entity_nudge p {
 +padding:4px 4px 4px 23px;
 +}
 +
 +.entity_remote_subscribe {
 +padding:4px;
 +border-width:2px;
 +border-style:solid;
 +border-radius:4px;
 +-moz-border-radius:4px;
 +-webkit-border-radius:4px;
 +}
- 
++.entity_actions .accept {
++margin-bottom:18px;
++}
 +
 +.entity_tags ul {
 +list-style-type:none;
 +display:inline;
 +}
 +.entity_tags li {
 +display:inline;
 +margin-right:4px;
 +}
 +
 +.aside .section {
 +margin-bottom:29px;
 +clear:both;
 +float:left;
 +width:100%;
 +}
 +.aside .section h2 {
 +text-transform:uppercase;
 +font-size:1em;
 +}
 +
 +#entity_statistics dt,
 +#entity_statistics dd {
 +display:inline;
 +}
 +#entity_statistics dt:after {
 +content: ":";
 +}
 +
 +.section ul.entities {
 +float:left;
 +width:100%;
 +}
 +.section .entities li {
 +list-style-type:none;
 +float:left;
 +margin-right:7px;
 +margin-bottom:7px;
 +}
 +.section .entities li .photo {
 +margin-right:0;
 +margin-bottom:0;
 +}
 +.section .entities li .fn {
 +display:none;
 +}
 +
 +.aside .section p,
 +.aside .section .more {
 +clear:both;
 +}
 +
 +.profile .entity_profile {
 +margin-bottom:0;
 +min-height:60px;
 +}
 +
 +
 +.profile .form_group_join legend,
 +.profile .form_group_leave legend,
 +.profile .form_user_subscribe legend,
 +.profile .form_user_unsubscribe legend {
 +display:none;
 +}
 +
 +.profiles {
 +list-style-type:none;
 +}
 +.profile .entity_profile .entity_location {
 +width:auto;
 +clear:none;
 +margin-left:11px;
 +}
 +.profile .entity_profile dl,
 +.profile .entity_profile dd {
 +display:inline;
 +float:none;
 +}
 +.profile .entity_profile .entity_note,
 +.profile .entity_profile .entity_url,
 +.profile .entity_profile .entity_tags,
 +.profile .entity_profile .form_subscription_edit {
 +margin-left:59px;
 +clear:none;
 +display:block;
 +width:auto;
 +}
 +.profile .entity_profile .entity_tags dt {
 +display:inline;
 +margin-right:11px;
 +}
 +
 +
 +.profile .entity_profile .form_subscription_edit label {
 +font-weight:normal;
 +margin-right:11px;
 +}
 +
 +
 +/* NOTICE */
 +.notice,
 +.profile {
 +position:relative;
 +padding-top:11px;
 +padding-bottom:11px;
 +clear:both;
 +float:left;
 +width:100%;
 +border-top-width:1px;
 +border-top-style:dotted;
 +}
 +.notices li {
 +list-style-type:none;
 +}
 +.notices li.hover {
 +border-radius:4px;
 +-moz-border-radius:4px;
 +-webkit-border-radius:4px;
 +}
 +
 +/* NOTICES */
 +#notices_primary {
 +float:left;
 +width:100%;
 +border-radius:7px;
 +-moz-border-radius:7px;
 +-webkit-border-radius:7px;
 +}
 +#notices_primary h2 {
 +display:none;
 +}
 +.notice-data a span {
 +display:block;
 +padding-left:28px;
 +}
 +
 +.notice .author {
 +margin-right:11px;
 +}
 +
 +.fn {
 +overflow:hidden;
 +}
 +
 +.notice .author .fn {
 +font-weight:bold;
 +}
 +
 +.notice .author .photo {
 +margin-bottom:0;
 +}
 +
 +.vcard .photo {
 +display:inline;
 +margin-right:11px;
 +margin-bottom:11px;
 +float:left;
 +}
 +.vcard .url {
 +text-decoration:none;
 +}
 +.vcard .url:hover {
 +text-decoration:underline;
 +}
 +
 +.notice .entry-title {
 +float:left;
 +width:100%;
 +overflow:hidden;
 +}
 +#shownotice .notice .entry-title {
 +font-size:2.2em;
 +}
 +
 +.notice p.entry-content {
 +display:inline;
 +}
 +
 +#content .notice p.entry-content a:visited {
 +border-radius:4px;
 +-moz-border-radius:4px;
 +-webkit-border-radius:4px;
 +}
 +.notice p.entry-content .vcard a {
 +border-radius:4px;
 +-moz-border-radius:4px;
 +-webkit-border-radius:4px;
 +}
 +
 +.notice div.entry-content {
 +clear:left;
 +float:left;
 +font-size:0.95em;
 +margin-left:59px;
 +width:70%;
 +}
 +#showstream .notice div.entry-content {
 +margin-left:0;
 +}
 +
 +.notice .notice-options a,
 +.notice .notice-options input {
 +float:left;
 +font-size:1.025em;
 +}
 +
 +.notice div.entry-content dl,
 +.notice div.entry-content dt,
 +.notice div.entry-content dd {
 +display:inline;
 +}
 +
 +.notice div.entry-content .timestamp dt,
 +.notice div.entry-content .response dt {
 +display:none;
 +}
 +.notice div.entry-content .timestamp a {
 +display:inline-block;
 +}
 +.notice div.entry-content .device dt {
 +text-transform:lowercase;
 +}
 +
 +
 +
 +.notice-data {
 +position:absolute;
 +top:18px;
 +right:0;
 +min-height:50px;
 +margin-bottom:4px;
 +}
 +.notice .entry-content .notice-data dt {
 +display:none;
 +}
 +
 +.notice-data a {
 +display:block;
 +outline:none;
 +}
 +
 +.notice-options {
 +padding-left:2%;
 +float:left;
 +width:50%;
 +position:relative;
 +font-size:0.95em;
 +width:12.5%;
 +float:right;
 +}
 +
 +.notice-options a {
 +float:left;
 +}
 +.notice-options .notice_delete,
 +.notice-options .notice_reply,
 +.notice-options .form_favor,
 +.notice-options .form_disfavor {
 +position:absolute;
 +top:0;
 +}
 +.notice-options .form_favor,
 +.notice-options .form_disfavor {
 +left:0;
 +}
 +.notice-options .notice_reply {
 +left:29px;
 +}
 +.notice-options .notice_delete {
 +right:0;
 +}
 +.notice-options .notice_reply dt {
 +display:none;
 +}
 +
 +.notice-options input,
 +.notice-options a {
 +text-indent:-9999px;
 +outline:none;
 +}
 +
 +.notice-options .notice_reply a,
 +.notice-options input.submit {
 +display:block;
 +border:0;
 +}
 +.notice-options .notice_reply a,
 +.notice-options .notice_delete a {
 +text-decoration:none;
 +padding-left:16px;
 +}
 +
 +.notice-options form input.submit {
 +width:16px;
 +padding:2px 0;
 +}
 +
 +.notice-options .notice_delete dt,
 +.notice-options .form_favor legend,
 +.notice-options .form_disfavor legend {
 +display:none;
 +}
 +.notice-options .notice_delete fieldset,
 +.notice-options .form_favor fieldset,
 +.notice-options .form_disfavor fieldset {
 +border:0;
 +padding:0;
 +}
 +
 +
 +#new_group, #group_search {
 +margin-bottom:18px;
 +}
 +#new_group a {
 +padding-left:20px;
 +}
 +
 +
 +#filter_tags {
 +margin-bottom:11px;
 +float:left;
 +}
 +#filter_tags dt {
 +display:none;
 +}
 +#filter_tags ul {
 +list-style-type:none;
 +}
 +#filter_tags ul li {
 +float:left;
 +margin-left:7px;
 +padding-left:7px;
 +border-left-width:1px;
 +border-left-style:solid;
 +}
 +#filter_tags ul li.child_1 {
 +margin-left:0;
 +border-left:0;
 +padding-left:0;
 +}
 +#filter_tags ul li#filter_tags_all a {
 +font-weight:bold;
 +margin-top:7px;
 +float:left;
 +}
 +
 +#filter_tags ul li#filter_tags_item label {
 +margin-right:7px;
 +}
 +#filter_tags ul li#filter_tags_item label,
 +#filter_tags ul li#filter_tags_item select {
 +display:inline;
 +}
 +#filter_tags ul li#filter_tags_item p {
 +float:left;
 +margin-left:38px;
 +}
 +#filter_tags ul li#filter_tags_item input {
 +position:relative;
 +top:3px;
 +left:3px;
 +}
 +
 +
 +
 +.pagination {
 +float:left;
 +clear:both;
 +width:100%;
 +margin-top:18px;
 +}
 +
 +.pagination dt {
 +font-weight:bold;
 +display:none;
 +}
 +
 +.pagination .nav {
 +float:left;
 +width:100%;
 +list-style-type:none;
 +}
 +
 +.pagination .nav_prev {
 +float:left;
 +}
 +.pagination .nav_next {
 +float:right;
 +}
 +
 +.pagination a {
 +display:block;
 +text-decoration:none;
 +font-weight:bold;
 +padding:7px;
 +border-width:1px;
 +border-style:solid;
 +-moz-border-radius:7px;
 +-webkit-border-radius:7px;
 +border-radius:7px;
 +}
 +
 +.pagination .nav_prev a {
 +padding-left:30px;
 +}
 +.pagination .nav_next a {
 +padding-right:30px;
 +}
 +/* END: NOTICE */
 +
 +
 +.hentry .entry-content p {
 +margin-bottom:18px;
 +}
 +.hentry entry-content ol,
 +.hentry .entry-content ul {
 +list-style-position:inside;
 +}
 +.hentry .entry-content li {
 +margin-bottom:18px;
 +}
 +.hentry .entry-content li li {
 +margin-left:18px;
 +}
 +
 +
 +
 +
 +/* TOP_POSTERS */
 +.section tbody td {
 +padding-right:11px;
 +padding-bottom:11px;
 +}
 +.section .vcard .photo {
 +margin-right:7px;
 +margin-bottom:0;
 +}
 +
 +.section .notice {
 +padding-top:7px;
 +padding-bottom:7px;
 +border-top:0;
 +}
 +
 +.section .notice:first-child {
 +padding-top:0;
 +}
 +
 +.section .notice .author {
 +margin-right:0;
 +}
 +.section .notice .author .fn {
 +display:none;
 +}
 +
 +
 +/* tagcloud */
 +.tag-cloud {
 +list-style-type:none;
 +text-align:center;
 +}
 +.aside .tag-cloud {
 +font-size:0.8em;
 +}
 +.tag-cloud li {
 +display:inline;
 +margin-right:7px;
 +line-height:1.25;
 +}
 +.aside .tag-cloud li {
 +line-height:1.5;
 +}
 +.tag-cloud li a {
 +text-decoration:none;
 +}
 +#tagcloud.section dt {
 +text-transform:uppercase;
 +font-weight:bold;
 +}
 +.tag-cloud-1 {
 +font-size:1em;
 +}
 +.tag-cloud-2 {
 +font-size:1.25em;
 +}
 +.tag-cloud-3 {
 +font-size:1.75em;
 +}
 +.tag-cloud-4 {
 +font-size:2em;
 +}
 +.tag-cloud-5 {
 +font-size:2.25em;
 +}
 +.tag-cloud-6 {
 +font-size:2.75em;
 +}
 +.tag-cloud-7 {
 +font-size:3.25em;
 +}
 +
 +#publictagcloud #tagcloud.section dt {
 +display:none;
 +}
 +
 +#form_settings_photo .form_data {
 +clear:both;
 +}
 +
 +#form_settings_avatar li {
 +width:auto;
 +}
 +#form_settings_avatar input {
 +margin-left:0;
 +}
 +#avatar_original,
 +#avatar_preview {
 +float:left;
 +}
 +#avatar_preview {
 +margin-left:29px;
 +}
 +#avatar_preview_view {
 +height:96px;
 +width:96px;
 +margin-bottom:18px;
 +overflow:hidden;
 +}
 +
 +#settings_attach,
 +#form_settings_avatar .form_actions {
 +clear:both;
 +}
 +
 +#form_settings_avatar .form_actions {
 +margin-bottom:0;
 +}
 +
 +.instructions ul {
 +list-style-position:inside;
 +}
 +.instructions p,
 +.instructions ul {
 +margin-bottom:18px;
 +}
 +.help dt {
 +display:none;
 +}
 +.guide {
 +clear:both;
- }
++}
diff --cc theme/default/skin/default/css/display.css
index f38b236350,0000000000..71b962e963
mode 100644,000000..100644
--- a/theme/default/skin/default/css/display.css
+++ b/theme/default/skin/default/css/display.css
@@@ -1,251 -1,0 +1,252 @@@
 +/** theme: default
 + *
 + * @package   Laconica
 + * @author Sarven Capadisli <csarven@controlyourself.ca>
 + * @copyright 2009 Control Yourself, Inc.
 + * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
 + * @link      http://laconi.ca/
 + */
 +
 +html,
 +body,
 +a:active {
 +background-color:#97BFD1;
 +}
 +body {
 +font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 +font-size:1em;
 +}
 +address {
 +margin-right:7.18%;
 +}
 +
 +input, textarea, select, option {
 +font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 +}
 +input, textarea, select,
 +.entity_remote_subscribe {
 +border-color:#aaa;
 +}
 +#filter_tags ul li {
 +border-color:#97BFD1;
 +}
 +
 +.form_settings input.form_action-secondary {
 +background:none;
 +}
 +
 +input.submit,
 +#form_notice.warning #notice_text-count,
 +.form_settings .form_note,
 +.entity_remote_subscribe {
 +background-color:#A9BF4F;
 +}
 +
 +input:focus, textarea:focus, select:focus,
 +#form_notice.warning #notice_data-text {
 +border-color:#A9BF4F;
 +}
 +input.submit,
 +.entity_remote_subscribe {
 +color:#fff;
 +}
 +
 +a,
 +div.notice-options input,
 +.form_user_block input.submit,
 +.form_user_unblock input.submit,
 +.entity_send-a-message a,
 +.form_user_nudge input.submit,
 +.entity_nudge p,
 +.form_settings input.form_action-secondary {
 +color:#002E6E;
 +}
 +
 +.notice,
 +.profile {
 +border-top-color:#D1D9E4;
 +}
 +.section .profile {
 +border-top-color:#97BFD1;
 +}
 +
 +
 +#content .notice p.entry-content a:visited {
 +background-color:#fcfcfc;
 +}
 +#content .notice p.entry-content .vcard a {
 +background-color:#fcfffc;
 +}
 +
 +#aside_primary {
 +background-color:#CEE1E9;
 +}
 +
 +
 +#notice_text-count {
 +color:#333;
 +}
 +#form_notice.warning #notice_text-count {
 +color:#000;
 +}
 +#form_notice.processing #notice_action-submit {
 +background:#fff url(../../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 +cursor:wait;
 +text-indent:-9999px;
 +}
 +
 +#content,
 +#site_nav_local_views a,
 +#aside_primary {
 +border-color:#fff;
 +}
 +#content,
 +#site_nav_local_views .current a {
 +background-color:#fff;
 +}
 +
 +#site_nav_local_views a {
 +background-color:rgba(255, 255, 255, 0.2);
 +}
 +#site_nav_local_views a:hover {
 +background-color:rgba(255, 255, 255, 0.7);
 +}
 +
 +
 +.error {
 +background-color:#F7E8E8;
 +}
 +.success {
 +background-color:#EFF3DC;
 +}
 +
 +
 +#anon_notice {
 +background-color:#97BFD1;
 +color:#fff;
 +border-color:#fff;
 +}
 +
 +#showstream #anon_notice {
 +background-color:#A9BF4F;
 +}
 +
 +
 +#export_data li a {
 +background-repeat:no-repeat;
 +background-position:0 45%;
 +}
 +#export_data li a.rss {
 +background-image:url(../../../base/images/icons/icon_rss.png);
 +}
 +#export_data li a.atom {
 +background-image:url(../../../base/images/icons/icon_atom.png);
 +}
 +#export_data li a.foaf {
 +background-image:url(../../../base/images/icons/icon_foaf.gif);
 +}
 +
 +.entity_edit a,
 +.entity_send-a-message a,
 +.form_user_nudge input.submit,
 +.form_user_block input.submit,
 +.form_user_unblock input.submit,
 +.entity_nudge p {
 +background-position: 0 40%;
 +background-repeat: no-repeat;
 +background-color:transparent;
 +}
 +.form_group_join input.submit,
 +.form_group_leave input.submit
 +.form_user_subscribe input.submit,
 +.form_user_unsubscribe input.submit {
 +background-color:#A9BF4F;
 +color:#fff;
 +}
 +.form_user_unsubscribe input.submit,
- .form_group_leave input.submit {
++.form_group_leave input.submit,
++.form_user_authorization input.reject {
 +background-color:#97BFD1;
 +}
 +
 +.entity_edit a {
 +background-image:url(../images/icons/twotone/green/edit.gif);
 +}
 +.entity_send-a-message a {
 +background-image:url(../images/icons/twotone/green/quote.gif);
 +}
 +.entity_nudge p,
 +.form_user_nudge input.submit {
 +background-image:url(../images/icons/twotone/green/mail.gif);
 +}
 +.form_user_block input.submit,
 +.form_user_unblock input.submit {
 +background-image:url(../images/icons/twotone/green/shield.gif);
 +}
 +
 +
 +
 +/* NOTICES */
 +.notices li.over {
 +background-color:#fcfcfc;
 +}
 +
 +.notice-options .notice_reply a,
 +.notice-options form input.submit {
 +background-color:transparent;
 +}
 +.notice-options .notice_reply a {
 +background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%;
 +}
 +.notice-options form.form_favor input.submit {
 +background:transparent url(../images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
 +}
 +.notice-options form.form_disfavor input.submit {
 +background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
 +}
 +.notice-options .notice_delete a {
 +background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%;
 +}
 +
 +.notices div.entry-content,
 +.notices div.notice-options {
 +opacity:0.4;
 +}
 +.notices li.hover div.entry-content,
 +.notices li.hover div.notice-options {
 +opacity:1;
 +}
 +div.entry-content {
 +color:#333;
 +}
 +div.notice-options a,
 +div.notice-options input {
 +font-family:sans-serif;
 +}
 +.notices li.hover {
 +background-color:#fcfcfc;
 +}
 +/*END: NOTICES */
 +
 +
 +#new_group a {
 +background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
 +}
 +#usergroups #new_group {
 +float: left;
 +margin-right: 2em;
 +}
 +
 +.pagination .nav_prev a,
 +.pagination .nav_next a {
 +background-repeat:no-repeat;
 +border-color:#D1D9E4;
 +}
 +.pagination .nav_prev a {
 +background-image:url(../images/icons/twotone/green/arrow-left.gif);
 +background-position:10% 45%;
 +}
 +.pagination .nav_next a {
 +background-image:url(../images/icons/twotone/green/arrow-right.gif);
 +background-position:90% 45%;
 +}
diff --cc theme/default/skin/identica/css/display.css
index 44ff2c9e85,0000000000..d723689346
mode 100644,000000..100644
--- a/theme/default/skin/identica/css/display.css
+++ b/theme/default/skin/identica/css/display.css
@@@ -1,251 -1,0 +1,252 @@@
 +/** theme: identica
 + *
 + * @package   Laconica
 + * @author Sarven Capadisli <csarven@controlyourself.ca>
 + * @copyright 2009 Control Yourself, Inc.
 + * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
 + * @link      http://laconi.ca/
 + */
 +
 +html,
 +body,
 +a:active {
 +background-color:#F0F2F5;
 +}
 +body {
 +font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 +font-size:1em;
 +}
 +address {
 +margin-right:7.18%;
 +}
 +
 +input, textarea, select, option {
 +font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 +}
 +input, textarea, select,
 +.entity_remote_subscribe {
 +border-color:#aaa;
 +}
 +#filter_tags ul li {
 +border-color:#ddd;
 +}
 +
 +.form_settings input.form_action-secondary {
 +background:none;
 +}
 +
 +input.submit,
 +#form_notice.warning #notice_text-count,
 +.form_settings .form_note,
 +.entity_remote_subscribe {
 +background-color:#9BB43E;
 +}
 +
 +input:focus, textarea:focus, select:focus,
 +#form_notice.warning #notice_data-text {
 +border-color:#9BB43E;
 +}
 +input.submit,
 +.entity_remote_subscribe {
 +color:#fff;
 +}
 +
 +a,
 +div.notice-options input,
 +.form_user_block input.submit,
 +.form_user_unblock input.submit,
 +.entity_send-a-message a,
 +.form_user_nudge input.submit,
 +.entity_nudge p,
 +.form_settings input.form_action-secondary {
 +color:#002E6E;
 +}
 +
 +.notice,
 +.profile {
 +border-top-color:#CEE1E9;
 +}
 +.section .profile {
 +border-top-color:#87B4C8;
 +}
 +
 +
 +#content .notice p.entry-content a:visited {
 +background-color:#fcfcfc;
 +}
 +#content .notice p.entry-content .vcard a {
 +background-color:#fcfffc;
 +}
 +
 +#aside_primary {
 +background-color:#CEE1E9;
 +}
 +
 +
 +#notice_text-count {
 +color:#333;
 +}
 +#form_notice.warning #notice_text-count {
 +color:#000;
 +}
 +#form_notice.processing #notice_action-submit {
 +background:#fff url(../../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 +cursor:wait;
 +text-indent:-9999px;
 +}
 +
 +#content,
 +#site_nav_local_views a,
 +#aside_primary {
 +border-color:#fff;
 +}
 +#content,
 +#site_nav_local_views .current a {
 +background-color:#fff;
 +}
 +
 +#site_nav_local_views a {
 +background-color:rgba(135, 180, 200, 0.3);
 +}
 +#site_nav_local_views a:hover {
 +background-color:rgba(255, 255, 255, 0.7);
 +}
 +
 +
 +.error {
 +background-color:#F7E8E8;
 +}
 +.success {
 +background-color:#EFF3DC;
 +}
 +
 +
 +#anon_notice {
 +background-color:#87B4C8;
 +color:#fff;
 +border-color:#fff;
 +}
 +
 +#showstream #anon_notice {
 +background-color:#9BB43E;
 +}
 +
 +
 +#export_data li a {
 +background-repeat:no-repeat;
 +background-position:0 45%;
 +}
 +#export_data li a.rss {
 +background-image:url(../../../base/images/icons/icon_rss.png);
 +}
 +#export_data li a.atom {
 +background-image:url(../../../base/images/icons/icon_atom.png);
 +}
 +#export_data li a.foaf {
 +background-image:url(../../../base/images/icons/icon_foaf.gif);
 +}
 +
 +.entity_edit a,
 +.entity_send-a-message a,
 +.form_user_nudge input.submit,
 +.form_user_block input.submit,
 +.form_user_unblock input.submit,
 +.entity_nudge p {
 +background-position: 0 40%;
 +background-repeat: no-repeat;
 +background-color:transparent;
 +}
 +.form_group_join input.submit,
 +.form_group_leave input.submit
 +.form_user_subscribe input.submit,
 +.form_user_unsubscribe input.submit {
 +background-color:#9BB43E;
 +color:#fff;
 +}
 +.form_user_unsubscribe input.submit,
- .form_group_leave input.submit {
++.form_group_leave input.submit,
++.form_user_authorization input.reject {
 +background-color:#87B4C8;
 +}
 +
 +.entity_edit a {
 +background-image:url(../images/icons/twotone/green/edit.gif);
 +}
 +.entity_send-a-message a {
 +background-image:url(../images/icons/twotone/green/quote.gif);
 +}
 +.entity_nudge p,
 +.form_user_nudge input.submit {
 +background-image:url(../images/icons/twotone/green/mail.gif);
 +}
 +.form_user_block input.submit,
 +.form_user_unblock input.submit {
 +background-image:url(../images/icons/twotone/green/shield.gif);
 +}
 +
 +
 +
 +/* NOTICES */
 +.notices li.over {
 +background-color:#fcfcfc;
 +}
 +
 +.notice-options .notice_reply a,
 +.notice-options form input.submit {
 +background-color:transparent;
 +}
 +.notice-options .notice_reply a {
 +background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%;
 +}
 +.notice-options form.form_favor input.submit {
 +background:transparent url(../images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
 +}
 +.notice-options form.form_disfavor input.submit {
 +background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
 +}
 +.notice-options .notice_delete a {
 +background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%;
 +}
 +
 +.notices div.entry-content,
 +.notices div.notice-options {
 +opacity:0.4;
 +}
 +.notices li.hover div.entry-content,
 +.notices li.hover div.notice-options {
 +opacity:1;
 +}
 +div.entry-content {
 +color:#333;
 +}
 +div.notice-options a,
 +div.notice-options input {
 +font-family:sans-serif;
 +}
 +.notices li.hover {
 +background-color:#fcfcfc;
 +}
 +/*END: NOTICES */
 +
 +
 +#new_group a {
 +background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
 +}
 +#usergroups #new_group {
 +float: left;
 +margin-right: 2em;
 +}
 +
 +.pagination .nav_prev a,
 +.pagination .nav_next a {
 +background-repeat:no-repeat;
 +border-color:#CEE1E9;
 +}
 +.pagination .nav_prev a {
 +background-image:url(../images/icons/twotone/green/arrow-left.gif);
 +background-position:10% 45%;
 +}
 +.pagination .nav_next a {
 +background-image:url(../images/icons/twotone/green/arrow-right.gif);
 +background-position:90% 45%;
 +}