Merge https://github.com/friendica/friendica into pull
This commit is contained in:
friendica
commit
ed7e626ed2
1
boot.php
1
boot.php
|
|
@ -364,6 +364,7 @@ if(! class_exists('App')) {
|
|||
public $sourcename = '';
|
||||
public $videowidth = 425;
|
||||
public $videoheight = 350;
|
||||
public $force_max_items = 0;
|
||||
|
||||
private $scheme;
|
||||
private $hostname;
|
||||
|
|
|
|||
|
|
@ -196,6 +196,14 @@ function bb2diaspora($Text,$preserve_nl = false, $fordiaspora = true) {
|
|||
// The bbcode parser now handles youtube-links (and the other stuff) correctly.
|
||||
// Additionally the html code is now fixed so that lists are now working.
|
||||
|
||||
/**
|
||||
* Transform #tags, strip off the [url] and replace spaces with underscore
|
||||
*/
|
||||
$Text = preg_replace_callback('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', create_function('$match',
|
||||
'return \'#\'. str_replace(\' \', \'_\', $match[2]);'
|
||||
), $Text);
|
||||
|
||||
|
||||
// Converting images with size parameters to simple images. Markdown doesn't know it.
|
||||
$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text);
|
||||
|
||||
|
|
|
|||
|
|
@ -102,6 +102,37 @@ function diaspora_dispatch($importer,$msg) {
|
|||
return $ret;
|
||||
}
|
||||
|
||||
function diaspora_handle_from_contact($contact_id) {
|
||||
$handle = False;
|
||||
|
||||
logger("diaspora_handle_from_contact: contact id is " . $contact_id, LOGGER_DEBUG);
|
||||
|
||||
$r = q("SELECT network, addr, self, url, nick FROM contact WHERE id = %d",
|
||||
intval($contact_id)
|
||||
);
|
||||
if($r) {
|
||||
$contact = $r[0];
|
||||
|
||||
logger("diaspora_handle_from_contact: contact 'self' = " . $contact['self'] . " 'url' = " . $contact['url'], LOGGER_DEBUG);
|
||||
|
||||
if($contact['network'] === NETWORK_DIASPORA) {
|
||||
$handle = $contact['addr'];
|
||||
|
||||
// logger("diaspora_handle_from_contact: contact id is a Diaspora person, handle = " . $handle, LOGGER_DEBUG);
|
||||
}
|
||||
elseif(($contact['network'] === NETWORK_DFRN) || ($contact['self'] == 1)) {
|
||||
$baseurl_start = strpos($contact['url'],'://') + 3;
|
||||
$baseurl_length = strpos($contact['url'],'/profile') - $baseurl_start; // allows installations in a subdirectory--not sure how Diaspora will handle
|
||||
$baseurl = substr($contact['url'], $baseurl_start, $baseurl_length);
|
||||
$handle = $contact['nick'] . '@' . $baseurl;
|
||||
|
||||
// logger("diaspora_handle_from_contact: contact id is a DFRN person, handle = " . $handle, LOGGER_DEBUG);
|
||||
}
|
||||
}
|
||||
|
||||
return $handle;
|
||||
}
|
||||
|
||||
function diaspora_get_contact_by_handle($uid,$handle) {
|
||||
$r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `addr` = '%s' LIMIT 1",
|
||||
dbesc(NETWORK_DIASPORA),
|
||||
|
|
@ -1282,7 +1313,7 @@ function diaspora_comment($importer,$xml,$msg) {
|
|||
// the existence of parent_author_signature means the parent_author or owner
|
||||
// is already relaying.
|
||||
|
||||
proc_run('php','include/notifier.php','comment',$message_id);
|
||||
proc_run('php','include/notifier.php','comment-import',$message_id);
|
||||
}
|
||||
|
||||
$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0 ",
|
||||
|
|
@ -1867,7 +1898,7 @@ EOT;
|
|||
// is already relaying. The parent_item['origin'] indicates the message was created on our system
|
||||
|
||||
if(($parent_item['origin']) && (! $parent_author_signature))
|
||||
proc_run('php','include/notifier.php','comment',$message_id);
|
||||
proc_run('php','include/notifier.php','comment-import',$message_id);
|
||||
|
||||
return;
|
||||
}
|
||||
|
|
@ -1993,7 +2024,7 @@ function diaspora_signed_retraction($importer,$xml,$msg) {
|
|||
// is already relaying.
|
||||
logger('diaspora_signed_retraction: relaying relayable_retraction');
|
||||
|
||||
proc_run('php','include/notifier.php','relayable_retraction',$r[0]['id']);
|
||||
proc_run('php','include/notifier.php','drop',$r[0]['id']);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -2153,12 +2184,6 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) {
|
|||
}
|
||||
}
|
||||
*/
|
||||
/**
|
||||
* Transform #tags, strip off the [url] and replace spaces with underscore
|
||||
*/
|
||||
$body = preg_replace_callback('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', create_function('$match',
|
||||
'return \'#\'. str_replace(\' \', \'_\', $match[2]);'
|
||||
), $body);
|
||||
|
||||
//if(strlen($title))
|
||||
// $body = "[b]".html_entity_decode($title)."[/b]\n\n".$body;
|
||||
|
|
@ -2344,8 +2369,8 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
|
|||
// return the items ordered by `item`.`id`, in which case the wrong item is chosen as the parent.
|
||||
// The only item with `parent` and `id` as the parent id is the parent item.
|
||||
$p = q("select guid, type, uri, `parent-uri` from item where parent = %d and id = %d limit 1",
|
||||
intval($item['parent']),
|
||||
intval($item['parent'])
|
||||
intval($item['parent']),
|
||||
intval($item['parent'])
|
||||
);
|
||||
//}
|
||||
if(count($p))
|
||||
|
|
@ -2368,7 +2393,6 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
|
|||
$like = true;
|
||||
|
||||
$target_type = ( $parent['uri'] === $parent['parent-uri'] ? 'Post' : 'Comment');
|
||||
// $target_type = (strpos($parent['type'], 'comment') ? 'Comment' : 'Post');
|
||||
// $positive = (($item['deleted']) ? 'false' : 'true');
|
||||
$positive = 'true';
|
||||
|
||||
|
|
@ -2382,7 +2406,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
|
|||
// fetch the original signature if the relayable was created by a Diaspora
|
||||
// or DFRN user. Relayables for other networks are not supported.
|
||||
|
||||
$r = q("select * from sign where " . $sql_sign_id . " = %d limit 1",
|
||||
/* $r = q("select * from sign where " . $sql_sign_id . " = %d limit 1",
|
||||
intval($item['id'])
|
||||
);
|
||||
if(count($r)) {
|
||||
|
|
@ -2398,7 +2422,25 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
|
|||
// function is called
|
||||
logger('diaspora_send_relay: original author signature not found, cannot send relayable');
|
||||
return;
|
||||
}
|
||||
}*/
|
||||
|
||||
/* Since the author signature is only checked by the parent, not by the relay recipients,
|
||||
* I think it may not be necessary for us to do so much work to preserve all the original
|
||||
* signatures. The important thing that Diaspora DOES need is the original creator's handle.
|
||||
* Let's just generate that and forget about all the original author signature stuff.
|
||||
*
|
||||
* Note: this might be more of an problem if we want to support likes on comments for older
|
||||
* versions of Diaspora (diaspora-pistos), but since there are a number of problems with
|
||||
* doing that, let's ignore it for now.
|
||||
*
|
||||
* Currently, only DFRN contacts are supported. StatusNet shouldn't be hard, but it hasn't
|
||||
* been done yet
|
||||
*/
|
||||
|
||||
$handle = diaspora_handle_from_contact($item['contact-id']);
|
||||
if(! $handle)
|
||||
return;
|
||||
|
||||
|
||||
if($relay_retract)
|
||||
$sender_signed_text = $item['guid'] . ';' . $target_type;
|
||||
|
|
|
|||
|
|
@ -2459,6 +2459,7 @@ function local_delivery($importer,$data) {
|
|||
|
||||
$is_a_remote_delete = false;
|
||||
|
||||
// POSSIBLE CLEANUP --> Why select so many fields when only forum_mode and wall are used?
|
||||
$r = q("select `item`.`id`, `item`.`uri`, `item`.`tag`, `item`.`forum_mode`,`item`.`origin`,`item`.`wall`,
|
||||
`contact`.`name`, `contact`.`url`, `contact`.`thumb` from `item`
|
||||
LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
||||
|
|
@ -2472,7 +2473,7 @@ function local_delivery($importer,$data) {
|
|||
intval($importer['importer_uid'])
|
||||
);
|
||||
if($r && count($r))
|
||||
$is_a_remote_delete = true;
|
||||
$is_a_remote_delete = true;
|
||||
|
||||
// Does this have the characteristics of a community or private group comment?
|
||||
// If it's a reply to a wall post on a community/prvgroup page it's a
|
||||
|
|
@ -2799,7 +2800,7 @@ function local_delivery($importer,$data) {
|
|||
}
|
||||
|
||||
if($posted_id && $parent) {
|
||||
|
||||
|
||||
proc_run('php',"include/notifier.php","comment-import","$posted_id");
|
||||
|
||||
if((! $is_like) && (! $importer['self'])) {
|
||||
|
|
|
|||
|
|
@ -18,6 +18,31 @@ require_once('include/html2plain.php');
|
|||
* us by hosting providers.
|
||||
*/
|
||||
|
||||
/*
|
||||
* The notifier is typically called with:
|
||||
*
|
||||
* proc_run('php', "include/notifier.php", COMMAND, ITEM_ID);
|
||||
*
|
||||
* where COMMAND is one of the following:
|
||||
*
|
||||
* activity (in diaspora.php, dfrn_confirm.php, profiles.php)
|
||||
* comment-import (in diaspora.php, items.php)
|
||||
* comment-new (in item.php)
|
||||
* drop (in diaspora.php, items.php, photos.php)
|
||||
* edit_post (in item.php)
|
||||
* event (in events.php)
|
||||
* expire (in items.php)
|
||||
* like (in like.php, poke.php)
|
||||
* mail (in message.php)
|
||||
* suggest (in fsuggest.php)
|
||||
* tag (in photos.php, poke.php, tagger.php)
|
||||
* tgroup (in items.php)
|
||||
* wall-new (in photos.php, item.php)
|
||||
*
|
||||
* and ITEM_ID is the id of the item in the database that needs to be sent to others.
|
||||
*/
|
||||
|
||||
|
||||
function notifier_run($argv, $argc){
|
||||
global $a, $db;
|
||||
|
||||
|
|
|
|||
|
|
@ -563,7 +563,7 @@ function network_content(&$a, $update = 0) {
|
|||
|
||||
}
|
||||
else {
|
||||
if(! get_pconfig(local_user(),'system','alt_pager')) {
|
||||
if(! get_pconfig(local_user(),'system','alt_pager')) {
|
||||
$r = q("SELECT COUNT(*) AS `total`
|
||||
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
|
||||
WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
|
||||
|
|
@ -576,10 +576,15 @@ function network_content(&$a, $update = 0) {
|
|||
if(count($r)) {
|
||||
$a->set_pager_total($r[0]['total']);
|
||||
}
|
||||
}
|
||||
$itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
|
||||
$a->set_pager_itemspage(((intval($itemspage_network)) ? $itemspage_network : 40));
|
||||
$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
|
||||
}
|
||||
|
||||
$itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
|
||||
$itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 40);
|
||||
if(($a->force_max_items > 0) && ($a->force_max_items < $itemspage_network))
|
||||
$itemspage_network = $a->force_max_items;
|
||||
|
||||
$a->set_pager_itemspage($itemspage_network);
|
||||
$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
|
||||
}
|
||||
|
||||
$simple_update = (($update) ? " and `item`.`unseen` = 1 " : '');
|
||||
|
|
|
|||
|
|
@ -12,11 +12,18 @@ Photo album display?
|
|||
|
||||
- Admin: access to more pages than summary?
|
||||
|
||||
- Embedded video playback is way too big
|
||||
- Find a way to show embedded videos at the normal size for tablets that can handle it
|
||||
|
||||
- Need to find a way to deal with freakin annoying elements that don't respect screen width limits.
|
||||
Specifically, need to find a way to keep them from forcing a horizontal scroll bar to show up and
|
||||
making the rest of the body text overflow the item's borders that is screen-width sensitive (it's
|
||||
annoying to have a 300px truncated code block on a 1024px wide screen). At least the following cause problems:
|
||||
- code blocks
|
||||
- blockquote blocks
|
||||
- #reallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallyreallylongtags
|
||||
|
||||
- Needs to be faster!
|
||||
- Reduce DOM elements (~2400 for 10 items, ~8400 for 40 items)
|
||||
- Automatically set limit of 10 items for Network and Profile?
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,10 @@
|
|||
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
|
||||
<meta content='width=device-width, minimum-scale=1 maximum-scale=1' name='viewport'>
|
||||
<!--<meta content='width=device-width, minimum-scale=1 maximum-scale=1' name='viewport'>
|
||||
<meta content='True' name='HandheldFriendly'>
|
||||
<meta content='320' name='MobileOptimized'>
|
||||
<meta content='320' name='MobileOptimized'>-->
|
||||
<meta name="viewport" content="width=device-width; initial-scale = 1.0; maximum-scale=1.0; user-scalable=no" />
|
||||
<!--<meta name="viewport" content="width=100%; initial-scale=1; maximum-scale=1; minimum-scale=1; user-scalable=no;" />-->
|
||||
|
||||
<base href="$baseurl/" />
|
||||
<meta name="generator" content="$generator" />
|
||||
<!--<link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" />
|
||||
|
|
|
|||
|
|
@ -401,19 +401,19 @@
|
|||
|
||||
function getPosition(e) {
|
||||
var cursor = {x:0, y:0};
|
||||
if ( e.pageX || e.pageY ) {
|
||||
cursor.x = e.pageX;
|
||||
cursor.y = e.pageY;
|
||||
if ( e.touches[0].pageX || e.touches[0].pageY ) {
|
||||
cursor.x = e.touches[0].pageX;
|
||||
cursor.y = e.touches[0].pageY;
|
||||
}
|
||||
else {
|
||||
if( e.clientX || e.clientY ) {
|
||||
cursor.x = e.clientX + (document.documentElement.scrollLeft || document.body.scrollLeft) - document.documentElement.clientLeft;
|
||||
cursor.y = e.clientY + (document.documentElement.scrollTop || document.body.scrollTop) - document.documentElement.clientTop;
|
||||
if( e.touches[0].clientX || e.touches[0].clientY ) {
|
||||
cursor.x = e.touches[0].clientX + (document.documentElement.scrollLeft || document.body.scrollLeft) - document.documentElement.clientLeft;
|
||||
cursor.y = e.touches[0].clientY + (document.documentElement.scrollTop || document.body.scrollTop) - document.documentElement.clientTop;
|
||||
}
|
||||
else {
|
||||
if( e.x || e.y ) {
|
||||
cursor.x = e.x;
|
||||
cursor.y = e.y;
|
||||
if( e.touches[0].x || e.touches[0].y ) {
|
||||
cursor.touches[0].x = e.touches[0].x;
|
||||
cursor.touches[0].y = e.touches[0].y;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
2
view/theme/frost-mobile/js/main.min.js
vendored
2
view/theme/frost-mobile/js/main.min.js
vendored
File diff suppressed because one or more lines are too long
|
|
@ -1,8 +1,8 @@
|
|||
$j(document).ready(function() {
|
||||
|
||||
/* enable tinymce on focus and click */
|
||||
$j("#profile-jot-text").focus(enableOnUser);
|
||||
$j("#profile-jot-text").click(enableOnUser);
|
||||
/* enable tinymce on focus and click */
|
||||
$j("#profile-jot-text").focus(enableOnUser);
|
||||
$j("#profile-jot-text").click(enableOnUser);
|
||||
|
||||
if(typeof window.AjaxUpload != "undefined") {
|
||||
switch(window.ajaxType) {
|
||||
|
|
|
|||
18
view/theme/frost-mobile/mail_conv.tpl
Normal file
18
view/theme/frost-mobile/mail_conv.tpl
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
<div class="mail-conv-outside-wrapper">
|
||||
<div class="mail-conv-sender" >
|
||||
<a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a>
|
||||
</div>
|
||||
<div class="mail-conv-detail" >
|
||||
<div class="mail-conv-sender-name" >$mail.from_name</div>
|
||||
<div class="mail-conv-date">$mail.date</div>
|
||||
<div class="mail-conv-subject">$mail.subject</div>
|
||||
</div>
|
||||
<div class="mail-conv-body">$mail.body</div>
|
||||
</div>
|
||||
<div class="mail-conv-outside-wrapper-end"></div>
|
||||
|
||||
|
||||
<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div>
|
||||
<div class="mail-conv-delete-end"></div>
|
||||
|
||||
<hr class="mail-conv-break" />
|
||||
|
|
@ -9,9 +9,10 @@
|
|||
|
||||
/* generals */
|
||||
html {
|
||||
width: 320px;
|
||||
/* width: 320px;*/
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
overflow-x:hidden;
|
||||
}
|
||||
|
||||
body {
|
||||
|
|
@ -23,6 +24,7 @@ body {
|
|||
background-repeat: repeat-x;
|
||||
color: #505050;
|
||||
margin: 0px;
|
||||
overflow-x:hidden;
|
||||
}
|
||||
|
||||
div.container {
|
||||
|
|
@ -32,6 +34,7 @@ div.container {
|
|||
margin-bottom: 0px;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
overflow-x:hidden;
|
||||
}
|
||||
|
||||
a, a:visited, a:link { color: #3465a4; text-decoration: none; }
|
||||
|
|
@ -39,7 +42,7 @@ a:hover {text-decoration: underline; }
|
|||
|
||||
input {
|
||||
border: 1px solid #666666;
|
||||
-moz-border-radius: 3px;
|
||||
/* -moz-border-radius: 3px;*/
|
||||
-webkit-border-radius: 3px;
|
||||
border-radius: 3px;
|
||||
padding: 3px;
|
||||
|
|
@ -78,6 +81,10 @@ blockquote {
|
|||
background-color: #f4f8f9;
|
||||
border-left: 4px solid #dae4ee;
|
||||
padding: 0.4em;
|
||||
margin-left: 20px;
|
||||
margin-right: 0px;
|
||||
width: 260px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.icollapse-wrapper, .ccollapse-wrapper {
|
||||
|
|
@ -176,7 +183,7 @@ nav #banner #logo-text a:hover { text-decoration: none; }
|
|||
border-bottom: 0px;
|
||||
background-color: #aec0d3;
|
||||
color: #565854;
|
||||
-moz-border-radius: 3px 3px 0px 0px;
|
||||
/* -moz-border-radius: 3px 3px 0px 0px;*/
|
||||
-webkit-border-radius: 3px 3px 0px 0px;
|
||||
border-radius: 3px 3px 0px 0px;
|
||||
}
|
||||
|
|
@ -197,7 +204,7 @@ nav #banner #logo-text a:hover { text-decoration: none; }
|
|||
right: 2px;
|
||||
padding: 1px 2px;
|
||||
border-radius: 4px;
|
||||
-moz-border-radius: 4px;
|
||||
/* -moz-border-radius: 4px;*/
|
||||
-webkit-border-radius: 4px;
|
||||
background-color: gold !important;
|
||||
}
|
||||
|
|
@ -245,7 +252,7 @@ nav .nav-link {
|
|||
/* right: -33px;*/
|
||||
padding: 1em 0px;
|
||||
|
||||
-moz-box-shadow: 3px 3px 5px #555;
|
||||
/* -moz-box-shadow: 3px 3px 5px #555;*/
|
||||
-webkit-box-shadow: 3px 3px 5px #555;
|
||||
box-shadow: 3px 3px 5px #555;
|
||||
|
||||
|
|
@ -300,7 +307,7 @@ aside {
|
|||
display: block;
|
||||
color: #FFFFFF;
|
||||
-webkit-border-radius: 5px ;
|
||||
-moz-border-radius: 5px;
|
||||
/* -moz-border-radius: 5px;*/
|
||||
border-radius: 5px;
|
||||
padding: 5px;
|
||||
font-weight: bold;
|
||||
|
|
@ -310,7 +317,7 @@ aside {
|
|||
display: block;
|
||||
color: #FFFFFF;
|
||||
-webkit-border-radius: 5px ;
|
||||
-moz-border-radius: 5px;
|
||||
/* -moz-border-radius: 5px;*/
|
||||
border-radius: 5px;
|
||||
padding: 5px;
|
||||
font-weight: bold;
|
||||
|
|
@ -320,10 +327,11 @@ aside {
|
|||
/* section */
|
||||
div.section-wrapper {
|
||||
/* width: 100%;*/
|
||||
width: 320px;
|
||||
/* width: 320px;
|
||||
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
margin-right: auto;*/
|
||||
margin-left: 0px;
|
||||
|
||||
/*padding-right:2em;*/
|
||||
|
||||
|
|
@ -349,6 +357,7 @@ section {
|
|||
|
||||
min-height: 112px;
|
||||
border-top: 1px solid #babdb6;
|
||||
overflow-x:hidden;
|
||||
}
|
||||
|
||||
.tabs {
|
||||
|
|
@ -363,7 +372,7 @@ section {
|
|||
padding: 0.4em 2em;
|
||||
border: 1px solid #aaa;
|
||||
border-radius: 8px;
|
||||
-moz-border-radius: 8px;
|
||||
/* -moz-border-radius: 8px;*/
|
||||
-webkit-border-radius: 8px;
|
||||
}
|
||||
.tab {
|
||||
|
|
@ -437,8 +446,8 @@ footer {
|
|||
|
||||
#jot-title::-webkit-input-placeholder{font-weight: normal;}
|
||||
#jot-category::-webkit-input-placeholder{font-weight: normal;}
|
||||
#jot-title:-moz-placeholder{font-weight: normal;}
|
||||
#jot-category:-moz-placeholder{font-weight: normal;}
|
||||
/*#jot-title:-moz-placeholder{font-weight: normal;}
|
||||
#jot-category:-moz-placeholder{font-weight: normal;}*/
|
||||
|
||||
|
||||
#jot-title:hover,
|
||||
|
|
@ -468,7 +477,7 @@ footer {
|
|||
|
||||
.group-selected, .nets-selected, .fileas-selected, .categories-selected {
|
||||
padding: 3px;
|
||||
-moz-border-radius: 3px;
|
||||
/* -moz-border-radius: 3px;*/
|
||||
-webkit-border-radius: 3px;
|
||||
border-radius: 3px;
|
||||
border: 1px solid #CCCCCC;
|
||||
|
|
@ -478,7 +487,7 @@ footer {
|
|||
|
||||
.settings-widget .selected {
|
||||
padding: 3px;
|
||||
-moz-border-radius: 3px;
|
||||
/* -moz-border-radius: 3px;*/
|
||||
-webkit-border-radius: 3px;
|
||||
border-radius: 3px;
|
||||
border: 1px solid #CCCCCC;
|
||||
|
|
@ -1133,7 +1142,7 @@ input#dfrn-url {
|
|||
border: 2px solid #AAAAAA;
|
||||
border-radius: 10px;
|
||||
-webkit-border-radius: 10px;
|
||||
-moz-border-radius: 10px;
|
||||
/* -moz-border-radius: 10px;*/
|
||||
/* background: #EEEEEE;*/
|
||||
}
|
||||
|
||||
|
|
@ -1328,12 +1337,15 @@ input#dfrn-url {
|
|||
}
|
||||
|
||||
.wall-item-content img {
|
||||
max-width: 300px;
|
||||
max-width: 290px;
|
||||
border-radius: 7px;
|
||||
-moz-border-radius: 7px;
|
||||
/* -moz-border-radius: 7px;*/
|
||||
-webkit-border-radius: 7px;
|
||||
}
|
||||
|
||||
.comment .wall-item-content img {
|
||||
max-width: 280px;
|
||||
}
|
||||
|
||||
|
||||
.wall-item-title {
|
||||
|
|
@ -1350,19 +1362,28 @@ input#dfrn-url {
|
|||
.wall-item-body {
|
||||
text-align: justify;
|
||||
float: left;
|
||||
width: 300px;
|
||||
/* width: 300px;*/
|
||||
overflow: hidden;
|
||||
margin-top: 10px;
|
||||
padding-right: 1em;
|
||||
line-height: 23px;
|
||||
}
|
||||
|
||||
.wall-item-body code {
|
||||
overflow: auto;
|
||||
width: 260px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.comment .wall-item-body {
|
||||
margin-left: 5px;
|
||||
width: 280px;
|
||||
padding-right: 0.5em;
|
||||
/* width: 280px;*/
|
||||
}
|
||||
|
||||
.comment .wall-item-body blockquote {
|
||||
margin-left: 0px;
|
||||
margin-right: 0px;
|
||||
width: 260px;
|
||||
}
|
||||
|
||||
.wall-item-tools {
|
||||
|
|
@ -1413,7 +1434,7 @@ input#dfrn-url {
|
|||
}
|
||||
.comment-edit-text-empty, .comment-edit-text-full {
|
||||
/* float: left;*/
|
||||
-moz-border-radius: 3px;
|
||||
/* -moz-border-radius: 3px;*/
|
||||
-webkit-border-radius: 3px;
|
||||
border-radius: 3px;
|
||||
border: 1px solid #cccccc;
|
||||
|
|
@ -1669,7 +1690,7 @@ input#dfrn-url {
|
|||
padding: 0.2em 1em;
|
||||
border: 1px solid #aaa;
|
||||
border-radius: 10px;
|
||||
-moz-border-radius: 10px;
|
||||
/* -moz-border-radius: 10px;*/
|
||||
-webkit-border-radius: 10px;
|
||||
}
|
||||
|
||||
|
|
@ -1729,7 +1750,7 @@ input#dfrn-url {
|
|||
padding: 0.2em 1em;
|
||||
border: 1px solid #aaa;
|
||||
border-radius: 10px;
|
||||
-moz-border-radius: 10px;
|
||||
/* -moz-border-radius: 10px;*/
|
||||
-webkit-border-radius: 10px;
|
||||
}
|
||||
|
||||
|
|
@ -1738,7 +1759,7 @@ input#dfrn-url {
|
|||
float: left;
|
||||
border: 1px solid black;
|
||||
border-radius: 7px;
|
||||
-moz-border-radius: 7px;
|
||||
/* -moz-border-radius: 7px;*/
|
||||
-webkit-border-radius: 7px;
|
||||
background: #FFCCCC;
|
||||
font-size: 1.25em;
|
||||
|
|
@ -1966,7 +1987,7 @@ input#dfrn-url {
|
|||
left: -30px; top: 80px;
|
||||
display: none;
|
||||
z-index: 10000;
|
||||
-moz-box-shadow: 3px 3px 5px #555;
|
||||
/* -moz-box-shadow: 3px 3px 5px #555;*/
|
||||
-webkit-box-shadow: 3px 3px 5px #555;
|
||||
box-shadow: 3px 3px 5px #555;
|
||||
}
|
||||
|
|
@ -2004,7 +2025,7 @@ input#dfrn-url {
|
|||
color:#cccccc;
|
||||
border: 1px solid #cccccc;
|
||||
padding: 3px 0px 0px 5px;
|
||||
-moz-border-radius: 3px;
|
||||
/* -moz-border-radius: 3px;*/
|
||||
-webkit-border-radius: 3px;
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
|
@ -2049,7 +2070,7 @@ input#dfrn-url {
|
|||
background-repeat: no-repeat;
|
||||
padding: 7px 5px 0px 30px;
|
||||
-webkit-border-radius: 5px ;
|
||||
-moz-border-radius: 5px;
|
||||
/* -moz-border-radius: 5px;*/
|
||||
border-radius: 5px;
|
||||
color: #999999;
|
||||
}
|
||||
|
|
@ -2074,7 +2095,7 @@ input#dfrn-url {
|
|||
width: 120px;
|
||||
height: 30px;
|
||||
border: 1px solid #cccccc;
|
||||
-moz-border-radius: 4px;
|
||||
/* -moz-border-radius: 4px;*/
|
||||
-webkit-border-radius: 4px;
|
||||
border-radius: 4px;
|
||||
margin-top: 5px;
|
||||
|
|
@ -2104,7 +2125,7 @@ input#dfrn-url {
|
|||
background-repeat: no-repeat;
|
||||
margin-right: 5px;
|
||||
-webkit-border-radius: 2px ;
|
||||
-moz-border-radius: 2px;
|
||||
/* -moz-border-radius: 2px;*/
|
||||
border-radius: 2px;
|
||||
padding-left: 15px;
|
||||
}
|
||||
|
|
@ -2248,7 +2269,7 @@ a.mail-list-link {
|
|||
.mail-conv-detail {
|
||||
margin-left: 20px;
|
||||
margin-bottom: 10px;
|
||||
width: 270px;
|
||||
/*width: 270px;*/
|
||||
}
|
||||
|
||||
.mail-conv-subject {
|
||||
|
|
@ -2256,6 +2277,11 @@ a.mail-list-link {
|
|||
margin: 10px 0;
|
||||
}
|
||||
|
||||
.mail-conv-body {
|
||||
padding-top: 20px;
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.mail-conv-outside-wrapper-end {
|
||||
clear: both;
|
||||
}
|
||||
|
|
@ -2266,6 +2292,7 @@ a.mail-list-link {
|
|||
|
||||
.mail-conv-delete-wrapper {
|
||||
float: right;
|
||||
padding-bottom: 0.5em;
|
||||
margin-right: 5px;
|
||||
margin-top: 15px;
|
||||
}
|
||||
|
|
@ -2371,7 +2398,7 @@ aside input[type='text'] {
|
|||
border: 1px solid #DDDDDD;
|
||||
padding: 8px;
|
||||
margin-top: 5px;
|
||||
-moz-border-radius:5px;
|
||||
/* -moz-border-radius:5px;*/
|
||||
-webkit-border-radius:5px;
|
||||
border-radius:5px;
|
||||
|
||||
|
|
@ -2429,7 +2456,7 @@ aside input[type='text'] {
|
|||
.photo-top-image-wrapper img {
|
||||
max-width: 290px;
|
||||
border-radius: 10px;
|
||||
-moz-border-radius: 10px;
|
||||
/* -moz-border-radius: 10px;*/
|
||||
-webkit-border-radius: 10px;
|
||||
}
|
||||
.photo-top-album-name {
|
||||
|
|
@ -2588,7 +2615,7 @@ aside input[type='text'] {
|
|||
margin-top: 15px;
|
||||
border: 1px solid #aaa;
|
||||
border-radius: 10px;
|
||||
-moz-border-radius: 10px;
|
||||
/* -moz-border-radius: 10px;*/
|
||||
-webkit-border-radius: 10px;
|
||||
}
|
||||
|
||||
|
|
@ -3823,11 +3850,11 @@ ul.notifications-menu-popup {
|
|||
height: auto;
|
||||
overflow-y: scroll;overflow-style:scrollbar;
|
||||
background-color:#FFFFFF;
|
||||
-moz-border-radius: 5px;
|
||||
/* -moz-border-radius: 5px;*/
|
||||
-webkit-border-radius: 5px;
|
||||
border-radius:5px;
|
||||
border: 1px solid #AAA;
|
||||
-moz-box-shadow: 3px 3px 5px #555;
|
||||
/* -moz-box-shadow: 3px 3px 5px #555;*/
|
||||
-webkit-box-shadow: 3px 3px 5px #555;
|
||||
box-shadow: 3px 3px 5px #555;
|
||||
}
|
||||
|
|
@ -3886,8 +3913,9 @@ ul.notifications-menu-popup {
|
|||
width: 130px;
|
||||
}
|
||||
|
||||
@media only screen and (min-device-width: 768px)
|
||||
and (max-device-width: 1024px)
|
||||
/*@media only screen and (min-device-width: 768px)
|
||||
and (max-device-width: 1024px)*/
|
||||
/*@media only screen and (min-device-width: 768px)
|
||||
{
|
||||
html {
|
||||
width:700px
|
||||
|
|
@ -3902,4 +3930,21 @@ width:700px;
|
|||
.comment .wall-item-body {
|
||||
width:650px;
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
@media only screen and (min-device-width: 768px)
|
||||
{
|
||||
.wall-item-body code {
|
||||
width: 700px;
|
||||
}
|
||||
|
||||
.comment .wall-item-body blockquote {
|
||||
margin-left: 20px;
|
||||
width: 680px;
|
||||
}
|
||||
blockquote {
|
||||
width: 700px;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* Name: Frost--mobile version
|
||||
* Description: Like frosted glass
|
||||
* Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
|
||||
* Version: Version 0.2.4
|
||||
* Version: Version 0.2.5
|
||||
* Author: Zach P <windforest@f.shmuz.in>
|
||||
* Maintainer: Zach P <windforest@f.shmuz.in>
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in a new issue