Merge remote branch 'upstream/master'
This commit is contained in:
zottel
commit
e9c86c0fd0
29 changed files with 623 additions and 444 deletions
47
INSTALL.txt
47
INSTALL.txt
|
|
@ -222,3 +222,50 @@ Retry the installation. As soon as the database has been created,
|
|||
|
||||
% chmod 755 .htconfig.php
|
||||
|
||||
#####################################################################
|
||||
- Some configurations with "suhosin" security are configured without
|
||||
an ability to run external processes. Friendica requires this ability.
|
||||
Following are some notes provided by one of our members.
|
||||
#####################################################################
|
||||
|
||||
On my server I use the php protection system Suhosin
|
||||
[http://www.hardened-php.net/suhosin/]. One of the things it does is to block
|
||||
certain functions like proc_open, as configured in /etc/php5/conf.d/suhosin.ini:
|
||||
|
||||
suhosin.executor.func.blacklist = proc_open, ...
|
||||
|
||||
For those sites like Friendica that really need these functions they can be
|
||||
enabled, e.g. in /etc/apache2/sites-available/friendica:
|
||||
|
||||
<Directory /var/www/friendica/>
|
||||
php_admin_value suhosin.executor.func.blacklist none
|
||||
php_admin_value suhosin.executor.eval.blacklist none
|
||||
</Directory>
|
||||
|
||||
This enables every function for Friendica if accessed via browser, but not for
|
||||
the cronjob that is called via php command line. I attempted to enable it for
|
||||
cron by using something like
|
||||
|
||||
*/10 * * * * cd /var/www/friendica/friendica/ && sudo -u www-data /usr/bin/php
|
||||
-d suhosin.executor.func.blacklist=none -d suhosin.executor.eval.blacklist=none
|
||||
-f include/poller.php
|
||||
|
||||
This worked well for simple test cases, but the friendica-cron still failed with
|
||||
a fatal error:
|
||||
suhosin[22962]: ALERT - function within blacklist called: proc_open() (attacker
|
||||
'REMOTE_ADDR not set', file '/var/www/friendica/friendica/boot.php', line 1341)
|
||||
|
||||
After a while I noticed, that include/poller.php calls further php script via
|
||||
proc_open. These scripts themselves also use proc_open and fail, because they
|
||||
are NOT called with -d suhosin.executor.func.blacklist=none.
|
||||
|
||||
So the simple solution is to put the correct parameters into .htconfig.php:
|
||||
// Location of PHP command line processor
|
||||
$a->config['php_path'] = '/usr/bin/php -d suhosin.executor.func.blacklist=none
|
||||
-d suhosin.executor.eval.blacklist=none';
|
||||
|
||||
|
||||
This is obvious as soon as you notice that the friendica-cron uses proc_open to
|
||||
execute php-scripts that also use proc_open, but it took me quite some time to
|
||||
find that out. I hope this saves some time for other people using suhosin with
|
||||
function blacklists.
|
||||
|
|
|
|||
21
boot.php
21
boot.php
|
|
@ -9,7 +9,7 @@ require_once('include/nav.php');
|
|||
require_once('include/cache.php');
|
||||
|
||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_VERSION', '3.0.1347' );
|
||||
define ( 'FRIENDICA_VERSION', '3.0.1349' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||
define ( 'DB_UPDATE_VERSION', 1144 );
|
||||
|
||||
|
|
@ -1323,6 +1323,25 @@ if(! function_exists('proc_run')) {
|
|||
$a = get_app();
|
||||
|
||||
$args = func_get_args();
|
||||
|
||||
$newargs = array();
|
||||
if(! count($args))
|
||||
return;
|
||||
|
||||
// expand any arrays
|
||||
|
||||
foreach($args as $arg) {
|
||||
if(is_array($arg)) {
|
||||
foreach($arg as $n) {
|
||||
$newargs[] = $n;
|
||||
}
|
||||
}
|
||||
else
|
||||
$newargs[] = $arg;
|
||||
}
|
||||
|
||||
$args = $newargs;
|
||||
|
||||
$arr = array('args' => $args, 'run_cmd' => true);
|
||||
|
||||
call_hooks("proc_run", $arr);
|
||||
|
|
|
|||
|
|
@ -174,6 +174,7 @@ function localize_item(&$item){
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -292,4 +292,38 @@ function zot_unencapsulate($data,$prvkey) {
|
|||
$ret['sender'] = $s;
|
||||
$ret['data'] = aes_unencapsulate($x,$prvkey);
|
||||
return $ret;
|
||||
}
|
||||
}
|
||||
|
||||
function new_keypair($bits) {
|
||||
|
||||
$openssl_options = array(
|
||||
'digest_alg' => 'sha1',
|
||||
'private_key_bits' => $bits,
|
||||
'encrypt_key' => false
|
||||
);
|
||||
|
||||
$conf = get_config('system','openssl_conf_file');
|
||||
if($conf)
|
||||
$openssl_options['config'] = $conf;
|
||||
|
||||
$result = openssl_pkey_new($openssl_options);
|
||||
|
||||
if(empty($result)) {
|
||||
logger('new_keypair: failed');
|
||||
return false;
|
||||
}
|
||||
|
||||
// Get private key
|
||||
|
||||
$response = array('prvkey' => '', 'pubkey' => '');
|
||||
|
||||
openssl_pkey_export($result, $response['prvkey']);
|
||||
|
||||
// Get public key
|
||||
$pkey = openssl_pkey_get_details($result);
|
||||
$response['pubkey'] = $pkey["key"];
|
||||
|
||||
return $response;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ function delivery_run($argv, $argc){
|
|||
|
||||
for($x = 3; $x < $argc; $x ++) {
|
||||
|
||||
$contact_id = intval($argv[x]);
|
||||
$contact_id = intval($argv[$x]);
|
||||
|
||||
// Some other process may have delivered this item already.
|
||||
|
||||
|
|
|
|||
|
|
@ -24,6 +24,9 @@ function directory_run($argv, $argc){
|
|||
|
||||
load_config('system');
|
||||
|
||||
load_hooks();
|
||||
|
||||
|
||||
$a->set_baseurl(get_config('system','url'));
|
||||
|
||||
$dir = get_config('system','directory_submit_url');
|
||||
|
|
@ -31,7 +34,12 @@ function directory_run($argv, $argc){
|
|||
if(! strlen($dir))
|
||||
return;
|
||||
|
||||
fetch_url($dir . '?url=' . bin2hex($argv[1]));
|
||||
$arr = array('url' => $argv[1]);
|
||||
|
||||
call_hooks('globaldir_update', $arr);
|
||||
|
||||
if(strlen($arr['url']))
|
||||
fetch_url($dir . '?url=' . bin2hex($arr['url']));
|
||||
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -478,24 +478,42 @@ function notifier_run($argv, $argc){
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
// This controls the number of deliveries to execute with each separate delivery process.
|
||||
// By default we'll perform one delivery per process. Assuming a hostile shared hosting
|
||||
// provider, this provides the greatest chance of deliveries if processes start getting
|
||||
// killed. We can also space them out with the delivery_interval to also help avoid them
|
||||
// getting whacked.
|
||||
|
||||
// If $deliveries_per_process > 1, we will chain this number of multiple deliveries
|
||||
// together into a single process. This will reduce the overall number of processes
|
||||
// spawned for each delivery, but they will run longer.
|
||||
|
||||
$deliveries_per_process = intval(get_config('system','delivery_batch_count'));
|
||||
if($deliveries_per_process <= 0)
|
||||
$deliveries_per_process = 1;
|
||||
|
||||
$this_batch = array();
|
||||
|
||||
foreach($r as $contact) {
|
||||
for($x = 0; $x < count($r); $x ++) {
|
||||
$contact = $r[$x];
|
||||
|
||||
if($contact['self'])
|
||||
continue;
|
||||
|
||||
// potentially more than one recipient. Start a new process and space them out a bit.
|
||||
// we will deliver single recipient types of message and email receipients here.
|
||||
|
||||
// we will deliver single recipient types of message and email recipients here.
|
||||
|
||||
if((! $mail) && (! $fsuggest) && (! $followup)) {
|
||||
// deliveries per process not yet implemented, 1 delivery per process.
|
||||
proc_run('php','include/delivery.php',$cmd,$item_id,$contact['id']);
|
||||
if($interval)
|
||||
@time_sleep_until(microtime(true) + (float) $interval);
|
||||
|
||||
$this_batch[] = $contact['id'];
|
||||
|
||||
if(count($this_batch) == $deliveries_per_process) {
|
||||
proc_run('php','include/delivery.php',$cmd,$item_id,$this_batch);
|
||||
$this_batch = array();
|
||||
if($interval)
|
||||
@time_sleep_until(microtime(true) + (float) $interval);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -901,24 +901,30 @@ function prepare_body($item,$attach = false) {
|
|||
foreach($arr as $r) {
|
||||
$matches = false;
|
||||
$icon = '';
|
||||
$cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches);
|
||||
$cnt = preg_match_all('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches, PREG_SET_ORDER);
|
||||
if($cnt) {
|
||||
$icontype = strtolower(substr($matches[3],0,strpos($matches[3],'/')));
|
||||
switch($icontype) {
|
||||
case 'video':
|
||||
case 'audio':
|
||||
case 'image':
|
||||
case 'text':
|
||||
$icon = '<div class="attachtype icon s22 type-' . $icontype . '"></div>';
|
||||
break;
|
||||
default:
|
||||
$icon = '<div class="attachtype icon s22 type-unkn"></div>';
|
||||
break;
|
||||
}
|
||||
$title = ((strlen(trim($matches[4]))) ? escape_tags(trim($matches[4])) : escape_tags($matches[1]));
|
||||
$title .= ' ' . $matches[2] . ' ' . t('bytes');
|
||||
foreach($matches as $mtch) {
|
||||
$icontype = strtolower(substr($mtch[3],0,strpos($mtch[3],'/')));
|
||||
switch($icontype) {
|
||||
case 'video':
|
||||
case 'audio':
|
||||
case 'image':
|
||||
case 'text':
|
||||
$icon = '<div class="attachtype icon s22 type-' . $icontype . '"></div>';
|
||||
break;
|
||||
default:
|
||||
$icon = '<div class="attachtype icon s22 type-unkn"></div>';
|
||||
break;
|
||||
}
|
||||
$title = ((strlen(trim($mtch[4]))) ? escape_tags(trim($mtch[4])) : escape_tags($mtch[1]));
|
||||
$title .= ' ' . $mtch[2] . ' ' . t('bytes');
|
||||
if((local_user() == $item['uid']) && $item['contact-id'] != $a->contact['id'])
|
||||
$the_url = $a->get_baseurl() . '/redir/' . $item['contact-id'] . '?f=1&url=' . $mtch[1];
|
||||
else
|
||||
$the_url = $mtch[1];
|
||||
|
||||
$s .= '<a href="' . strip_tags($matches[1]) . '" title="' . $title . '" class="attachlink" target="external-link" >' . $icon . '</a>';
|
||||
$s .= '<a href="' . strip_tags($the_url) . '" title="' . $title . '" class="attachlink" target="external-link" >' . $icon . '</a>';
|
||||
}
|
||||
}
|
||||
}
|
||||
$s .= '<div class="clear"></div></div>';
|
||||
|
|
|
|||
|
|
@ -417,7 +417,7 @@ function admin_page_site(&$a) {
|
|||
'$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
|
||||
|
||||
'$register_policy' => array('register_policy', t("Register policy"), $a->config['register_policy'], "", $register_choices),
|
||||
'$register_text' => array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES), t("Will be displayed prominently on the registration page.")),
|
||||
'$register_text' => array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")),
|
||||
'$abandon_days' => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')),
|
||||
'$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")),
|
||||
'$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")),
|
||||
|
|
|
|||
|
|
@ -144,19 +144,12 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
|
|||
* worried about key leakage than anybody cracking it.
|
||||
*
|
||||
*/
|
||||
require_once('include/crypto.php');
|
||||
|
||||
$res = openssl_pkey_new(array(
|
||||
'digest_alg' => 'sha1',
|
||||
'private_key_bits' => 4096,
|
||||
'encrypt_key' => false )
|
||||
);
|
||||
$res = new_keypair(1024);
|
||||
|
||||
$private_key = '';
|
||||
|
||||
openssl_pkey_export($res, $private_key);
|
||||
|
||||
$pubkey = openssl_pkey_get_details($res);
|
||||
$public_key = $pubkey["key"];
|
||||
$private_key = $res['prvkey'];
|
||||
$public_key = $res['pubkey'];
|
||||
|
||||
// Save the private key. Send them the public key.
|
||||
|
||||
|
|
|
|||
|
|
@ -8,26 +8,10 @@ function hostxrd_init(&$a) {
|
|||
$pubkey = get_config('system','site_pubkey');
|
||||
|
||||
if(! $pubkey) {
|
||||
$res = new_keypair(1024);
|
||||
|
||||
// should only have to ever do this once.
|
||||
|
||||
$res=openssl_pkey_new(array(
|
||||
'digest_alg' => 'sha1',
|
||||
'private_key_bits' => 4096,
|
||||
'encrypt_key' => false ));
|
||||
|
||||
|
||||
$prvkey = '';
|
||||
|
||||
openssl_pkey_export($res, $prvkey);
|
||||
|
||||
// Get public key
|
||||
|
||||
$pkey = openssl_pkey_get_details($res);
|
||||
$pubkey = $pkey["key"];
|
||||
|
||||
set_config('system','site_prvkey', $prvkey);
|
||||
set_config('system','site_pubkey', $pubkey);
|
||||
set_config('system','site_prvkey', $res['prvkey']);
|
||||
set_config('system','site_pubkey', $res['pubkey']);
|
||||
}
|
||||
|
||||
$tpl = file_get_contents('view/xrd_host.tpl');
|
||||
|
|
|
|||
16
mod/item.php
16
mod/item.php
|
|
@ -290,18 +290,16 @@ function item_post(&$a) {
|
|||
$author = null;
|
||||
$self = false;
|
||||
|
||||
if(($_SESSION['uid']) && ($_SESSION['uid'] == $profile_uid)) {
|
||||
if((local_user()) && (local_user() == $profile_uid)) {
|
||||
$self = true;
|
||||
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
|
||||
intval($_SESSION['uid'])
|
||||
);
|
||||
}
|
||||
else {
|
||||
if((x($_SESSION,'visitor_id')) && (intval($_SESSION['visitor_id']))) {
|
||||
$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
|
||||
intval($_SESSION['visitor_id'])
|
||||
);
|
||||
}
|
||||
elseif(remote_user()) {
|
||||
$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
|
||||
intval(remote_user())
|
||||
);
|
||||
}
|
||||
|
||||
if(count($r)) {
|
||||
|
|
@ -311,7 +309,7 @@ function item_post(&$a) {
|
|||
|
||||
// get contact info for owner
|
||||
|
||||
if($profile_uid == $_SESSION['uid']) {
|
||||
if($profile_uid == local_user()) {
|
||||
$contact_record = $author;
|
||||
}
|
||||
else {
|
||||
|
|
@ -322,8 +320,6 @@ function item_post(&$a) {
|
|||
$contact_record = $r[0];
|
||||
}
|
||||
|
||||
|
||||
|
||||
$post_type = notags(trim($_REQUEST['type']));
|
||||
|
||||
if($post_type === 'net-comment') {
|
||||
|
|
|
|||
|
|
@ -977,9 +977,16 @@ function photos_content(&$a) {
|
|||
|
||||
$tpl = get_markup_template('photo_album.tpl');
|
||||
if(count($r))
|
||||
$twist = 'rotright';
|
||||
foreach($r as $rr) {
|
||||
if($twist == 'rotright')
|
||||
$twist = 'rotleft';
|
||||
else
|
||||
$twist = 'rotright';
|
||||
|
||||
$o .= replace_macros($tpl,array(
|
||||
'$id' => $rr['id'],
|
||||
'$twist' => ' ' . $twist . rand(2,4),
|
||||
'$photolink' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
|
||||
'$phototitle' => t('View Photo'),
|
||||
'$imgsrc' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.jpg',
|
||||
|
|
@ -1400,9 +1407,16 @@ function photos_content(&$a) {
|
|||
|
||||
$photos = array();
|
||||
if(count($r)) {
|
||||
$twist = 'rotright';
|
||||
foreach($r as $rr) {
|
||||
if($twist == 'rotright')
|
||||
$twist = 'rotleft';
|
||||
else
|
||||
$twist = 'rotright';
|
||||
|
||||
$photos[] = array(
|
||||
'id' => $rr['id'],
|
||||
'twist' => ' ' . $twist . rand(2,4),
|
||||
'link' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'],
|
||||
'title' => t('View Photo'),
|
||||
'src' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.jpg',
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ function redir_init(&$a) {
|
|||
|
||||
// traditional DFRN
|
||||
|
||||
if(local_user() && $a->argc == 2 && intval($a->argv[1])) {
|
||||
if(local_user() && $a->argc > 1 && intval($a->argv[1])) {
|
||||
|
||||
$cid = $a->argv[1];
|
||||
|
||||
|
|
|
|||
|
|
@ -171,26 +171,17 @@ function register_post(&$a) {
|
|||
$new_password = autoname(6) . mt_rand(100,9999);
|
||||
$new_password_encoded = hash('whirlpool',$new_password);
|
||||
|
||||
$res=openssl_pkey_new(array(
|
||||
'digest_alg' => 'sha1',
|
||||
'private_key_bits' => 4096,
|
||||
'encrypt_key' => false ));
|
||||
require_once('include/crypto.php');
|
||||
|
||||
// Get private key
|
||||
$result = new_keypair(1024);
|
||||
|
||||
if(empty($res)) {
|
||||
if($result === false) {
|
||||
notice( t('SERIOUS ERROR: Generation of security keys failed.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
$prvkey = '';
|
||||
|
||||
openssl_pkey_export($res, $prvkey);
|
||||
|
||||
// Get public key
|
||||
|
||||
$pkey = openssl_pkey_get_details($res);
|
||||
$pubkey = $pkey["key"];
|
||||
$prvkey = $result['prvkey'];
|
||||
$pubkey = $result['pubkey'];
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -203,21 +194,9 @@ function register_post(&$a) {
|
|||
*
|
||||
*/
|
||||
|
||||
$sres=openssl_pkey_new(array(
|
||||
'digest_alg' => 'sha1',
|
||||
'private_key_bits' => 512,
|
||||
'encrypt_key' => false ));
|
||||
|
||||
// Get private key
|
||||
|
||||
$sprvkey = '';
|
||||
|
||||
openssl_pkey_export($sres, $sprvkey);
|
||||
|
||||
// Get public key
|
||||
|
||||
$spkey = openssl_pkey_get_details($sres);
|
||||
$spubkey = $spkey["key"];
|
||||
$sres = new_keypair(512);
|
||||
$sprvkey = $sres['prvkey'];
|
||||
$spubkey = $sres['pubkey'];
|
||||
|
||||
$r = q("INSERT INTO `user` ( `guid`, `username`, `password`, `email`, `openid`, `nickname`,
|
||||
`pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked`, `timezone` )
|
||||
|
|
|
|||
226
util/messages.po
226
util/messages.po
|
|
@ -6,9 +6,9 @@
|
|||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: 3.0.1347\n"
|
||||
"Project-Id-Version: 3.0.1349\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2012-05-19 10:00-0700\n"
|
||||
"POT-Creation-Date: 2012-05-21 10:00-0700\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
@ -123,8 +123,8 @@ msgstr ""
|
|||
|
||||
#: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
|
||||
#: ../../mod/events.php:428 ../../mod/photos.php:900 ../../mod/photos.php:958
|
||||
#: ../../mod/photos.php:1193 ../../mod/photos.php:1233
|
||||
#: ../../mod/photos.php:1273 ../../mod/photos.php:1304
|
||||
#: ../../mod/photos.php:1200 ../../mod/photos.php:1240
|
||||
#: ../../mod/photos.php:1280 ../../mod/photos.php:1311
|
||||
#: ../../mod/install.php:251 ../../mod/install.php:289
|
||||
#: ../../mod/localtime.php:45 ../../mod/contacts.php:322
|
||||
#: ../../mod/settings.php:553 ../../mod/settings.php:699
|
||||
|
|
@ -220,7 +220,7 @@ msgid "link to source"
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:126
|
||||
#: ../../include/nav.php:52 ../../boot.php:1503
|
||||
#: ../../include/nav.php:52 ../../boot.php:1522
|
||||
msgid "Events"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -330,7 +330,7 @@ msgstr ""
|
|||
#: ../../mod/settings.php:910 ../../mod/settings.php:916
|
||||
#: ../../mod/settings.php:952 ../../mod/settings.php:953
|
||||
#: ../../mod/settings.php:954 ../../mod/settings.php:955
|
||||
#: ../../mod/register.php:532 ../../mod/profiles.php:511
|
||||
#: ../../mod/register.php:511 ../../mod/profiles.php:511
|
||||
msgid "Yes"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -341,22 +341,22 @@ msgstr ""
|
|||
#: ../../mod/settings.php:910 ../../mod/settings.php:916
|
||||
#: ../../mod/settings.php:952 ../../mod/settings.php:953
|
||||
#: ../../mod/settings.php:954 ../../mod/settings.php:955
|
||||
#: ../../mod/register.php:533 ../../mod/profiles.php:512
|
||||
#: ../../mod/register.php:512 ../../mod/profiles.php:512
|
||||
msgid "No"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:43 ../../boot.php:1497
|
||||
#: ../../mod/photos.php:43 ../../boot.php:1516
|
||||
msgid "Photo Albums"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879
|
||||
#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382
|
||||
#: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110
|
||||
#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1389
|
||||
#: ../../mod/photos.php:1401 ../../addon/communityhome/communityhome.php:110
|
||||
#: ../../view/theme/diabook/theme.php:593
|
||||
msgid "Contact Photos"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:58 ../../mod/photos.php:975 ../../mod/photos.php:1424
|
||||
#: ../../mod/photos.php:58 ../../mod/photos.php:975 ../../mod/photos.php:1438
|
||||
msgid "Upload New Photos"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -369,8 +369,8 @@ msgid "Contact information unavailable"
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:151 ../../mod/photos.php:597 ../../mod/photos.php:950
|
||||
#: ../../mod/photos.php:965 ../../mod/register.php:335
|
||||
#: ../../mod/register.php:342 ../../mod/register.php:349
|
||||
#: ../../mod/photos.php:965 ../../mod/register.php:314
|
||||
#: ../../mod/register.php:321 ../../mod/register.php:328
|
||||
#: ../../mod/profile_photo.php:60 ../../mod/profile_photo.php:67
|
||||
#: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174
|
||||
#: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261
|
||||
|
|
@ -387,7 +387,7 @@ msgstr ""
|
|||
msgid "Delete Album"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:242 ../../mod/photos.php:1194
|
||||
#: ../../mod/photos.php:242 ../../mod/photos.php:1201
|
||||
msgid "Delete Photo"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -455,7 +455,7 @@ msgstr ""
|
|||
msgid "Do not show a status post for this upload"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:914 ../../mod/photos.php:1189
|
||||
#: ../../mod/photos.php:914 ../../mod/photos.php:1196
|
||||
msgid "Permissions"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -463,108 +463,108 @@ msgstr ""
|
|||
msgid "Edit Album"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:984 ../../mod/photos.php:1407
|
||||
#: ../../mod/photos.php:991 ../../mod/photos.php:1421
|
||||
msgid "View Photo"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1019
|
||||
#: ../../mod/photos.php:1026
|
||||
msgid "Permission denied. Access to this item may be restricted."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1021
|
||||
#: ../../mod/photos.php:1028
|
||||
msgid "Photo not available"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1071
|
||||
#: ../../mod/photos.php:1078
|
||||
msgid "View photo"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1071
|
||||
#: ../../mod/photos.php:1078
|
||||
msgid "Edit photo"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1072
|
||||
#: ../../mod/photos.php:1079
|
||||
msgid "Use as profile photo"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1078 ../../include/conversation.php:483
|
||||
#: ../../mod/photos.php:1085 ../../include/conversation.php:483
|
||||
msgid "Private Message"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1100
|
||||
#: ../../mod/photos.php:1107
|
||||
msgid "View Full Size"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1168
|
||||
#: ../../mod/photos.php:1175
|
||||
msgid "Tags: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1171
|
||||
#: ../../mod/photos.php:1178
|
||||
msgid "[Remove any tag]"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1182
|
||||
#: ../../mod/photos.php:1189
|
||||
msgid "New album name"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1185
|
||||
#: ../../mod/photos.php:1192
|
||||
msgid "Caption"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1187
|
||||
#: ../../mod/photos.php:1194
|
||||
msgid "Add a Tag"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1191
|
||||
#: ../../mod/photos.php:1198
|
||||
msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1211 ../../include/conversation.php:532
|
||||
#: ../../mod/photos.php:1218 ../../include/conversation.php:532
|
||||
msgid "I like this (toggle)"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1212 ../../include/conversation.php:533
|
||||
#: ../../mod/photos.php:1219 ../../include/conversation.php:533
|
||||
msgid "I don't like this (toggle)"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1213 ../../include/conversation.php:967
|
||||
#: ../../mod/photos.php:1220 ../../include/conversation.php:967
|
||||
msgid "Share"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1214 ../../mod/editpost.php:104
|
||||
#: ../../mod/photos.php:1221 ../../mod/editpost.php:104
|
||||
#: ../../mod/wallmessage.php:145 ../../mod/message.php:214
|
||||
#: ../../mod/message.php:408 ../../include/conversation.php:364
|
||||
#: ../../include/conversation.php:709 ../../include/conversation.php:986
|
||||
msgid "Please wait"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1230 ../../mod/photos.php:1270
|
||||
#: ../../mod/photos.php:1301 ../../include/conversation.php:555
|
||||
#: ../../mod/photos.php:1237 ../../mod/photos.php:1277
|
||||
#: ../../mod/photos.php:1308 ../../include/conversation.php:555
|
||||
msgid "This is you"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1232 ../../mod/photos.php:1272
|
||||
#: ../../mod/photos.php:1303 ../../include/conversation.php:557
|
||||
#: ../../mod/photos.php:1239 ../../mod/photos.php:1279
|
||||
#: ../../mod/photos.php:1310 ../../include/conversation.php:557
|
||||
#: ../../boot.php:516
|
||||
msgid "Comment"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1234 ../../mod/editpost.php:125
|
||||
#: ../../mod/photos.php:1241 ../../mod/editpost.php:125
|
||||
#: ../../include/conversation.php:567 ../../include/conversation.php:1004
|
||||
msgid "Preview"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1331 ../../mod/settings.php:616
|
||||
#: ../../mod/photos.php:1338 ../../mod/settings.php:616
|
||||
#: ../../mod/settings.php:697 ../../mod/group.php:168 ../../mod/admin.php:647
|
||||
#: ../../include/conversation.php:321 ../../include/conversation.php:587
|
||||
msgid "Delete"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1413
|
||||
#: ../../mod/photos.php:1427
|
||||
msgid "View Album"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/photos.php:1422
|
||||
#: ../../mod/photos.php:1436
|
||||
msgid "Recent Photos"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -577,7 +577,7 @@ msgstr ""
|
|||
msgid "Community"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/community.php:61 ../../mod/search.php:134
|
||||
#: ../../mod/community.php:61 ../../mod/search.php:138
|
||||
msgid "No results."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1170,7 +1170,7 @@ msgstr ""
|
|||
msgid "Connect"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/match.php:65 ../../mod/dirfind.php:57
|
||||
#: ../../mod/match.php:65 ../../mod/dirfind.php:60
|
||||
msgid "No matches"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -1687,12 +1687,12 @@ msgid "Password reset requested at %s"
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
|
||||
#: ../../mod/register.php:388 ../../mod/register.php:442
|
||||
#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
|
||||
#: ../../mod/register.php:367 ../../mod/register.php:421
|
||||
#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:745
|
||||
#: ../../addon/facebook/facebook.php:688
|
||||
#: ../../addon/facebook/facebook.php:1178
|
||||
#: ../../addon/public_server/public_server.php:62
|
||||
#: ../../addon/testdrive/testdrive.php:61 ../../include/items.php:2738
|
||||
#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2738
|
||||
#: ../../boot.php:696
|
||||
msgid "Administrator"
|
||||
msgstr ""
|
||||
|
|
@ -2369,7 +2369,7 @@ msgstr ""
|
|||
msgid "Invalid contact."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/notes.php:44 ../../boot.php:1509
|
||||
#: ../../mod/notes.php:44 ../../boot.php:1528
|
||||
msgid "Personal Notes"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2620,7 +2620,7 @@ msgstr ""
|
|||
|
||||
#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:123
|
||||
#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74
|
||||
#: ../../include/nav.php:50 ../../boot.php:1488
|
||||
#: ../../include/nav.php:50 ../../boot.php:1507
|
||||
msgid "Profile"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2686,7 +2686,7 @@ msgid ""
|
|||
"must also begin with a letter."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:153 ../../mod/register.php:264
|
||||
#: ../../mod/register.php:153 ../../mod/register.php:243
|
||||
msgid "Nickname is already registered. Please choose another."
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2696,107 +2696,107 @@ msgid ""
|
|||
"another."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:182
|
||||
#: ../../mod/register.php:179
|
||||
msgid "SERIOUS ERROR: Generation of security keys failed."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:250
|
||||
#: ../../mod/register.php:229
|
||||
msgid "An error occurred during registration. Please try again."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:286
|
||||
#: ../../mod/register.php:265
|
||||
msgid "An error occurred creating your default profile. Please try again."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:386 ../../mod/regmod.php:52
|
||||
#: ../../mod/register.php:365 ../../mod/regmod.php:52
|
||||
#, php-format
|
||||
msgid "Registration details for %s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:394
|
||||
#: ../../mod/register.php:373
|
||||
msgid ""
|
||||
"Registration successful. Please check your email for further instructions."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:398
|
||||
#: ../../mod/register.php:377
|
||||
msgid "Failed to send email message. Here is the message that failed."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:403
|
||||
#: ../../mod/register.php:382
|
||||
msgid "Your registration can not be processed."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:440
|
||||
#: ../../mod/register.php:419
|
||||
#, php-format
|
||||
msgid "Registration request at %s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:449
|
||||
#: ../../mod/register.php:428
|
||||
msgid "Your registration is pending approval by the site owner."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:487
|
||||
#: ../../mod/register.php:466
|
||||
msgid ""
|
||||
"This site has exceeded the number of allowed daily account registrations. "
|
||||
"Please try again tomorrow."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:513
|
||||
#: ../../mod/register.php:492
|
||||
msgid ""
|
||||
"You may (optionally) fill in this form via OpenID by supplying your OpenID "
|
||||
"and clicking 'Register'."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:514
|
||||
#: ../../mod/register.php:493
|
||||
msgid ""
|
||||
"If you are not familiar with OpenID, please leave that field blank and fill "
|
||||
"in the rest of the items."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:515
|
||||
#: ../../mod/register.php:494
|
||||
msgid "Your OpenID (optional): "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:529
|
||||
#: ../../mod/register.php:508
|
||||
msgid "Include your profile in member directory?"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:549
|
||||
#: ../../mod/register.php:528
|
||||
msgid "Membership on this site is by invitation only."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:550
|
||||
#: ../../mod/register.php:529
|
||||
msgid "Your invitation ID: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:553 ../../mod/admin.php:405
|
||||
#: ../../mod/register.php:532 ../../mod/admin.php:405
|
||||
msgid "Registration"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:561
|
||||
#: ../../mod/register.php:540
|
||||
msgid "Your Full Name (e.g. Joe Smith): "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:562
|
||||
#: ../../mod/register.php:541
|
||||
msgid "Your Email Address: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:563
|
||||
#: ../../mod/register.php:542
|
||||
msgid ""
|
||||
"Choose a profile nickname. This must begin with a text character. Your "
|
||||
"profile address on this site will then be '<strong>nickname@$sitename</"
|
||||
"strong>'."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:564
|
||||
#: ../../mod/register.php:543
|
||||
msgid "Choose a nickname: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:794
|
||||
#: ../../mod/register.php:546 ../../include/nav.php:81 ../../boot.php:794
|
||||
msgid "Register"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/dirfind.php:23
|
||||
#: ../../mod/dirfind.php:26
|
||||
msgid "People Search"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2835,7 +2835,7 @@ msgid "Access denied."
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:125
|
||||
#: ../../include/nav.php:51 ../../boot.php:1494
|
||||
#: ../../include/nav.php:51 ../../boot.php:1513
|
||||
msgid "Photos"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -2860,38 +2860,38 @@ msgstr ""
|
|||
msgid "Unable to locate original post."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/item.php:249
|
||||
#: ../../mod/item.php:258
|
||||
msgid "Empty post discarded."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/item.php:372 ../../mod/wall_upload.php:99
|
||||
#: ../../mod/item.php:381 ../../mod/wall_upload.php:99
|
||||
#: ../../mod/wall_upload.php:108 ../../mod/wall_upload.php:115
|
||||
#: ../../include/message.php:144
|
||||
msgid "Wall Photos"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/item.php:781
|
||||
#: ../../mod/item.php:790
|
||||
msgid "System error. Post not saved."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/item.php:806
|
||||
#: ../../mod/item.php:815
|
||||
#, php-format
|
||||
msgid ""
|
||||
"This message was sent to you by %s, a member of the Friendica social network."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/item.php:808
|
||||
#: ../../mod/item.php:817
|
||||
#, php-format
|
||||
msgid "You may visit them online at %s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/item.php:809
|
||||
#: ../../mod/item.php:818
|
||||
msgid ""
|
||||
"Please contact the sender by replying to this post if you do not wish to "
|
||||
"receive these messages."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/item.php:811
|
||||
#: ../../mod/item.php:820
|
||||
#, php-format
|
||||
msgid "%s posted an update."
|
||||
msgstr ""
|
||||
|
|
@ -3764,8 +3764,8 @@ msgstr ""
|
|||
msgid "No installed applications."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/search.php:83
|
||||
msgid "Search This Site"
|
||||
#: ../../mod/search.php:83 ../../include/text.php:650 ../../include/nav.php:91
|
||||
msgid "Search"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/profiles.php:21 ../../mod/profiles.php:375
|
||||
|
|
@ -4220,83 +4220,83 @@ msgid ""
|
|||
"has already been approved."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/dfrn_confirm.php:242
|
||||
#: ../../mod/dfrn_confirm.php:235
|
||||
msgid "Response from remote site was not understood."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/dfrn_confirm.php:251
|
||||
#: ../../mod/dfrn_confirm.php:244
|
||||
msgid "Unexpected response from remote site: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/dfrn_confirm.php:259
|
||||
#: ../../mod/dfrn_confirm.php:252
|
||||
msgid "Confirmation completed successfully."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/dfrn_confirm.php:261 ../../mod/dfrn_confirm.php:275
|
||||
#: ../../mod/dfrn_confirm.php:282
|
||||
#: ../../mod/dfrn_confirm.php:254 ../../mod/dfrn_confirm.php:268
|
||||
#: ../../mod/dfrn_confirm.php:275
|
||||
msgid "Remote site reported: "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/dfrn_confirm.php:273
|
||||
#: ../../mod/dfrn_confirm.php:266
|
||||
msgid "Temporary failure. Please wait and try again."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/dfrn_confirm.php:280
|
||||
#: ../../mod/dfrn_confirm.php:273
|
||||
msgid "Introduction failed or was revoked."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/dfrn_confirm.php:425
|
||||
#: ../../mod/dfrn_confirm.php:418
|
||||
msgid "Unable to set contact photo."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/dfrn_confirm.php:482 ../../include/diaspora.php:507
|
||||
#: ../../mod/dfrn_confirm.php:475 ../../include/diaspora.php:507
|
||||
#: ../../include/conversation.php:101
|
||||
#, php-format
|
||||
msgid "%1$s is now friends with %2$s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/dfrn_confirm.php:564
|
||||
#: ../../mod/dfrn_confirm.php:557
|
||||
#, php-format
|
||||
msgid "No user record found for '%s' "
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/dfrn_confirm.php:574
|
||||
#: ../../mod/dfrn_confirm.php:567
|
||||
msgid "Our site encryption key is apparently messed up."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/dfrn_confirm.php:585
|
||||
#: ../../mod/dfrn_confirm.php:578
|
||||
msgid "Empty site URL was provided or URL could not be decrypted by us."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/dfrn_confirm.php:606
|
||||
#: ../../mod/dfrn_confirm.php:599
|
||||
msgid "Contact record was not found for you on our site."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/dfrn_confirm.php:620
|
||||
#: ../../mod/dfrn_confirm.php:613
|
||||
#, php-format
|
||||
msgid "Site public key not available in contact record for URL %s."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/dfrn_confirm.php:640
|
||||
#: ../../mod/dfrn_confirm.php:633
|
||||
msgid ""
|
||||
"The ID provided by your system is a duplicate on our system. It should work "
|
||||
"if you try again."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/dfrn_confirm.php:651
|
||||
#: ../../mod/dfrn_confirm.php:644
|
||||
msgid "Unable to set your contact credentials on our system."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/dfrn_confirm.php:716
|
||||
#: ../../mod/dfrn_confirm.php:709
|
||||
msgid "Unable to update your contact profile details on our system"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/dfrn_confirm.php:750
|
||||
#: ../../mod/dfrn_confirm.php:743
|
||||
#, php-format
|
||||
msgid "Connection accepted at %s"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/dfrn_confirm.php:799
|
||||
#: ../../mod/dfrn_confirm.php:792
|
||||
#, php-format
|
||||
msgid "%1$s has joined %2$s"
|
||||
msgstr ""
|
||||
|
|
@ -4864,7 +4864,7 @@ msgid "Enable Geonames Plugin"
|
|||
msgstr ""
|
||||
|
||||
#: ../../addon/public_server/public_server.php:126
|
||||
#: ../../addon/testdrive/testdrive.php:88
|
||||
#: ../../addon/testdrive/testdrive.php:94
|
||||
#, php-format
|
||||
msgid "Your account on %s will expire in a few days."
|
||||
msgstr ""
|
||||
|
|
@ -5141,11 +5141,11 @@ msgstr ""
|
|||
msgid "Gravatar settings updated."
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/testdrive/testdrive.php:89
|
||||
#: ../../addon/testdrive/testdrive.php:95
|
||||
msgid "Your Friendica test account is about to expire."
|
||||
msgstr ""
|
||||
|
||||
#: ../../addon/testdrive/testdrive.php:90
|
||||
#: ../../addon/testdrive/testdrive.php:96
|
||||
#, php-format
|
||||
msgid ""
|
||||
"Hi %1$s,\n"
|
||||
|
|
@ -6221,12 +6221,12 @@ msgstr ""
|
|||
msgid "Finishes:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/delivery.php:455 ../../include/notifier.php:659
|
||||
#: ../../include/delivery.php:455 ../../include/notifier.php:677
|
||||
msgid "(no subject)"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/delivery.php:462 ../../include/enotify.php:23
|
||||
#: ../../include/notifier.php:666
|
||||
#: ../../include/notifier.php:684
|
||||
msgid "noreply"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -6257,10 +6257,6 @@ msgid_plural "%d Contacts"
|
|||
msgstr[0] ""
|
||||
msgstr[1] ""
|
||||
|
||||
#: ../../include/text.php:650 ../../include/nav.php:91
|
||||
msgid "Search"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/text.php:831
|
||||
msgid "Monday"
|
||||
msgstr ""
|
||||
|
|
@ -6453,7 +6449,7 @@ msgstr ""
|
|||
msgid "End this session"
|
||||
msgstr ""
|
||||
|
||||
#: ../../include/nav.php:49 ../../boot.php:1482
|
||||
#: ../../include/nav.php:49 ../../boot.php:1501
|
||||
msgid "Status"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -7282,18 +7278,18 @@ msgstr ""
|
|||
msgid "Events this week:"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1485
|
||||
#: ../../boot.php:1504
|
||||
msgid "Status Messages and Posts"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1491
|
||||
#: ../../boot.php:1510
|
||||
msgid "Profile Details"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1506
|
||||
#: ../../boot.php:1525
|
||||
msgid "Events and Calendar"
|
||||
msgstr ""
|
||||
|
||||
#: ../../boot.php:1512
|
||||
#: ../../boot.php:1531
|
||||
msgid "Only You Can See This"
|
||||
msgstr ""
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-$id">
|
||||
<a href="$photolink" class="photo-album-photo-link" id="photo-album-photo-link-$id" title="$phototitle">
|
||||
<img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo lframe resize" id="photo-album-photo-$id" />
|
||||
<img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo lframe resize$twist" id="photo-album-photo-$id" />
|
||||
<p class='caption'>$desc</p>
|
||||
</a>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
|
||||
<div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-$id">
|
||||
<div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-$photo.id">
|
||||
<a href="$photo.link" class="photo-top-photo-link" id="photo-top-photo-link-$photo.id" title="$photo.title">
|
||||
<img src="$photo.src" alt="$photo.alt" title="$photo.title" class="photo-top-photo" id="photo-top-photo-$photo.id" />
|
||||
<img src="$photo.src" alt="$photo.alt" title="$photo.title" class="photo-top-photo$photo.twist" id="photo-top-photo-$photo.id" />
|
||||
</a>
|
||||
<div class="photo-top-album-name"><a href="$photo.album.link" class="photo-top-album-link" title="$photo.album.alt" >$photo.album.name</a></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -8,3 +8,4 @@
|
|||
{{ inc photo_top.tpl }}{{ endinc }}
|
||||
{{ endfor }}
|
||||
</div>
|
||||
<div class="photos-end"></div>
|
||||
|
|
|
|||
|
|
@ -37,8 +37,9 @@ img{border:0 none;}
|
|||
a{color:#88a9d2;text-decoration:none;margin-bottom:1px;}a:hover{color:#638ec4;border-bottom:1px dotted #638ec4;}
|
||||
a:hover img{text-decoration:none;}
|
||||
blockquote{background:#444444;color:#eeeecc;text-indent:5px;padding:5px;border:1px solid #9a9a9a;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
|
||||
label{width:38%;display:inline-block;font-size:small;margin:0 10px 1em 0;border:1px solid #2e2f2e;padding:5px;background:#eeeecc;color:#111111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;}
|
||||
input{width:250px;height:25px;border:1px solid #999999;}input[type="checkbox"],input[type="radio"]{margin:0;width:15px;height:15px;}
|
||||
label{width:38%;display:inline-block;font-size:small;margin:0 10px 1em 0;border:1px solid #2e2f2e;padding:3px 5px;background:#eeeecc;color:#111111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;}
|
||||
input{width:250px;height:25px;border:1px solid #999999;width:17em;}input[type="checkbox"],input[type="radio"]{width:15px;height:15px;margin:0;}
|
||||
input[type="radio"]{margin:5px 0;}
|
||||
input[type="submit"],input[type="button"]{background-color:#eeeeee;border:2px outset #b1b1b1;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:1px 3px 4px 0 #111111;-o-box-shadow:1px 3px 4px 0 #111111;-webkit-box-shadow:1px 3px 4px 0 #111111;-ms-box-shadow:1px 3px 4px 0 #111111;box-shadow:1px 3px 4px 0 #111111;color:#2e302e;cursor:pointer;font-weight:bold;width:auto;-moz-text-shadow:1px 1px #111111;-o-text-shadow:1px 1px #111111;-webkit-text-shadow:1px 1px #111111;-ms-text-shadow:1px 1px #111111;text-shadow:1px 1px #111111;}
|
||||
input[type="submit"]:active,input[type="button"]:active{-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
|
||||
h1,h2,h3,h4,h5,h6{margin:10px 0px;font-weight:bold;border-bottom:1px solid #638ec4;}
|
||||
|
|
@ -55,9 +56,9 @@ h6{font-size:xx-small;}
|
|||
.action{margin:5px 0;}
|
||||
.tool{margin:5px 0;list-style:none;}
|
||||
#articlemain{width:100%;height:100%;margin:0 auto;}
|
||||
.button,#profile-listing-desc{color:#eeeecc;padding:5px;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;}
|
||||
.button a,#profile-listing-desc a{color:#eeeecc;font-weight:bold;}
|
||||
[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:1px outset #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
|
||||
.button{color:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#eeeecc;font-weight:bold;}
|
||||
#profile-listing-desc a{color:#eeeecc;font-weight:bold;}
|
||||
[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:3px outset #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
|
||||
#item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
|
||||
.intro-approve-as-friend-desc{margin-top:10px;}
|
||||
.intro-desc{margin-bottom:20px;font-weight:bold;}
|
||||
|
|
@ -105,9 +106,9 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
|
|||
#nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;}
|
||||
.floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(dark/icons.png) -190px -60px no-repeat;}
|
||||
.search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
|
||||
#search-text,#mini-search-text{background:#2e2f2e;color:#eeeecc;margin:8px;}
|
||||
#search-text{border:1px solid #eeeecc;}
|
||||
#mini-search-text{font-size:8pt;height:14px;width:10em;}
|
||||
#search-text,#mini-search-text{background:white;color:#2e2f2e;margin:8px;}
|
||||
#search-text{border:1px solid #eeeeee;margin:8px 0;}
|
||||
#mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;}
|
||||
#scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;}
|
||||
#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:75%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;}
|
||||
#user-menu-label{font-size:small;padding:3px 20px 9px 5px;height:10px;}
|
||||
|
|
@ -120,7 +121,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
|
|||
#intro-update{background-position:-120px 0px;}
|
||||
#lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;}
|
||||
#language-selector{position:fixed;bottom:2px;left:52px;z-index:10;}
|
||||
.menu-popup{position:absolute;display:none;width:11em;background:white;color:#2e2f2e;margin:0px;padding:0px;border:3px solid #88a9d2;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#2e2f2e;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeecc;background-color:#88a9d2;}
|
||||
.menu-popup{position:absolute;display:none;background:white;color:#2e2f2e;margin:0px;padding:0px;font-size:small;line-height:1.1;border:3px solid #88a9d2;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#2e2f2e;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeecc;background-color:#88a9d2;}
|
||||
.menu-popup .menu-sep{border-top:1px solid #4e4f4e;}
|
||||
.menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;}
|
||||
.menu-popup .empty{padding:5px;text-align:center;color:#9ea8ac;}
|
||||
|
|
@ -155,7 +156,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
|
|||
#profile-jot-text_tbl{margin-bottom:10px;background:#777777;}
|
||||
#profile-jot-text_ifr{width:99.900002% !important;}
|
||||
#profile-jot-text_toolbargroup,.mceCenter tr{background:#777777;}
|
||||
[id$="jot-text_ifr"]{width:99.900002% !important;color:#2e2f2e;background:#eeeecc;}[id$="jot-text_ifr"] .mceContentBody{color:#2e2f2e;background:#eeeecc;}
|
||||
[id$="jot-text_ifr"]{color:#2e2f2e;background:#eeeecc;}[id$="jot-text_ifr"] .mceContentBody{color:#2e2f2e;background:#eeeecc;}
|
||||
.defaultSkin tr.mceFirst{background:#777777;}
|
||||
.defaultSkin td.mceFirst,.defaultSkin td.mceLast{background-color:#eeeecc;}
|
||||
.defaultSkin span.mceIcon,.defaultSkin img.mceIcon,.defaultSkin .mceButtonDisabled .mceIcon{background-color:#eeeecc;}
|
||||
|
|
@ -187,10 +188,10 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
|
|||
#jot-preview-content{background-color:#2e3436;color:#eeeecc;border:1px solid #2e2f2e;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:5px 0 10px 0px #111111;-o-box-shadow:5px 0 10px 0px #111111;-webkit-box-shadow:5px 0 10px 0px #111111;-ms-box-shadow:5px 0 10px 0px #111111;box-shadow:5px 0 10px 0px #111111;padding:3px 3px 6px 10px;}#jot-preview-content .wall-item-outside-wrapper{border:0;-o-border-radius:0px 0px 0px 0px;-webkit-border-radius:0px 0px 0px 0px;-moz-border-radius:0px 0px 0px 0px;-ms-border-radius:0px 0px 0px 0px;border-radius:0px 0px 0px 0px;-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
|
||||
#sectionmain{margin:20px;font-size:0.8em;min-width:475px;width:67%;float:left;display:inline;}
|
||||
.tabs{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:10px 0;}.tabs li{display:inline;font-size:smaller;}
|
||||
.tab{border:1px solid #638ec4;padding:4px;}.tab:hover,.tab:active{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
|
||||
.tab.active{background:#eeeecc;color:#2e2f2e;border:1px solid #638ec4;}.tab.active:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
|
||||
.tab.active a{color:#2e2f2e;text-decoration:none;}
|
||||
.tab{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab:active,.tab:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
|
||||
.tab a{border:0;text-decoration:none;}
|
||||
.tab.active{background:#eeeecc;color:#2e2f2e;border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab.active:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
|
||||
.tab.active a{color:#2e2f2e;text-decoration:none;}
|
||||
.wall-item-outside-wrapper{border:1px solid #a9a9a9;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:6px 1px 10px -2px #111111;-o-box-shadow:6px 1px 10px -2px #111111;-webkit-box-shadow:6px 1px 10px -2px #111111;-ms-box-shadow:6px 1px 10px -2px #111111;box-shadow:6px 1px 10px -2px #111111;}.wall-item-outside-wrapper.comment{margin-top:5px;}
|
||||
.wall-item-content-wrapper{position:relative;padding:0.75em;width:auto;}
|
||||
.wall-item-outside-wrapper .wall-item-comment-wrapper{}
|
||||
|
|
@ -243,7 +244,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
|
|||
.comment-edit-submit{height:22px;background-color:#555753;color:#eeeeee;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:0;}
|
||||
.wall-item-body code{background-color:#444444;border-bottom:1px dashed #cccccc;border-left:5px solid #cccccc;border-top:1px dashed #cccccc;color:#eeeecc;display:block;overflow-x:auto;padding:5px 0 15px 10px;width:95%;}.wall-item-body code a{color:#adc4e0;}
|
||||
div[id$="text"]{font-weight:bold;border-bottom:1px solid #cccccc;}
|
||||
div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:left;}
|
||||
div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;}
|
||||
.profile-match-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;}
|
||||
.icon.drophide.profile-match-ignore{margin:0 6px 0 -3px;}
|
||||
[id$="-end"],[class$="-end"]{clear:both;margin:0 0 10px 0;}
|
||||
|
|
@ -317,17 +318,16 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
|
|||
#contact-edit-last-update-text{margin-bottom:15px;}
|
||||
#contact-edit-last-updated{font-weight:bold;}
|
||||
#contact-edit-poll-text{display:inline;}
|
||||
#contact-edit-info_tbl,#contact-edit-info_parent,.mceLayout{width:100%;}
|
||||
#contact-edit-end{clear:both;margin-bottom:65px;}
|
||||
.contact-photo-menu-button{position:absolute;background:url("dark/photo-menu.jpg") top left no-repeat transparent;margin:0px;padding:0px;width:16px;height:16px;top:64px;left:0px;overflow:hidden;text-indent:40px;display:none;}
|
||||
.contact-photo-menu{width:auto;border:2px solid #444444;background:#2e2f2e;color:#eeeecc;position:absolute;left:0px;top:90px;display:none;z-index:10000;}.contact-photo-menu li a{display:block;padding:2px;}.contact-photo-menu li a:hover{color:white;background:#3465A4;text-decoration:none;}
|
||||
.contact-photo-menu{width:auto;border:2px solid #88a9d2;background:#2e2f2e;color:#eeeecc;position:absolute;font-size:smaller;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;left:0px;top:90px;display:none;z-index:10000;}.contact-photo-menu li a{display:block;padding:4px;color:#88a9d2;background:#eeeecc;line-height:1;}.contact-photo-menu li a:hover{background:#88a9d2;color:#eeeecc;text-decoration:none;}
|
||||
#id_openid_url{background:url(dark/login-bg.gif) no-repeat;background-position:0 50%;padding-left:18px;}
|
||||
#settings-default-perms{margin-bottom:20px;}
|
||||
#register-form div,#profile-edit-form div{clear:both;}
|
||||
.settings-block label{clear:left;}
|
||||
.settings-block input{margin:10px 5px;}
|
||||
#register-form label,#profile-edit-form label{width:300px;float:left;}
|
||||
#register-form span,#profile-edit-form span{color:#555753;display:block;margin-bottom:20px;}
|
||||
#register-form label,#profile-edit-form label{width:23em;}
|
||||
#register-form span,#profile-edit-form span{color:#555753;display:inline-block;margin-bottom:20px;}
|
||||
#profile-edit-marital-label span{margin:-4px;}
|
||||
.settings-submit-wrapper,.profile-edit-submit-wrapper{margin:0 0 30px;}
|
||||
.profile-edit-side-div{display:none;}
|
||||
|
|
@ -389,18 +389,19 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
|
|||
.fc-state-highlight{background:#eeeecc;color:#2e2f2e;}
|
||||
.directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;}
|
||||
#group-sidebar{margin-bottom:10px;}
|
||||
.group-selected,.nets-selected,.fileas-selected{padding:3px;color:#2e2f2e;background:#eeeecc;border:1px solid #88a9d2;}
|
||||
.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{padding:3px;color:#88a9d2;background:#2e2f2e;border:1px solid #88a9d2;}
|
||||
.group-selected,.nets-selected,.fileas-selected{background:#eeeecc;color:#2e2f2e;border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
|
||||
.group-selected a,.nets-selected a,.fileas-selected a{color:#2e2f2e;text-decoration:none;}
|
||||
.groupsideedit{margin-right:10px;}
|
||||
#sidebar-group-ul{padding-left:0;}
|
||||
#sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;}
|
||||
#sidebar-group-list .icon{display:inline-block;width:12px;height:12px;}
|
||||
.sidebar-group-element{padding:3px;}.sidebar-group-element:hover{color:#eeeecc;background:#2e3436;border:1px solid #638ec4;padding:3px;}
|
||||
.sidebar-group-element{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
|
||||
.sidebar-group-element a{border:0;text-decoration:none;}
|
||||
#sidebar-new-group{margin:auto;display:inline-block;color:#eeeeee;text-decoration:none;text-align:center;}
|
||||
#peoplefind-sidebar form{margin-bottom:10px;}
|
||||
#sidebar-new-group:hover{}
|
||||
#sidebar-new-group:active{position:relative;top:1px;}
|
||||
#side-peoplefind-url{background-color:#2e2f2e;color:#eeeecc;border:1px solid #999999;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#eeeeee;color:#222222;border:1px solid #333333;}
|
||||
#side-peoplefind-url{border:1px solid #999999;margin-right:3px;width:75%;}
|
||||
.nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.nets-ul li{margin:10px 0 0;}
|
||||
.nets-link,.nets-all{margin-left:0px;}
|
||||
#netsearch-box{margin:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
|
||||
|
|
|
|||
|
|
@ -190,7 +190,7 @@ label {
|
|||
font-size: small;
|
||||
margin: 0 10px 1em 0;
|
||||
.borders(1px, solid, @bg_colour);
|
||||
padding: 5px;
|
||||
padding: 3px 5px;
|
||||
background: @main_colour;
|
||||
color: darken(@main_alt_colour, 86.5%);
|
||||
.box_shadow(3px, 3px, 5px);
|
||||
|
|
@ -198,10 +198,14 @@ label {
|
|||
input {
|
||||
.box(250px, 25px);
|
||||
.borders(1px, solid, darken(@main_alt_colour, 33.5%));
|
||||
width: 17em;
|
||||
&[type="checkbox"],
|
||||
&[type="radio"] {
|
||||
margin: 0;
|
||||
.box(15px, 15px);
|
||||
margin: 0;
|
||||
}
|
||||
&[type="radio"] {
|
||||
margin: 5px 0;
|
||||
}
|
||||
&[type="submit"],
|
||||
&[type="button"] {
|
||||
|
|
@ -280,30 +284,35 @@ h6 {
|
|||
.box(100%, 100%);
|
||||
margin: 0 auto;
|
||||
}
|
||||
.button,
|
||||
#profile-listing-desc {
|
||||
.button {
|
||||
// .box(25%, auto);
|
||||
// background: @menu_bg_colour;
|
||||
color: @main_colour;
|
||||
// .borders(2px, outset, darken(@menu_bg_colour, 20%));
|
||||
// .rounded_corners;
|
||||
.rounded_corners;
|
||||
padding: 5px;
|
||||
// font-size: smaller;
|
||||
cursor: pointer;
|
||||
&.active {
|
||||
.box_shadow(4px, 4px, 7px);
|
||||
}
|
||||
// &.active {
|
||||
// .box_shadow(4px, 4px, 7px);
|
||||
// }
|
||||
a {
|
||||
color: @main_colour;
|
||||
// font-size: smaller;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
#profile-listing-desc {
|
||||
a {
|
||||
color: @main_colour;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
[class$="-desc"],
|
||||
[id$="-desc"] {
|
||||
color: @main_colour;
|
||||
background: @bg_colour;
|
||||
.borders(1px, outset, @main_colour);
|
||||
.borders(3px, outset, @main_colour);
|
||||
.rounded_corners;
|
||||
// .box_shadow(3px, 3px, 5px);
|
||||
margin: 3px 10px 7px 0;
|
||||
|
|
@ -658,17 +667,19 @@ nav #nav-notifications-linkmenu {
|
|||
}
|
||||
#search-text,
|
||||
#mini-search-text {
|
||||
background: @bg_colour;
|
||||
color: @main_colour;
|
||||
background: white;
|
||||
color: @bg_colour;
|
||||
margin: 8px;
|
||||
}
|
||||
#search-text {
|
||||
.borders;
|
||||
.borders(1px, solid, @main_alt_colour);
|
||||
margin: 8px 0;
|
||||
}
|
||||
#mini-search-text {
|
||||
font-size: 8pt;
|
||||
height: 14px;
|
||||
width: 10em;
|
||||
margin: 5px;
|
||||
}
|
||||
#scrollup {
|
||||
position: fixed;
|
||||
|
|
@ -754,11 +765,13 @@ nav #nav-notifications-linkmenu {
|
|||
.menu-popup {
|
||||
position: absolute;
|
||||
display: none;
|
||||
width: 11em;
|
||||
// width: 11em;
|
||||
background: white;
|
||||
color: @bg_colour;
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
font-size: small;
|
||||
line-height: 1.1;
|
||||
.borders(3px, solid, @link_colour);
|
||||
.rounded_corners;
|
||||
z-index: 100000;
|
||||
|
|
@ -1016,7 +1029,7 @@ nav #nav-notifications-linkmenu {
|
|||
background: darken(@main_alt_colour, 46.8%);
|
||||
}
|
||||
[id$="jot-text_ifr"] {
|
||||
width: 99.900002% !important;
|
||||
// width: 99.900002% !important;
|
||||
color: @bg_colour;
|
||||
background: @main_colour;
|
||||
.mceContentBody {
|
||||
|
|
@ -1226,34 +1239,45 @@ nav #nav-notifications-linkmenu {
|
|||
font-size: smaller;
|
||||
}
|
||||
}
|
||||
.tab {
|
||||
.multibutton () {
|
||||
.borders(1px, solid, @hover_colour);
|
||||
padding: 4px;
|
||||
&:hover,
|
||||
&:active {
|
||||
.rounded_corners;
|
||||
&:active,
|
||||
&:hover {
|
||||
background: @shiny_colour;
|
||||
color: @main_colour;
|
||||
.borders(1px, solid, @hover_colour);
|
||||
}
|
||||
&.active {
|
||||
background: @main_colour;
|
||||
color: @bg_colour;
|
||||
.borders(1px, solid, @hover_colour);
|
||||
&:hover {
|
||||
background: @shiny_colour;
|
||||
color: @main_colour;
|
||||
.borders(1px, solid, @hover_colour);
|
||||
}
|
||||
a {
|
||||
color: @bg_colour;
|
||||
text-decoration: none;
|
||||
}
|
||||
}
|
||||
a {
|
||||
border: 0;
|
||||
text-decoration: none;
|
||||
}
|
||||
}
|
||||
.multibutton_active () {
|
||||
background: @main_colour;
|
||||
color: @bg_colour;
|
||||
.borders(1px, solid, @hover_colour);
|
||||
padding: 4px;
|
||||
.rounded_corners;
|
||||
&:hover {
|
||||
background: @shiny_colour;
|
||||
color: @main_colour;
|
||||
.borders(1px, solid, @hover_colour);
|
||||
}
|
||||
a {
|
||||
color: @bg_colour;
|
||||
text-decoration: none;
|
||||
}
|
||||
}
|
||||
.tab {
|
||||
.multibutton;
|
||||
}
|
||||
.tab {
|
||||
&.active {
|
||||
.multibutton_active;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -1595,7 +1619,6 @@ div {
|
|||
}
|
||||
&[id$="wrapper"] {
|
||||
height: 100%;
|
||||
margin-bottom: 1em;
|
||||
br {
|
||||
clear: left;
|
||||
}
|
||||
|
|
@ -1933,11 +1956,6 @@ div {
|
|||
#contact-edit-poll-text {
|
||||
display: inline;
|
||||
}
|
||||
#contact-edit-info_tbl,
|
||||
#contact-edit-info_parent,
|
||||
.mceLayout {
|
||||
width: 100%;
|
||||
}
|
||||
#contact-edit-end {
|
||||
clear: both;
|
||||
margin-bottom: 65px;
|
||||
|
|
@ -1956,20 +1974,25 @@ div {
|
|||
}
|
||||
.contact-photo-menu {
|
||||
width: auto;
|
||||
.borders(2px, solid, darken(@main_alt_colour, 66.5%));
|
||||
.borders(2px, solid, @link_colour);
|
||||
background: @bg_colour;
|
||||
color: @main_colour;
|
||||
position: absolute;
|
||||
font-size: smaller;
|
||||
.rounded_corners;
|
||||
left: 0px;
|
||||
top: 90px;
|
||||
display: none;
|
||||
z-index: 10000;
|
||||
li a {
|
||||
display: block;
|
||||
padding: 2px;
|
||||
padding: 4px;
|
||||
color: @link_colour;
|
||||
background: @main_colour;
|
||||
line-height: 1;
|
||||
&:hover {
|
||||
color: white;
|
||||
background: #3465A4;
|
||||
background: @link_colour;
|
||||
color: @main_colour;
|
||||
text-decoration: none;
|
||||
}
|
||||
}
|
||||
|
|
@ -2001,13 +2024,12 @@ div {
|
|||
}
|
||||
#register-form label,
|
||||
#profile-edit-form label {
|
||||
width: 300px;
|
||||
float: left;
|
||||
width: 23em;
|
||||
}
|
||||
#register-form span,
|
||||
#profile-edit-form span {
|
||||
color: @menu_bg_colour;
|
||||
display: block;
|
||||
display: inline-block;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
#profile-edit-marital-label span {
|
||||
|
|
@ -2020,12 +2042,6 @@ div {
|
|||
.profile-edit-side-div {
|
||||
display: none;
|
||||
}
|
||||
/*.profile-edit-side-div:hover {
|
||||
display: block;
|
||||
}
|
||||
.profile-edit-side-link {
|
||||
margin: 3px 0px 0px 70px;
|
||||
}*/
|
||||
#profiles-menu-trigger {
|
||||
margin: 0px 0px 0px 25px;
|
||||
}
|
||||
|
|
@ -2320,19 +2336,20 @@ div {
|
|||
.group-selected,
|
||||
.nets-selected,
|
||||
.fileas-selected {
|
||||
padding: 3px;
|
||||
color: @bg_colour;
|
||||
background: @main_colour;
|
||||
.borders(1px, solid, @link_colour);
|
||||
}
|
||||
.group-selected:hover,
|
||||
.nets-selected:hover,
|
||||
.fileas-selected:hover {
|
||||
padding: 3px;
|
||||
color: @link_colour;
|
||||
background: @bg_colour;
|
||||
.borders(1px, solid, @link_colour);
|
||||
// padding: 4px;
|
||||
// color: @bg_colour;
|
||||
// background: @main_colour;
|
||||
// .borders(1px, solid, @link_colour);
|
||||
.multibutton_active;
|
||||
}
|
||||
// .group-selected:hover,
|
||||
// .nets-selected:hover,
|
||||
// .fileas-selected:hover {
|
||||
// padding: 4px;
|
||||
// color: @link_colour;
|
||||
// background: @bg_colour;
|
||||
// .borders(1px, solid, @link_colour);
|
||||
// }
|
||||
.groupsideedit {
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
|
@ -2350,13 +2367,8 @@ div {
|
|||
}
|
||||
}
|
||||
.sidebar-group-element {
|
||||
padding: 3px;
|
||||
&:hover {
|
||||
color: @main_colour;
|
||||
background: @shiny_colour;
|
||||
.borders(1px, solid, @hover_colour);
|
||||
padding: 3px;
|
||||
}
|
||||
.multibutton;
|
||||
.rounded_corners;
|
||||
}
|
||||
#sidebar-new-group {
|
||||
margin: auto;
|
||||
|
|
@ -2380,17 +2392,9 @@ div {
|
|||
}
|
||||
}
|
||||
#side-peoplefind-url {
|
||||
background-color: @bg_colour;
|
||||
color: @main_colour;
|
||||
.borders(1px, solid, darken(@main_alt_colour, 33.5%));
|
||||
margin-right: 3px;
|
||||
width: 75%;
|
||||
&:hover,
|
||||
&:focus {
|
||||
background-color: @main_alt_colour;
|
||||
color: darken(@main_alt_colour, 80%);
|
||||
.borders(1px, solid, darken(@main_alt_colour, 73.5%));
|
||||
}
|
||||
}
|
||||
.nets-ul {
|
||||
.list_reset;
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
<?php
|
||||
|
||||
/*
|
||||
* Name: Dispy Dark
|
||||
* Description: Dispy Dark: Dark, Spartan, Sleek, and Functional
|
||||
* Version: 1.2
|
||||
* Author: Simon <http://simon.kisikew.org/>
|
||||
* Maintainer: Simon <http://simon.kisikew.org/>
|
||||
* Screenshot: <a href="screenshot.jpg">Screenshot</a>
|
||||
*/
|
||||
* Name: Dispy Dark
|
||||
* Description: Dispy Dark: Dark, Spartan, Sleek, and Functional
|
||||
* Version: 1.2.1
|
||||
* Author: Simon <http://simon.kisikew.org/>
|
||||
* Maintainer: Simon <http://simon.kisikew.org/>
|
||||
* Screenshot: <a href="screenshot.jpg">Screenshot</a>
|
||||
*/
|
||||
|
||||
$a = get_app();
|
||||
$a->theme_info = array(
|
||||
'family' => 'dispy',
|
||||
'name' => 'dark',
|
||||
'version' => '1.2'
|
||||
'version' => '1.2.1'
|
||||
);
|
||||
|
||||
function dispy_dark_init(&$a) {
|
||||
|
|
|
|||
|
|
@ -59,7 +59,8 @@
|
|||
@dk_main_colour: darken(@bg_colour, 10%);
|
||||
|
||||
//* links */
|
||||
@link_colour: #3465a4;
|
||||
// yes our link colour is "friendica blue" ;)
|
||||
@link_colour: @friendica_blue;
|
||||
@dk_link_colour: darken(@link_colour, 10%);
|
||||
@lt_link_colour: lighten(@link_colour, 10%);
|
||||
//@hover_colour: #729fcf;
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 443 B |
|
|
@ -13,7 +13,7 @@ audio,canvas,video,time{display:inline-block;*display:inline;*zoom:1;}
|
|||
audio:not([controls]),[hidden]{display:none;}
|
||||
html{font-size:100%;overflow-y:scroll;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-o-text-size-adjust:100%;font-size-adjust:100%;}
|
||||
body{margin:0;padding:0;font-size:14pt;line-height:1.1em;font-family:sans-serif;color:#111111;background-color:#eeeeec;}
|
||||
button,input,select,textarea{color:#111111;background-color:#eeeeec;}
|
||||
button,input,select,textarea{color:#111111;background-color:white;}
|
||||
select{border:1px dotted #555555;padding:1px;margin:3px;color:#111111;background:#eeeeec;max-width:85%;min-width:85px;}
|
||||
option{padding:1px;color:#111111;background:#eeeeec;}option[selected="selected"]{color:#eeeeec;background:#2e3436;}
|
||||
tr:nth-child(even){background-color:#d6d6d1;}
|
||||
|
|
@ -37,8 +37,9 @@ img{border:0 none;}
|
|||
a{color:#3465a4;text-decoration:none;margin-bottom:1px;}a:hover{color:#284d7d;border-bottom:1px dotted #284d7d;}
|
||||
a:hover img{text-decoration:none;}
|
||||
blockquote{background:#aaaaaa;color:#111111;text-indent:5px;padding:5px;border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
|
||||
label{width:38%;display:inline-block;font-size:small;margin:0 10px 1em 0;border:1px solid #eeeeec;padding:5px;background:#cccccc;color:#111111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;}
|
||||
input{width:250px;height:25px;border:1px solid #444444;}input[type="checkbox"],input[type="radio"]{margin:0;width:15px;height:15px;}
|
||||
label{width:38%;display:inline-block;font-size:small;margin:0 10px 1em 0;border:1px solid #eeeeec;padding:3px 5px;background:#cccccc;color:#111111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;}
|
||||
input{width:250px;height:25px;border:1px solid #444444;width:17em;}input[type="checkbox"],input[type="radio"]{width:15px;height:15px;margin:0;}
|
||||
input[type="radio"]{margin:5px 0;}
|
||||
input[type="submit"],input[type="button"]{background-color:#555753;border:2px outset #444444;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:1px 3px 4px 0 #111111;-o-box-shadow:1px 3px 4px 0 #111111;-webkit-box-shadow:1px 3px 4px 0 #111111;-ms-box-shadow:1px 3px 4px 0 #111111;box-shadow:1px 3px 4px 0 #111111;color:#eeeeec;cursor:pointer;font-weight:bold;width:auto;-moz-text-shadow:1px 1px #111111;-o-text-shadow:1px 1px #111111;-webkit-text-shadow:1px 1px #111111;-ms-text-shadow:1px 1px #111111;text-shadow:1px 1px #111111;}
|
||||
input[type="submit"]:active,input[type="button"]:active{-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
|
||||
h1,h2,h3,h4,h5,h6{margin:10px 0px;font-weight:bold;border-bottom:1px solid #284d7d;}
|
||||
|
|
@ -55,9 +56,9 @@ h6{font-size:xx-small;}
|
|||
.action{margin:5px 0;}
|
||||
.tool{margin:5px 0;list-style:none;}
|
||||
#articlemain{width:100%;height:100%;margin:0 auto;}
|
||||
.button,#profile-listing-desc{color:#111111;padding:5px;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;}
|
||||
.button a,#profile-listing-desc a{color:#eeeeec;font-weight:bold;}
|
||||
[class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#111111;border:1px outset #eeeeec;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
|
||||
.button{color:#111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#111111;font-weight:bold;}
|
||||
#profile-listing-desc a{color:#eeeeec;font-weight:bold;}
|
||||
[class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#2e3436;border:3px outset #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
|
||||
#item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
|
||||
.intro-approve-as-friend-desc{margin-top:10px;}
|
||||
.intro-desc{margin-bottom:20px;font-weight:bold;}
|
||||
|
|
@ -106,8 +107,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
|
|||
.floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(light/icons.png) -190px -60px no-repeat;}
|
||||
.search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#2e3436;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
|
||||
#search-text,#mini-search-text{background:white;color:#111111;margin:8px;}
|
||||
#search-text{border:1px solid #999999;}
|
||||
#mini-search-text{font-size:8pt;height:14px;width:10em;}
|
||||
#search-text{border:1px solid #999999;margin:8px 0;}
|
||||
#mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;}
|
||||
#scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;}
|
||||
#user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:75%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;}
|
||||
#user-menu-label{font-size:small;padding:3px 20px 9px 5px;height:10px;}
|
||||
|
|
@ -120,7 +121,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
|
|||
#intro-update{background-position:-120px 0px;}
|
||||
#lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;}
|
||||
#language-selector{position:fixed;bottom:2px;left:52px;z-index:10;}
|
||||
.menu-popup{position:absolute;display:none;width:11em;background:white;color:#111111;margin:0px;padding:0px;border:3px solid #3465a4;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#111111;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeeec;background-color:#3465a4;}
|
||||
.menu-popup{position:absolute;display:none;background:white;color:#111111;margin:0px;padding:0px;font-size:small;line-height:1.1;border:3px solid #3465a4;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#111111;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeeec;background-color:#3465a4;}
|
||||
.menu-popup .menu-sep{border-top:1px solid #4e4f4e;}
|
||||
.menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;}
|
||||
.menu-popup .empty{padding:5px;text-align:center;color:#ffffff;}
|
||||
|
|
@ -140,7 +141,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
|
|||
#asidemain #contact-block{width:99%;}#asidemain #contact-block .contact-block-content{width:99%;}#asidemain #contact-block .contact-block-content .contact-block-div{float:left;margin:0 5px 5px 0;width:50px;height:50px;padding:3px;position:relative;}
|
||||
.aprofile dt{background:transparent;color:#666666;font-weight:bold;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:15px 0 5px;padding-left:5px;}
|
||||
#profile-extra-links ul{margin-left:0px;padding-left:0px;list-style:none;}
|
||||
#dfrn-request-link{-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#111111;display:block;font-size:1.2em;padding:0.2em 0.5em;background-color:#3465a4;background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII=");background-repeat:no-repeat;background-position:95% center;}
|
||||
#dfrn-request-link{-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#eeeeec;display:block;font-size:1.2em;padding:0.2em 0.5em;background-color:#3465a4;background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII=");background-repeat:no-repeat;background-position:95% center;}
|
||||
#wallmessage-link{color:#eeeeec;display:block;font-size:1.2em;padding:0.2em 0.5em;}
|
||||
.ttright{margin:0px;}
|
||||
.contact-block-div{width:50px;height:50px;float:left;}
|
||||
|
|
@ -155,7 +156,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
|
|||
#profile-jot-text_tbl{margin-bottom:10px;background:#808080;}
|
||||
#profile-jot-text_ifr{width:99.900002% !important;}
|
||||
#profile-jot-text_toolbargroup,.mceCenter tr{background:#808080;}
|
||||
[id$="jot-text_ifr"]{width:99.900002% !important;color:#111111;background:#eeeeec;}[id$="jot-text_ifr"] .mceContentBody{color:#111111;background:#eeeeec;}
|
||||
[id$="jot-text_ifr"]{color:#111111;background:#eeeeec;}[id$="jot-text_ifr"] .mceContentBody{color:#111111;background:#eeeeec;}
|
||||
.defaultSkin tr.mceFirst{background:#808080;}
|
||||
.defaultSkin td.mceFirst,.defaultSkin td.mceLast{background-color:#eeeeec;}
|
||||
.defaultSkin span.mceIcon,.defaultSkin img.mceIcon,.defaultSkin .mceButtonDisabled .mceIcon{background-color:#eeeeec;}
|
||||
|
|
@ -187,10 +188,10 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
|
|||
#jot-preview-content{background-color:#f2f2c3;color:#111111;border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:5px 0 10px 0px #111111;-o-box-shadow:5px 0 10px 0px #111111;-webkit-box-shadow:5px 0 10px 0px #111111;-ms-box-shadow:5px 0 10px 0px #111111;box-shadow:5px 0 10px 0px #111111;padding:3px 3px 6px 10px;}#jot-preview-content .wall-item-outside-wrapper{border:0;-o-border-radius:0px 0px 0px 0px;-webkit-border-radius:0px 0px 0px 0px;-moz-border-radius:0px 0px 0px 0px;-ms-border-radius:0px 0px 0px 0px;border-radius:0px 0px 0px 0px;-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
|
||||
#sectionmain{margin:20px;font-size:0.8em;min-width:475px;width:67%;float:left;display:inline;}
|
||||
.tabs{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:10px 0;}.tabs li{display:inline;font-size:smaller;}
|
||||
.tab{border:1px solid #284d7d;padding:4px;}.tab:hover,.tab:active{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
|
||||
.tab.active{background:#2e3436;color:#eeeeec;border:1px solid #284d7d;}.tab.active:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
|
||||
.tab.active a{color:#eeeeec;text-decoration:none;}
|
||||
.tab{border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab:active,.tab:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
|
||||
.tab a{border:0;text-decoration:none;}
|
||||
.tab.active{background:#2e3436;color:#eeeeec;border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab.active:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
|
||||
.tab.active a{color:#eeeeec;text-decoration:none;}
|
||||
.wall-item-outside-wrapper{border:1px solid #545454;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:6px 1px 10px -2px #111111;-o-box-shadow:6px 1px 10px -2px #111111;-webkit-box-shadow:6px 1px 10px -2px #111111;-ms-box-shadow:6px 1px 10px -2px #111111;box-shadow:6px 1px 10px -2px #111111;}.wall-item-outside-wrapper.comment{margin-top:5px;}
|
||||
.wall-item-content-wrapper{position:relative;padding:0.75em;width:auto;}
|
||||
.wall-item-outside-wrapper .wall-item-comment-wrapper{}
|
||||
|
|
@ -210,8 +211,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
|
|||
.wall-item-title{font-size:1.2em;font-weight:bold;margin-bottom:1.4em;}
|
||||
.wall-item-body{margin:15px 10px 10px 0px;text-align:left;overflow-x:auto;}
|
||||
.wall-item-lock-wrapper{float:right;width:22px;height:22px;margin:0 -5px 0 0;opacity:1;}
|
||||
.wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#888b85;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;}
|
||||
.wall-item-author,.wall-item-actions-author,.wall-item-ago{clear:left;float:left;color:#eeeeec;line-height:1;display:inline-block;font-size:0.75em;margin:0.5em auto 0;}
|
||||
.wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#111111;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;}
|
||||
.wall-item-author,.wall-item-actions-author,.wall-item-ago{clear:left;float:left;color:#111111;line-height:1;display:inline-block;font-size:0.75em;margin:0.5em auto 0;}
|
||||
.wall-item-author,.wall-item-actions-author{margin:0.5em auto 0;font-size:0.75em;font-weight:bold;}
|
||||
.wall-item-location{margin-top:15px;width:100px;overflow:hidden;-moz-text-overflow:ellipsis;-ms-text-verflow:ellipsis;-o-text-overflow:ellipsis;-webkit-text-overflow:ellipsis;text-overflow:ellipsis;}.wall-item-location .icon{float:left;}
|
||||
.wall-item-location>a,.wall-item-location .smalltext{margin-left:25px;font-size:0.7em;display:block;}
|
||||
|
|
@ -243,7 +244,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
|
|||
.comment-edit-submit{height:22px;background-color:#555753;color:#eeeeec;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:0;}
|
||||
.wall-item-body code{background-color:#dddddd;border-bottom:1px dashed #888888;border-left:5px solid #888888;border-top:1px dashed #888888;color:#191919;display:block;overflow-x:auto;padding:5px 0 15px 10px;width:95%;}.wall-item-body code a{color:#477ec4;}
|
||||
div[id$="text"]{font-weight:bold;border-bottom:1px solid #eeeeec;}
|
||||
div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:left;}
|
||||
div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;}
|
||||
.profile-match-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;}
|
||||
.icon.drophide.profile-match-ignore{margin:0 6px 0 -3px;}
|
||||
[id$="-end"],[class$="-end"]{clear:both;margin:0 0 10px 0;}
|
||||
|
|
@ -317,17 +318,16 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
|
|||
#contact-edit-last-update-text{margin-bottom:15px;}
|
||||
#contact-edit-last-updated{font-weight:bold;}
|
||||
#contact-edit-poll-text{display:inline;}
|
||||
#contact-edit-info_tbl,#contact-edit-info_parent,.mceLayout{width:100%;}
|
||||
#contact-edit-end{clear:both;margin-bottom:65px;}
|
||||
.contact-photo-menu-button{position:absolute;background:url("light/photo-menu.jpg") top left no-repeat transparent;margin:0px;padding:0px;width:16px;height:16px;top:64px;left:0px;overflow:hidden;text-indent:40px;display:none;}
|
||||
.contact-photo-menu{width:auto;border:2px solid #444444;background:#eeeeec;color:#111111;position:absolute;left:0px;top:90px;display:none;z-index:10000;}.contact-photo-menu li a{display:block;padding:2px;}.contact-photo-menu li a:hover{color:white;background:#3465A4;text-decoration:none;}
|
||||
.contact-photo-menu{width:auto;border:2px solid #3465a4;background:#eeeeec;color:#111111;position:absolute;font-size:smaller;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;left:0px;top:90px;display:none;z-index:10000;}.contact-photo-menu li a{display:block;padding:4px;color:#3465a4;background:#eeeeec;line-height:1;}.contact-photo-menu li a:hover{background:#3465a4;color:#eeeeec;text-decoration:none;}
|
||||
#id_openid_url{background:url(light/login-bg.gif) no-repeat;background-position:0 50%;padding-left:18px;}
|
||||
#settings-default-perms{margin-bottom:20px;}
|
||||
#register-form div,#profile-edit-form div{clear:both;}
|
||||
.settings-block label{clear:left;}
|
||||
.settings-block input{margin:10px 5px;}
|
||||
#register-form label,#profile-edit-form label{width:300px;float:left;}
|
||||
#register-form span,#profile-edit-form span{color:#555753;display:block;margin-bottom:20px;}
|
||||
#register-form label,#profile-edit-form label{width:23em;}
|
||||
#register-form span,#profile-edit-form span{color:#555753;display:inline-block;margin-bottom:20px;}
|
||||
#profile-edit-marital-label span{margin:-4px;}
|
||||
.settings-submit-wrapper,.profile-edit-submit-wrapper{margin:0 0 30px;}
|
||||
.profile-edit-side-div{display:none;}
|
||||
|
|
@ -389,18 +389,19 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le
|
|||
.fc-state-highlight{background:#eeeeec;color:#111111;}
|
||||
.directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;}
|
||||
#group-sidebar{margin-bottom:10px;}
|
||||
.group-selected,.nets-selected,.fileas-selected{padding:3px;color:#eeeeec;background:#2e3436;border:1px solid #3465a4;}
|
||||
.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{padding:3px;color:#3465a4;background:#eeeeec;border:1px solid #3465a4;}
|
||||
.group-selected,.nets-selected,.fileas-selected{background:#2e3436;color:#eeeeec;border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
|
||||
.group-selected a,.nets-selected a,.fileas-selected a{color:#eeeeec;text-decoration:none;}
|
||||
.groupsideedit{margin-right:10px;}
|
||||
#sidebar-group-ul{padding-left:0;}
|
||||
#sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;}
|
||||
#sidebar-group-list .icon{display:inline-block;width:12px;height:12px;}
|
||||
.sidebar-group-element{padding:3px;}.sidebar-group-element:hover{color:#111111;background:#f2f2c3;border:1px solid #284d7d;padding:3px;}
|
||||
.sidebar-group-element{border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
|
||||
.sidebar-group-element a{border:0;text-decoration:none;}
|
||||
#sidebar-new-group{margin:auto;display:inline-block;color:#eeeeec;text-decoration:none;text-align:center;}
|
||||
#peoplefind-sidebar form{margin-bottom:10px;}
|
||||
#sidebar-new-group:hover{}
|
||||
#sidebar-new-group:active{position:relative;top:1px;}
|
||||
#side-peoplefind-url{background-color:#eeeeec;color:#666666;border:1px solid #666666;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#999999;color:#eeeeec;border:1px solid #111111;}
|
||||
#side-peoplefind-url{border:1px solid #666666;margin-right:3px;width:75%;}
|
||||
.nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.nets-ul li{margin:10px 0 0;}
|
||||
.nets-link,.nets-all{margin-left:0px;}
|
||||
#netsearch-box{margin:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;}
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ input,
|
|||
select,
|
||||
textarea {
|
||||
color: @main_colour;
|
||||
background-color: @bg_colour;
|
||||
background-color: white;
|
||||
}
|
||||
select {
|
||||
.borders(1px, dotted, darken(@main_alt_colour, 26.8%));
|
||||
|
|
@ -191,7 +191,7 @@ label {
|
|||
font-size: small;
|
||||
margin: 0 10px 1em 0;
|
||||
.borders(1px, solid, @bg_colour);
|
||||
padding: 5px;
|
||||
padding: 3px 5px;
|
||||
background: lighten(@main_alt_colour, 20%);
|
||||
color: @main_colour;
|
||||
.box_shadow(3px, 3px, 5px);
|
||||
|
|
@ -199,10 +199,14 @@ label {
|
|||
input {
|
||||
.box(250px, 25px);
|
||||
.borders(1px, solid, darken(@main_alt_colour, 33.5%));
|
||||
width: 17em;
|
||||
&[type="checkbox"],
|
||||
&[type="radio"] {
|
||||
margin: 0;
|
||||
.box(15px, 15px);
|
||||
margin: 0;
|
||||
}
|
||||
&[type="radio"] {
|
||||
margin: 5px 0;
|
||||
}
|
||||
&[type="submit"],
|
||||
&[type="button"] {
|
||||
|
|
@ -281,30 +285,35 @@ h6 {
|
|||
.box(100%, 100%);
|
||||
margin: 0 auto;
|
||||
}
|
||||
.button,
|
||||
#profile-listing-desc {
|
||||
.button {
|
||||
// .box(25%, auto);
|
||||
// background: @menu_bg_colour;
|
||||
color: @main_colour;
|
||||
// .borders(2px, outset, darken(@menu_bg_colour, 20%));
|
||||
// .rounded_corners;
|
||||
.rounded_corners;
|
||||
padding: 5px;
|
||||
// font-size: smaller;
|
||||
cursor: pointer;
|
||||
&.active {
|
||||
.box_shadow(4px, 4px, 7px);
|
||||
// &.active {
|
||||
// .box_shadow(4px, 4px, 7px);
|
||||
// }
|
||||
a {
|
||||
color: @main_colour;
|
||||
// font-size: smaller;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
#profile-listing-desc {
|
||||
a {
|
||||
color: @bg_colour;
|
||||
// font-size: smaller;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
[class$="-desc"],
|
||||
[id$="-desc"] {
|
||||
color: @bg_colour;
|
||||
background: @main_colour;
|
||||
.borders(1px, outset, @bg_colour);
|
||||
background: @dk_bg_colour;
|
||||
.borders(3px, outset, @main_colour);
|
||||
.rounded_corners;
|
||||
// .box_shadow(3px, 3px, 5px);
|
||||
margin: 3px 10px 7px 0;
|
||||
|
|
@ -569,6 +578,9 @@ div.jGrowl div {
|
|||
padding-left: 58px;
|
||||
margin-top: 50px;
|
||||
}
|
||||
// &.jGrowl-message {
|
||||
|
||||
// }
|
||||
}
|
||||
#nav-notifications-menu {
|
||||
margin: 30px 0 0 -20px;
|
||||
|
|
@ -662,11 +674,13 @@ nav #nav-notifications-linkmenu {
|
|||
}
|
||||
#search-text {
|
||||
.borders(1px, solid, @main_alt_colour);
|
||||
margin: 8px 0;
|
||||
}
|
||||
#mini-search-text {
|
||||
font-size: 8pt;
|
||||
height: 14px;
|
||||
width: 10em;
|
||||
margin: 5px;
|
||||
}
|
||||
#scrollup {
|
||||
position: fixed;
|
||||
|
|
@ -752,11 +766,13 @@ nav #nav-notifications-linkmenu {
|
|||
.menu-popup {
|
||||
position: absolute;
|
||||
display: none;
|
||||
width: 11em;
|
||||
// width: 11em;
|
||||
background: white;
|
||||
color: @main_colour;
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
font-size: small;
|
||||
line-height: 1.1;
|
||||
.borders(3px, solid, @link_colour);
|
||||
.rounded_corners;
|
||||
z-index: 100000;
|
||||
|
|
@ -904,11 +920,11 @@ nav #nav-notifications-linkmenu {
|
|||
}
|
||||
#dfrn-request-link {
|
||||
.rounded_corners;
|
||||
color: @main_colour;
|
||||
color: @bg_colour;
|
||||
display: block;
|
||||
font-size: 1.2em;
|
||||
padding: 0.2em 0.5em;
|
||||
background-color: @friendica_blue;
|
||||
background-color: @link_colour;
|
||||
// background-image: url(icons/connect.png);
|
||||
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII=");
|
||||
background-repeat: no-repeat;
|
||||
|
|
@ -1014,7 +1030,7 @@ nav #nav-notifications-linkmenu {
|
|||
background: darken(@main_alt_colour, 10%);
|
||||
}
|
||||
[id$="jot-text_ifr"] {
|
||||
width: 99.900002% !important;
|
||||
// width: 99.900002% !important;
|
||||
color: @main_colour;
|
||||
background: @bg_colour;
|
||||
.mceContentBody {
|
||||
|
|
@ -1224,34 +1240,45 @@ nav #nav-notifications-linkmenu {
|
|||
font-size: smaller;
|
||||
}
|
||||
}
|
||||
.tab {
|
||||
.multibutton () {
|
||||
.borders(1px, solid, @hover_colour);
|
||||
padding: 4px;
|
||||
&:hover,
|
||||
&:active {
|
||||
.rounded_corners;
|
||||
&:active,
|
||||
&:hover {
|
||||
background: @shiny_colour;
|
||||
color: @main_colour;
|
||||
.borders(1px, solid, @hover_colour);
|
||||
}
|
||||
&.active {
|
||||
background: @dk_bg_colour;
|
||||
color: @bg_colour;
|
||||
.borders(1px, solid, @hover_colour);
|
||||
&:hover {
|
||||
background: @shiny_colour;
|
||||
color: @main_colour;
|
||||
.borders(1px, solid, @hover_colour);
|
||||
}
|
||||
a {
|
||||
color: @bg_colour;
|
||||
text-decoration: none;
|
||||
}
|
||||
}
|
||||
a {
|
||||
border: 0;
|
||||
text-decoration: none;
|
||||
}
|
||||
}
|
||||
.multibutton_active () {
|
||||
background: @dk_bg_colour;
|
||||
color: @bg_colour;
|
||||
.borders(1px, solid, @hover_colour);
|
||||
padding: 4px;
|
||||
.rounded_corners;
|
||||
&:hover {
|
||||
background: @shiny_colour;
|
||||
color: @main_colour;
|
||||
.borders(1px, solid, @hover_colour);
|
||||
}
|
||||
a {
|
||||
color: @bg_colour;
|
||||
text-decoration: none;
|
||||
}
|
||||
}
|
||||
.tab {
|
||||
.multibutton;
|
||||
}
|
||||
.tab {
|
||||
&.active {
|
||||
.multibutton_active;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -1364,7 +1391,7 @@ nav #nav-notifications-linkmenu {
|
|||
.wall-item-like {
|
||||
clear: left;
|
||||
font-size: 0.8em;
|
||||
color: lighten(@menu_bg_colour, 20%);
|
||||
color: @main_colour;
|
||||
margin: 5px 0 5px 10.2em;
|
||||
.transition;
|
||||
opacity: 0.5;
|
||||
|
|
@ -1377,7 +1404,7 @@ nav #nav-notifications-linkmenu {
|
|||
.wall-item-ago {
|
||||
clear: left;
|
||||
float: left;
|
||||
color: @bg_colour;
|
||||
color: @main_colour;
|
||||
line-height: 1;
|
||||
display: inline-block;
|
||||
font-size: 0.75em;
|
||||
|
|
@ -1593,7 +1620,6 @@ div {
|
|||
}
|
||||
&[id$="wrapper"] {
|
||||
height: 100%;
|
||||
margin-bottom: 1em;
|
||||
br {
|
||||
clear: left;
|
||||
}
|
||||
|
|
@ -1931,11 +1957,6 @@ div {
|
|||
#contact-edit-poll-text {
|
||||
display: inline;
|
||||
}
|
||||
#contact-edit-info_tbl,
|
||||
#contact-edit-info_parent,
|
||||
.mceLayout {
|
||||
width: 100%;
|
||||
}
|
||||
#contact-edit-end {
|
||||
clear: both;
|
||||
margin-bottom: 65px;
|
||||
|
|
@ -1954,20 +1975,25 @@ div {
|
|||
}
|
||||
.contact-photo-menu {
|
||||
width: auto;
|
||||
.borders(2px, solid, darken(@main_alt_colour, 33.5%));
|
||||
.borders(2px, solid, @link_colour);
|
||||
background: @bg_colour;
|
||||
color: @main_colour;
|
||||
position: absolute;
|
||||
font-size: smaller;
|
||||
.rounded_corners;
|
||||
left: 0px;
|
||||
top: 90px;
|
||||
display: none;
|
||||
z-index: 10000;
|
||||
li a {
|
||||
display: block;
|
||||
padding: 2px;
|
||||
padding: 4px;
|
||||
color: @link_colour;
|
||||
background: @bg_colour;
|
||||
line-height: 1;
|
||||
&:hover {
|
||||
color: white;
|
||||
background: #3465A4;
|
||||
background: @link_colour;
|
||||
color: @bg_colour;
|
||||
text-decoration: none;
|
||||
}
|
||||
}
|
||||
|
|
@ -1999,13 +2025,12 @@ div {
|
|||
}
|
||||
#register-form label,
|
||||
#profile-edit-form label {
|
||||
width: 300px;
|
||||
float: left;
|
||||
width: 23em;
|
||||
}
|
||||
#register-form span,
|
||||
#profile-edit-form span {
|
||||
color: @menu_bg_colour;
|
||||
display: block;
|
||||
display: inline-block;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
#profile-edit-marital-label span {
|
||||
|
|
@ -2018,12 +2043,6 @@ div {
|
|||
.profile-edit-side-div {
|
||||
display: none;
|
||||
}
|
||||
/*.profile-edit-side-div:hover {
|
||||
display: block;
|
||||
}
|
||||
.profile-edit-side-link {
|
||||
margin: 3px 0px 0px 70px;
|
||||
}*/
|
||||
#profiles-menu-trigger {
|
||||
margin: 0px 0px 0px 25px;
|
||||
}
|
||||
|
|
@ -2318,19 +2337,20 @@ div {
|
|||
.group-selected,
|
||||
.nets-selected,
|
||||
.fileas-selected {
|
||||
padding: 3px;
|
||||
color: @bg_colour;
|
||||
background: @dk_bg_colour;
|
||||
.borders(1px, solid, @link_colour);
|
||||
}
|
||||
.group-selected:hover,
|
||||
.nets-selected:hover,
|
||||
.fileas-selected:hover {
|
||||
padding: 3px;
|
||||
color: @link_colour;
|
||||
background: @bg_colour;
|
||||
.borders(1px, solid, @link_colour);
|
||||
// padding: 4px;
|
||||
// color: @bg_colour;
|
||||
// background: @dk_bg_colour;
|
||||
// .borders(1px, solid, @hover_colour);
|
||||
.multibutton_active;
|
||||
}
|
||||
// .group-selected:hover,
|
||||
// .nets-selected:hover,
|
||||
// .fileas-selected:hover {
|
||||
// padding: 4px;
|
||||
// color: @link_colour;
|
||||
// background: @bg_colour;
|
||||
// .borders(1px, solid, @link_colour);
|
||||
// }
|
||||
.groupsideedit {
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
|
@ -2348,13 +2368,8 @@ div {
|
|||
}
|
||||
}
|
||||
.sidebar-group-element {
|
||||
padding: 3px;
|
||||
&:hover {
|
||||
color: @main_colour;
|
||||
background: @shiny_colour;
|
||||
.borders(1px, solid, @hover_colour);
|
||||
padding: 3px;
|
||||
}
|
||||
.multibutton;
|
||||
.rounded_corners;
|
||||
}
|
||||
#sidebar-new-group {
|
||||
margin: auto;
|
||||
|
|
@ -2378,17 +2393,9 @@ div {
|
|||
}
|
||||
}
|
||||
#side-peoplefind-url {
|
||||
background-color: @bg_colour;
|
||||
color: darken(@main_alt_colour, 20%);
|
||||
.borders(1px, solid, darken(@main_alt_colour, 20%));
|
||||
margin-right: 3px;
|
||||
width: 75%;
|
||||
&:hover,
|
||||
&:focus {
|
||||
background-color: @main_alt_colour;
|
||||
color: @bg_colour;
|
||||
.borders(1px, solid, @main_colour);
|
||||
}
|
||||
}
|
||||
.nets-ul {
|
||||
.list_reset;
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<?php
|
||||
|
||||
/*
|
||||
* Name: Dispy
|
||||
* Description: <p style="white-space:pre;"> Dispy: Light, Spartan, Sleek, and Functional<br /> Dispy Dark: Dark, Spartan, Sleek, and Functional</p>
|
||||
* Version: 1.2
|
||||
* Name: Dispy Light
|
||||
* Description: Dispy Light: Light, Spartan, Sleek, and Functional
|
||||
* Version: 1.2.1
|
||||
* Author: Simon <http://simon.kisikew.org/>
|
||||
* Maintainer: Simon <http://simon.kisikew.org/>
|
||||
* Screenshot: <a href="screenshot.jpg">Screenshot</a>
|
||||
|
|
@ -13,7 +13,7 @@ $a = get_app();
|
|||
$a->theme_info = array(
|
||||
'family' => 'dispy',
|
||||
'name' => 'light',
|
||||
'version' => '1.2'
|
||||
'version' => '1.2.1'
|
||||
);
|
||||
|
||||
function dispy_light_init(&$a) {
|
||||
|
|
@ -21,10 +21,10 @@ function dispy_light_init(&$a) {
|
|||
/** @purpose set some theme defaults
|
||||
*/
|
||||
$cssFile = null;
|
||||
$colour = false;
|
||||
$colour = 'light';
|
||||
$colour_path = "/light/";
|
||||
|
||||
// custom css
|
||||
// set css
|
||||
if (!is_null($cssFile)) {
|
||||
$a->page['htmlhead'] .= sprintf('<link rel="stylesheet" type="text/css" href="%s" />', $cssFile);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1963,23 +1963,29 @@ aside input[type='text'] {
|
|||
}
|
||||
|
||||
|
||||
.photos {
|
||||
/*.photos {
|
||||
height: auto;
|
||||
overflow: auto;
|
||||
}*/
|
||||
|
||||
.photos-end {
|
||||
clear: both;
|
||||
margin-bottom: 25px;
|
||||
}
|
||||
|
||||
.photo-album-image-wrapper {
|
||||
float: left;
|
||||
margin-top: 15px;
|
||||
margin-right: 15px;
|
||||
width: 200px; height: 200px;
|
||||
margin-left: 15px;
|
||||
/* width: 200px; height: 200px;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
position: relative; */
|
||||
}
|
||||
.photo-album-image-wrapper .caption {
|
||||
display: none;
|
||||
width: 100%;
|
||||
position: absolute;
|
||||
/* position: absolute; */
|
||||
bottom: 0px;
|
||||
padding: 0.5em 0.5em 0px 0.5em;
|
||||
background-color: rgba(245, 245, 255, 0.8);
|
||||
|
|
@ -1992,20 +1998,23 @@ aside input[type='text'] {
|
|||
|
||||
#photo-album-end {
|
||||
clear: both;
|
||||
margin-bottom: 25px;
|
||||
}
|
||||
|
||||
.photo-top-image-wrapper {
|
||||
position: relative;
|
||||
/* position: relative; */
|
||||
float: left;
|
||||
margin-top: 15px;
|
||||
margin-right: 15px;
|
||||
width: 200px; height: 200px;
|
||||
overflow: hidden;
|
||||
margin-left: 15px;
|
||||
margin-bottom: 15px;
|
||||
/* width: 200px; height: 200px;
|
||||
overflow: hidden; */
|
||||
}
|
||||
.photo-top-album-name {
|
||||
width: 100%;
|
||||
min-height: 2em;
|
||||
position: absolute;
|
||||
/* position: absolute; */
|
||||
bottom: 0px;
|
||||
padding: 0px 3px;
|
||||
padding-top: 0.5em;
|
||||
|
|
|
|||
|
|
@ -52,10 +52,70 @@ nav #site-location {
|
|||
box-shadow: 3px 3px 10px -2px #000000;
|
||||
}
|
||||
|
||||
.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img {
|
||||
.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo {
|
||||
border-radius: 3px;
|
||||
-moz-border-radius: 3px;
|
||||
box-shadow: 3px 3px 10px 0 #000000;
|
||||
}
|
||||
|
||||
.photo-top-photo, .photo-album-photo {
|
||||
padding: 10px;
|
||||
max-width: 300px;
|
||||
}
|
||||
|
||||
.rotleft1 {
|
||||
-webkit-transform: rotate(-1deg);
|
||||
-moz-transform: rotate(-1deg);
|
||||
-ms-transform: rotate(-1deg);
|
||||
-o-transform: rotate(-1deg);
|
||||
}
|
||||
|
||||
.rotleft2 {
|
||||
-webkit-transform: rotate(-2deg);
|
||||
-moz-transform: rotate(-2deg);
|
||||
-ms-transform: rotate(-2deg);
|
||||
-o-transform: rotate(-2deg);
|
||||
}
|
||||
|
||||
.rotleft3 {
|
||||
-webkit-transform: rotate(-3deg);
|
||||
-moz-transform: rotate(-3deg);
|
||||
-ms-transform: rotate(-3deg);
|
||||
-o-transform: rotate(-3deg);
|
||||
}
|
||||
|
||||
.rotleft4 {
|
||||
-webkit-transform: rotate(-4deg);
|
||||
-moz-transform: rotate(-4deg);
|
||||
-ms-transform: rotate(-4deg);
|
||||
-o-transform: rotate(-4deg);
|
||||
}
|
||||
|
||||
.rotright1 {
|
||||
-webkit-transform: rotate(1deg);
|
||||
-moz-transform: rotate(1deg);
|
||||
-ms-transform: rotate(1deg);
|
||||
-o-transform: rotate(1deg);
|
||||
}
|
||||
|
||||
.rotright2 {
|
||||
-webkit-transform: rotate(2deg);
|
||||
-moz-transform: rotate(2deg);
|
||||
-ms-transform: rotate(2deg);
|
||||
-o-transform: rotate(2deg);
|
||||
}
|
||||
|
||||
.rotright3 {
|
||||
-webkit-transform: rotate(3deg);
|
||||
-moz-transform: rotate(3deg);
|
||||
-ms-transform: rotate(3deg);
|
||||
-o-transform: rotate(3deg);
|
||||
}
|
||||
|
||||
.rotright4 {
|
||||
-webkit-transform: rotate(4deg);
|
||||
-moz-transform: rotate(4deg);
|
||||
-ms-transform: rotate(4deg);
|
||||
-o-transform: rotate(4deg);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue