Merge branch 'master' of git@gitorious.org:statusnet/mainline
This commit is contained in:
Evan Prodromou
commit
d5f86f7a8a
|
|
@ -430,7 +430,7 @@ class Memcached_DataObject extends DB_DataObject
|
|||
//
|
||||
// WARNING WARNING if we end up actually using multiple DBs at a time
|
||||
// we'll need some fancier logic here.
|
||||
if (!$exists && !empty($_DB_DATAOBJECT['CONNECTIONS'])) {
|
||||
if (!$exists && !empty($_DB_DATAOBJECT['CONNECTIONS']) && php_sapi_name() == 'cli') {
|
||||
foreach ($_DB_DATAOBJECT['CONNECTIONS'] as $index => $conn) {
|
||||
if (!empty($conn)) {
|
||||
$conn->disconnect();
|
||||
|
|
|
|||
|
|
@ -84,6 +84,7 @@ $default =
|
|||
'control_channel' => '/topic/statusnet-control', // broadcasts to all queue daemons
|
||||
'stomp_username' => null,
|
||||
'stomp_password' => null,
|
||||
'stomp_persistent' => true, // keep items across queue server restart, if persistence is enabled
|
||||
'monitor' => null, // URL to monitor ping endpoint (work in progress)
|
||||
'softlimit' => '90%', // total size or % of memory_limit at which to restart queue threads gracefully
|
||||
'debug_memory' => false, // true to spit memory usage to log
|
||||
|
|
|
|||
|
|
@ -174,12 +174,13 @@ class StompQueueManager extends QueueManager
|
|||
|
||||
$this->_connect();
|
||||
|
||||
// XXX: serialize and send entire notice
|
||||
|
||||
$props = array('created' => common_sql_now());
|
||||
if (common_config('queue', 'stomp_persistent')) {
|
||||
$props['persistent'] = 'true';
|
||||
}
|
||||
$result = $this->con->send($this->queueName($queue),
|
||||
$msg, // BODY of the message
|
||||
array ('created' => common_sql_now(),
|
||||
'persistent' => 'true'));
|
||||
$props);
|
||||
|
||||
if (!$result) {
|
||||
common_log(LOG_ERR, "Error sending $rep to $queue queue");
|
||||
|
|
|
|||
|
|
@ -178,7 +178,6 @@ function common_ensure_session()
|
|||
}
|
||||
if (isset($id)) {
|
||||
session_id($id);
|
||||
setcookie(session_name(), $id, 0, common_config('site', 'path'));
|
||||
}
|
||||
@session_start();
|
||||
if (!isset($_SESSION['started'])) {
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 2.4 KiB |
|
|
@ -224,6 +224,15 @@ font-weight:bold;
|
|||
address img + .fn {
|
||||
display:none;
|
||||
}
|
||||
address .poweredby {
|
||||
float:left;
|
||||
clear:left;
|
||||
display:block;
|
||||
position:relative;
|
||||
top:7px;
|
||||
margin-right:-47px;
|
||||
}
|
||||
|
||||
|
||||
#header {
|
||||
width:100%;
|
||||
|
|
@ -387,7 +396,7 @@ margin-bottom:1em;
|
|||
}
|
||||
|
||||
#content {
|
||||
width:51.009%;
|
||||
width:50%;
|
||||
min-height:259px;
|
||||
padding:1.795%;
|
||||
float:left;
|
||||
|
|
@ -413,7 +422,7 @@ float:left;
|
|||
width:29.917%;
|
||||
min-height:259px;
|
||||
float:left;
|
||||
margin-left:0.385%;
|
||||
margin-left:1%;
|
||||
}
|
||||
|
||||
#form_notice {
|
||||
|
|
@ -509,6 +518,44 @@ margin-bottom:0;
|
|||
line-height:1.618;
|
||||
}
|
||||
|
||||
.form_notice #notice_data-attach_selected button.close {
|
||||
float:right;
|
||||
font-size:0.8em;
|
||||
}
|
||||
|
||||
.form_notice #notice_data-geo_wrap label,
|
||||
.form_notice #notice_data-geo_wrap input {
|
||||
position:absolute;
|
||||
top:25px;
|
||||
right:4px;
|
||||
left:auto;
|
||||
cursor:pointer;
|
||||
width:16px;
|
||||
height:16px;
|
||||
display:block;
|
||||
}
|
||||
.form_notice #notice_data-geo_wrap input {
|
||||
visibility:hidden;
|
||||
}
|
||||
.form_notice #notice_data-geo_wrap label {
|
||||
font-weight:normal;
|
||||
font-size:1em;
|
||||
margin-bottom:0;
|
||||
text-indent:-9999px;
|
||||
}
|
||||
|
||||
button.close,
|
||||
button.minimize {
|
||||
width:16px;
|
||||
height:16px;
|
||||
text-indent:-9999px;
|
||||
padding:0;
|
||||
border:0;
|
||||
text-align:center;
|
||||
font-weight:bold;
|
||||
cursor:pointer;
|
||||
}
|
||||
|
||||
/* entity_profile */
|
||||
.entity_profile {
|
||||
position:relative;
|
||||
|
|
@ -575,8 +622,9 @@ display:none;
|
|||
/*entity_actions*/
|
||||
.entity_actions {
|
||||
float:right;
|
||||
margin-left:4.35%;
|
||||
max-width:25%;
|
||||
margin-left:2%;
|
||||
margin-bottom:18px;
|
||||
min-width:21%;
|
||||
}
|
||||
.entity_actions h2 {
|
||||
display:none;
|
||||
|
|
@ -585,7 +633,7 @@ display:none;
|
|||
list-style-type:none;
|
||||
}
|
||||
.entity_actions li {
|
||||
margin-bottom:4px;
|
||||
margin-bottom:7px;
|
||||
}
|
||||
.entity_actions li:first-child {
|
||||
border-top:0;
|
||||
|
|
@ -603,42 +651,97 @@ display:block;
|
|||
text-align:left;
|
||||
width:100%;
|
||||
}
|
||||
.entity_actions a,
|
||||
.entity_nudge p,
|
||||
.entity_remote_subscribe {
|
||||
.entity_actions a {
|
||||
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;
|
||||
.entity_actions a,
|
||||
.entity_actions input {
|
||||
border-radius:4px;
|
||||
-moz-border-radius:4px;
|
||||
-webkit-border-radius:4px;
|
||||
}
|
||||
|
||||
.entity_actions a,
|
||||
.entity_actions input,
|
||||
.entity_actions p {
|
||||
border-width:2px;
|
||||
border-style:solid;
|
||||
padding-left:23px;
|
||||
}
|
||||
|
||||
.entity_actions a,
|
||||
.entity_actions p {
|
||||
padding:2px 4px 1px 26px;
|
||||
}
|
||||
|
||||
.entity_actions .accept {
|
||||
margin-bottom:18px;
|
||||
}
|
||||
|
||||
.entity_send-a-message button {
|
||||
position:absolute;
|
||||
top:3px;
|
||||
right:3px;
|
||||
}
|
||||
|
||||
.entity_send-a-message .form_notice {
|
||||
position:absolute;
|
||||
top:34px;
|
||||
right:-1px;
|
||||
padding:1.795%;
|
||||
width:65%;
|
||||
z-index:2;
|
||||
border-radius:7px;
|
||||
-moz-border-radius:7px;
|
||||
-webkit-border-radius:7px;
|
||||
border-width:1px;
|
||||
border-style:solid;
|
||||
}
|
||||
.entity_send-a-message .form_notice legend {
|
||||
display:block;
|
||||
margin-bottom:11px;
|
||||
}
|
||||
|
||||
.entity_send-a-message .form_notice label,
|
||||
.entity_send-a-message .form_notice select {
|
||||
display:none;
|
||||
}
|
||||
.entity_send-a-message .form_notice input.submit {
|
||||
text-align:center;
|
||||
}
|
||||
|
||||
.entity_moderation {
|
||||
position:relative;
|
||||
}
|
||||
.entity_moderation p {
|
||||
border-radius:4px;
|
||||
-moz-border-radius:4px;
|
||||
-webkit-border-radius:4px;
|
||||
font-weight:bold;
|
||||
padding-bottom:2px;
|
||||
margin-bottom:7px;
|
||||
}
|
||||
.entity_moderation ul {
|
||||
display:none;
|
||||
}
|
||||
.entity_moderation:hover ul {
|
||||
display:block;
|
||||
min-width:21%;
|
||||
width:100%;
|
||||
padding:11px;
|
||||
position:absolute;
|
||||
top:-1px;
|
||||
right:-1px;
|
||||
z-index:1;
|
||||
border-width:1px;
|
||||
border-style:solid;
|
||||
border-radius:7px;
|
||||
-moz-border-radius:7px;
|
||||
-webkit-border-radius:7px;
|
||||
}
|
||||
|
||||
.entity_tags ul {
|
||||
list-style-type:none;
|
||||
display:inline;
|
||||
|
|
@ -800,6 +903,16 @@ float:left;
|
|||
#shownotice .vcard .photo {
|
||||
margin-bottom:4px;
|
||||
}
|
||||
#content .notice .author .photo {
|
||||
position:absolute;
|
||||
top:11px;
|
||||
left:0;
|
||||
float:none;
|
||||
}
|
||||
#content .notice .entry-title {
|
||||
margin-left:59px;
|
||||
}
|
||||
|
||||
.vcard .url {
|
||||
text-decoration:none;
|
||||
}
|
||||
|
|
@ -808,12 +921,22 @@ text-decoration:underline;
|
|||
}
|
||||
|
||||
.notice .entry-title {
|
||||
float:left;
|
||||
width:100%;
|
||||
overflow:hidden;
|
||||
}
|
||||
.notice .entry-title.ov {
|
||||
overflow:visible;
|
||||
}
|
||||
#showstream .notice .entry-title,
|
||||
#showstream .notice div.entry-content {
|
||||
margin-left:0;
|
||||
}
|
||||
#shownotice .notice .entry-title {
|
||||
margin-left:110px;
|
||||
font-size:2.2em;
|
||||
min-height:123px;
|
||||
}
|
||||
#shownotice .notice div.entry-content {
|
||||
margin-left:0;
|
||||
}
|
||||
|
||||
.notice p.entry-content {
|
||||
|
|
@ -836,7 +959,7 @@ clear:left;
|
|||
float:left;
|
||||
font-size:0.95em;
|
||||
margin-left:59px;
|
||||
width:65%;
|
||||
width:64%;
|
||||
}
|
||||
#showstream .notice div.entry-content,
|
||||
#shownotice .notice div.entry-content {
|
||||
|
|
@ -870,36 +993,76 @@ display:inline-block;
|
|||
text-transform:lowercase;
|
||||
}
|
||||
|
||||
.dialogbox {
|
||||
position:absolute;
|
||||
top:-4px;
|
||||
right:29px;
|
||||
z-index:9;
|
||||
min-width:199px;
|
||||
float:none;
|
||||
background-color:#FFF;
|
||||
padding:11px;
|
||||
border-radius:7px;
|
||||
-moz-border-radius:7px;
|
||||
-webkit-border-radius:7px;
|
||||
border-style:solid;
|
||||
border-width:1px;
|
||||
border-color:#DDDDDD;
|
||||
-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
|
||||
}
|
||||
|
||||
.dialogbox legend {
|
||||
display:block !important;
|
||||
margin-right:18px;
|
||||
}
|
||||
|
||||
.dialogbox button.close {
|
||||
position:absolute;
|
||||
right:3px;
|
||||
top:3px;
|
||||
}
|
||||
|
||||
.dialogbox .submit_dialogbox {
|
||||
font-weight:bold;
|
||||
text-indent:0;
|
||||
min-width:46px;
|
||||
}
|
||||
|
||||
#wrap form.processing input.submit,
|
||||
.entity_actions a.processing,
|
||||
.dialogbox.processing .submit_dialogbox {
|
||||
cursor:wait;
|
||||
outline:none;
|
||||
text-indent:-9999px;
|
||||
}
|
||||
|
||||
.notice-options {
|
||||
position:relative;
|
||||
font-size:0.95em;
|
||||
width:90px;
|
||||
width:113px;
|
||||
float:right;
|
||||
margin-right:11px;
|
||||
margin-top:3px;
|
||||
margin-right:4px;
|
||||
}
|
||||
|
||||
.notice-options a {
|
||||
float:left;
|
||||
}
|
||||
.notice-options .notice_delete,
|
||||
.notice-options .notice_reply,
|
||||
.notice-options .form_repeat,
|
||||
.notice-options .form_favor,
|
||||
.notice-options .form_disfavor {
|
||||
position:absolute;
|
||||
top:0;
|
||||
.notice-options .form_disfavor,
|
||||
.notice-options .repeated {
|
||||
float:left;
|
||||
margin-left:14.2%;
|
||||
}
|
||||
.notice-options .form_favor,
|
||||
.notice-options .form_disfavor {
|
||||
left:0;
|
||||
}
|
||||
.notice-options .notice_reply {
|
||||
left:29px;
|
||||
}
|
||||
.notice-options .notice_delete {
|
||||
right:0;
|
||||
margin-left:0;
|
||||
}
|
||||
.notice-options input,
|
||||
.notice-options a {
|
||||
.notice-options a,
|
||||
.notice-options .repeated {
|
||||
text-indent:-9999px;
|
||||
outline:none;
|
||||
}
|
||||
|
|
@ -910,22 +1073,34 @@ border:0;
|
|||
.notice-options .notice_reply,
|
||||
.notice-options .notice_delete {
|
||||
text-decoration:none;
|
||||
padding-left:16px;
|
||||
}
|
||||
.notice .notice-options .notice_delete {
|
||||
float:right;
|
||||
}
|
||||
.notice-options form input.submit {
|
||||
width:16px;
|
||||
padding:2px 0;
|
||||
height:16px;
|
||||
padding:0;
|
||||
border-radius:0;
|
||||
-moz-border-radius:0;
|
||||
-webkit-border-radius:0;
|
||||
}
|
||||
.notice-options .form_repeat legend,
|
||||
.notice-options .form_favor legend,
|
||||
.notice-options .form_disfavor legend {
|
||||
display:none;
|
||||
}
|
||||
.notice-options .form_repeat fieldset,
|
||||
.notice-options .form_favor fieldset,
|
||||
.notice-options .form_disfavor fieldset {
|
||||
border:0;
|
||||
padding:0;
|
||||
}
|
||||
|
||||
.notice-options a,
|
||||
.notice-options .repeated {
|
||||
width:16px;
|
||||
height:16px;
|
||||
}
|
||||
|
||||
#usergroups #new_group {
|
||||
float: left;
|
||||
|
|
|
|||
|
|
@ -25,14 +25,33 @@ address {
|
|||
margin-right:7.18%;
|
||||
}
|
||||
|
||||
input, textarea, select {
|
||||
border-width:2px;
|
||||
border-style: solid;
|
||||
border-radius:4px;
|
||||
-moz-border-radius:4px;
|
||||
-webkit-border-radius:4px;
|
||||
}
|
||||
input, textarea, select, option {
|
||||
font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
|
||||
}
|
||||
input, textarea, select,
|
||||
.entity_remote_subscribe {
|
||||
input, textarea, select {
|
||||
border-color:#AAAAAA;
|
||||
}
|
||||
#filter_tags ul li {
|
||||
|
||||
.form_settings fieldset fieldset {
|
||||
background:rgba(240, 240, 240, 0.2);
|
||||
box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
|
||||
-moz-box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
|
||||
-webkit-box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3);
|
||||
}
|
||||
|
||||
#filter_tags ul li,
|
||||
.entity_send-a-message .form_notice,
|
||||
.pagination .nav_prev a,
|
||||
.pagination .nav_next a,
|
||||
.form_settings fieldset fieldset,
|
||||
.entity_moderation:hover ul {
|
||||
border-color:#DDDDDD;
|
||||
}
|
||||
|
||||
|
|
@ -40,39 +59,78 @@ border-color:#DDDDDD;
|
|||
background:none;
|
||||
}
|
||||
|
||||
input.submit,
|
||||
#form_notice.warning #notice_text-count,
|
||||
.form_settings .form_note,
|
||||
.entity_remote_subscribe {
|
||||
.form_notice.warning #notice_text-count,
|
||||
.form_settings .form_note {
|
||||
background-color:#9BB43E;
|
||||
}
|
||||
|
||||
input:focus, textarea:focus, select:focus,
|
||||
#form_notice.warning #notice_data-text {
|
||||
border-color:#9BB43E;
|
||||
input.submit,
|
||||
.form_notice.warning #notice_text-count,
|
||||
.form_settings .form_note,
|
||||
.entity_actions a,
|
||||
.entity_actions input,
|
||||
.entity_moderation p,
|
||||
button {
|
||||
box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
|
||||
-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
|
||||
-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
|
||||
}
|
||||
input.submit,
|
||||
.entity_remote_subscribe,
|
||||
#site_nav_local_views a {
|
||||
.entity_actions a,
|
||||
.entity_actions input,
|
||||
.entity_actions p {
|
||||
border-color:transparent;
|
||||
background-color:transparent;
|
||||
}
|
||||
input:focus, textarea:focus, select:focus,
|
||||
.form_notice.warning #notice_data-text,
|
||||
.form_notice.warning #notice_text-count,
|
||||
.form_settings .form_note {
|
||||
border-color:#9BB43E;
|
||||
}
|
||||
|
||||
input.submit {
|
||||
color:#FFFFFF;
|
||||
}
|
||||
.entity_actions input.submit {
|
||||
border-color:transparent;
|
||||
text-shadow:none;
|
||||
}
|
||||
.dialogbox .submit_dialogbox,
|
||||
input.submit,
|
||||
.form_notice input.submit {
|
||||
background:#AAAAAA url(../../base/images/illustrations/illu_pattern-01.png) 0 0 repeat-x;
|
||||
text-shadow:0 1px 0 #FFFFFF;
|
||||
color:#000000;
|
||||
border-color:#AAAAAA;
|
||||
border-top-color:#CCCCCC;
|
||||
border-left-color:#CCCCCC;
|
||||
}
|
||||
.dialogbox .submit_dialogbox:hover,
|
||||
input.submit:hover {
|
||||
background-position:0 -5px;
|
||||
}
|
||||
.dialogbox .submit_dialogbox:focus,
|
||||
input.submit:focus {
|
||||
background-position:0 -15px;
|
||||
box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
|
||||
-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
|
||||
-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);
|
||||
text-shadow:none;
|
||||
}
|
||||
|
||||
.form_notice label[for=notice_data-geo] {
|
||||
background-position:0 -1780px;
|
||||
}
|
||||
.form_notice label[for=notice_data-geo].checked {
|
||||
background-position:0 -1846px;
|
||||
}
|
||||
|
||||
a,
|
||||
#site_nav_local_views .current a,
|
||||
div.notice-options input,
|
||||
.form_user_block input.submit,
|
||||
.form_user_unblock input.submit,
|
||||
.form_group_block input.submit,
|
||||
.form_group_unblock input.submit,
|
||||
.entity_send-a-message a,
|
||||
.form_user_nudge input.submit,
|
||||
.entity_nudge p,
|
||||
.form_settings input.form_action-primary,
|
||||
.form_make_admin input.submit {
|
||||
color:#002E6E;
|
||||
.notice-options input,
|
||||
.entity_actions a,
|
||||
.entity_actions input,
|
||||
.entity_moderation p {
|
||||
color:#002FA7;
|
||||
}
|
||||
|
||||
#header a,
|
||||
|
|
@ -80,10 +138,22 @@ color:#002E6E;
|
|||
color:#87B4C8;
|
||||
}
|
||||
|
||||
|
||||
|
||||
.notice,
|
||||
.profile {
|
||||
border-top-color:#CEE1E9;
|
||||
.profile,
|
||||
.application,
|
||||
#content tbody tr {
|
||||
border-top-color:#C8D1D5;
|
||||
}
|
||||
.mark-top {
|
||||
border-color:#AAAAAA;
|
||||
}
|
||||
|
||||
#aside_primary {
|
||||
background-color:#144A6E;
|
||||
}
|
||||
|
||||
.section .profile {
|
||||
border-top-color:#87B4C8;
|
||||
}
|
||||
|
|
@ -101,18 +171,61 @@ color:#333333;
|
|||
#form_notice.warning #notice_text-count {
|
||||
color:#000000;
|
||||
}
|
||||
#form_notice label[for=notice_data-attach] {
|
||||
background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
|
||||
.form_notice label[for=notice_data-attach] {
|
||||
background-position:0 -328px;
|
||||
}
|
||||
#form_notice #notice_data-attach {
|
||||
.form_notice #notice_data-attach {
|
||||
opacity:0;
|
||||
}
|
||||
|
||||
#wrap form.processing input.submit {
|
||||
.form_notice label[for=notice_data-attach],
|
||||
#export_data li a.rss,
|
||||
#export_data li a.atom,
|
||||
#export_data li a.foaf,
|
||||
.entity_edit a,
|
||||
.entity_send-a-message a,
|
||||
.entity_nudge p,
|
||||
.form_user_nudge input.submit,
|
||||
.form_user_block input.submit,
|
||||
.form_user_unblock input.submit,
|
||||
.form_group_block input.submit,
|
||||
.form_group_unblock input.submit,
|
||||
.form_make_admin input.submit,
|
||||
.notice .attachment,
|
||||
.notice-options .notice_reply,
|
||||
.notice-options form.form_favor input.submit,
|
||||
.notice-options form.form_disfavor input.submit,
|
||||
.notice-options .notice_delete,
|
||||
.notice-options form.form_repeat input.submit,
|
||||
#new_group a,
|
||||
.pagination .nav_prev a,
|
||||
.pagination .nav_next a,
|
||||
button.close,
|
||||
.form_group_leave input.submit,
|
||||
.form_user_unsubscribe input.submit,
|
||||
.form_group_join input.submit,
|
||||
.form_user_subscribe input.submit,
|
||||
.entity_subscribe a,
|
||||
.entity_moderation p,
|
||||
.entity_sandbox input.submit,
|
||||
.entity_silence input.submit,
|
||||
.entity_delete input.submit,
|
||||
.notice-options .repeated,
|
||||
.form_notice label[for=notice_data-geo],
|
||||
button.minimize,
|
||||
.form_reset_key input.submit {
|
||||
background-image:url(../../base/images/icons/icons-01.gif);
|
||||
background-repeat:no-repeat;
|
||||
background-color:transparent;
|
||||
}
|
||||
|
||||
#wrap form.processing input.submit,
|
||||
.entity_actions a.processing,
|
||||
.dialogbox.processing .submit_dialogbox {
|
||||
background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
|
||||
cursor:wait;
|
||||
text-indent:-9999px;
|
||||
outline:none;
|
||||
}
|
||||
.notice-options .form_repeat.processing {
|
||||
background-image:none;
|
||||
}
|
||||
|
||||
#content {
|
||||
|
|
@ -126,11 +239,13 @@ box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
|
|||
border-color:#FFFFFF;
|
||||
}
|
||||
#content,
|
||||
#site_nav_local_views .current a {
|
||||
#site_nav_local_views .current a,
|
||||
.entity_send-a-message .form_notice,
|
||||
.entity_moderation:hover ul {
|
||||
background-color:#FFFFFF;
|
||||
}
|
||||
|
||||
#site_nav_local_views li {
|
||||
#site_nav_local_views li.current {
|
||||
box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
|
||||
-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
|
||||
-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
|
||||
|
|
@ -153,6 +268,13 @@ background-color:#F7E8E8;
|
|||
background-color:#EFF3DC;
|
||||
}
|
||||
|
||||
button.close {
|
||||
background-position:0 -1120px;
|
||||
}
|
||||
button.minimize {
|
||||
background-position:0 -1912px;
|
||||
}
|
||||
|
||||
#anon_notice {
|
||||
color:#FFFFFF;
|
||||
}
|
||||
|
|
@ -162,79 +284,100 @@ background-repeat:no-repeat;
|
|||
background-position:0 45%;
|
||||
}
|
||||
#export_data li a.rss {
|
||||
background-image:url(../../base/images/icons/icon_rss.png);
|
||||
background-position:0 -130px;
|
||||
}
|
||||
#export_data li a.atom {
|
||||
background-image:url(../../base/images/icons/icon_atom.png);
|
||||
background-position:0 -64px;
|
||||
}
|
||||
#export_data li a.foaf {
|
||||
background-image:url(../../base/images/icons/icon_foaf.gif);
|
||||
background-position:0 1px;
|
||||
}
|
||||
|
||||
.entity_edit a,
|
||||
.entity_send-a-message a,
|
||||
.form_user_nudge input.submit,
|
||||
.form_user_block input.submit,
|
||||
.form_user_unblock input.submit,
|
||||
.form_group_block input.submit,
|
||||
.form_group_unblock input.submit,
|
||||
.entity_nudge p,
|
||||
.form_make_admin input.submit {
|
||||
background-position: 0 40%;
|
||||
background-repeat: no-repeat;
|
||||
background-color:transparent;
|
||||
}
|
||||
.form_group_join input.submit,
|
||||
.form_group_leave input.submit
|
||||
.form_group_leave input.submit,
|
||||
.form_user_subscribe input.submit,
|
||||
.form_user_unsubscribe input.submit {
|
||||
background-color:#9BB43E;
|
||||
.form_user_unsubscribe input.submit,
|
||||
.entity_subscribe a {
|
||||
background-color:#AAAAAA;
|
||||
color:#FFFFFF;
|
||||
}
|
||||
.form_user_unsubscribe input.submit,
|
||||
.form_group_leave input.submit,
|
||||
.form_user_authorization input.reject {
|
||||
background-color:#87B4C8;
|
||||
.form_user_unsubscribe input.submit {
|
||||
background-position:5px -1246px;
|
||||
}
|
||||
.form_group_join input.submit,
|
||||
.form_user_subscribe input.submit,
|
||||
.entity_subscribe a {
|
||||
background-position:5px -1181px;
|
||||
}
|
||||
|
||||
.entity_edit a {
|
||||
background-image:url(../../base/images/icons/twotone/green/edit.gif);
|
||||
background-position: 5px -718px;
|
||||
}
|
||||
.entity_send-a-message a {
|
||||
background-image:url(../../base/images/icons/twotone/green/quote.gif);
|
||||
background-position: 5px -852px;
|
||||
}
|
||||
.entity_send-a-message .form_notice,
|
||||
.entity_moderation:hover ul {
|
||||
box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
|
||||
-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
|
||||
-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7);
|
||||
}
|
||||
|
||||
.entity_nudge p,
|
||||
.form_user_nudge input.submit {
|
||||
background-image:url(../../base/images/icons/twotone/green/mail.gif);
|
||||
background-position: 5px -785px;
|
||||
}
|
||||
.form_user_block input.submit,
|
||||
.form_user_unblock input.submit,
|
||||
.form_group_block input.submit,
|
||||
.form_group_unblock input.submit {
|
||||
background-image:url(../../base/images/icons/twotone/green/shield.gif);
|
||||
background-position: 5px -918px;
|
||||
}
|
||||
.form_make_admin input.submit {
|
||||
background-image:url(../../base/images/icons/twotone/green/admin.gif);
|
||||
background-position: 5px -983px;
|
||||
}
|
||||
.entity_moderation p {
|
||||
background-position: 5px -1313px;
|
||||
}
|
||||
.entity_sandbox input.submit {
|
||||
background-position: 5px -1380px;
|
||||
}
|
||||
.entity_silence input.submit {
|
||||
background-position: 5px -1445px;
|
||||
}
|
||||
.entity_delete input.submit {
|
||||
background-position: 5px -1511px;
|
||||
}
|
||||
.form_reset_key input.submit {
|
||||
background-position: 5px -1973px;
|
||||
}
|
||||
|
||||
|
||||
/* NOTICES */
|
||||
.notice .attachment {
|
||||
background:transparent url(../../base/images/icons/twotone/green/clip-02.gif) no-repeat 0 45%;
|
||||
background-position:0 -394px;
|
||||
}
|
||||
#attachments .attachment {
|
||||
background:none;
|
||||
}
|
||||
.notice-options .notice_reply {
|
||||
background:transparent url(../../base/images/icons/twotone/green/reply.gif) no-repeat 0 45%;
|
||||
background-position:0 -592px;
|
||||
}
|
||||
.notice-options form.form_favor input.submit {
|
||||
background:transparent url(../../base/images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
|
||||
background-position:0 -460px;
|
||||
}
|
||||
.notice-options form.form_disfavor input.submit {
|
||||
background:transparent url(../../base/images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
|
||||
background-position:0 -526px;
|
||||
}
|
||||
.notice-options .notice_delete {
|
||||
background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-repeat 0 45%;
|
||||
background-position:0 -658px;
|
||||
}
|
||||
.notice-options form.form_repeat input.submit {
|
||||
background-position:0 -1582px;
|
||||
}
|
||||
.notice-options .repeated {
|
||||
background-position:0 -1648px;
|
||||
}
|
||||
|
||||
.notices div.entry-content,
|
||||
|
|
@ -271,19 +414,32 @@ background-color:rgba(200, 200, 200, 0.300);
|
|||
/*END: NOTICES */
|
||||
|
||||
#new_group a {
|
||||
background:transparent url(../../base/images/icons/twotone/green/news.gif) no-repeat 0 45%;
|
||||
background-position:0 -1054px;
|
||||
}
|
||||
|
||||
.pagination .nav_prev a,
|
||||
.pagination .nav_next a {
|
||||
background-repeat:no-repeat;
|
||||
border-color:#CEE1E9;
|
||||
box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
|
||||
-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
|
||||
-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
|
||||
}
|
||||
.pagination .nav_prev a {
|
||||
background-image:url(../../base/images/icons/twotone/green/arrow-left.gif);
|
||||
background-position:10% 45%;
|
||||
background-position:10% -187px;
|
||||
}
|
||||
.pagination .nav_next a {
|
||||
background-image:url(../../base/images/icons/twotone/green/arrow-right.gif);
|
||||
background-position:90% 45%;
|
||||
background-position:105% -252px;
|
||||
}
|
||||
.pagination .nav .processing {
|
||||
background-image:url(../../base/images/icons/icon_processing.gif);
|
||||
box-shadow:none;
|
||||
-moz-box-shadow:none;
|
||||
-webkit-box-shadow:none;
|
||||
outline:none;
|
||||
}
|
||||
.pagination .nav_next a.processing {
|
||||
background-position:90% 47%;
|
||||
}
|
||||
.pagination .nav_prev a.processing {
|
||||
background-position:10% 47%;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue