sforkowany z mirror/friendica
Merge branch 'master' into notify
commit
d9e9fd0359
3
README
3
README
|
@ -1,3 +0,0 @@
|
|||
This is my personal fork of https://github.com/friendica/friendica
|
||||
|
||||
If you want to have a stable version of friendica please look there.
|
|
@ -14,8 +14,8 @@ require_once('include/html2bbcode.php');
|
|||
function diaspora2bb($s) {
|
||||
|
||||
// for testing purposes: Collect raw markdown articles
|
||||
$file = tempnam("/tmp/friendica/", "markdown");
|
||||
file_put_contents($file, $s);
|
||||
// $file = tempnam("/tmp/friendica/", "markdown");
|
||||
// file_put_contents($file, $s);
|
||||
|
||||
$s = html_entity_decode($s,ENT_COMPAT,'UTF-8');
|
||||
|
||||
|
|
|
@ -48,6 +48,21 @@
|
|||
.icon.s10.unlock {
|
||||
background-image: url("../../../images/icons/10/unlock.png");
|
||||
}
|
||||
.icon.s10.type-unkn {
|
||||
background-image: url("../../../images/icons/10/zip.png");
|
||||
}
|
||||
.icon.s10.type-audio {
|
||||
background-image: url("../../../images/icons/10/audio.png");
|
||||
}
|
||||
.icon.s10.type-video {
|
||||
background-image: url("../../../images/icons/10/video.png");
|
||||
}
|
||||
.icon.s10.type-image {
|
||||
background-image: url("../../../images/icons/10/image.png");
|
||||
}
|
||||
.icon.s10.type-text {
|
||||
background-image: url("../../../images/icons/10/text.png");
|
||||
}
|
||||
.icon.s10.text {
|
||||
padding: 2px 0px 0px 15px;
|
||||
}
|
||||
|
@ -85,6 +100,21 @@
|
|||
.icon.s16.unlock {
|
||||
background-image: url("../../../images/icons/16/unlock.png");
|
||||
}
|
||||
.icon.s16.type-unkn {
|
||||
background-image: url("../../../images/icons/16/zip.png");
|
||||
}
|
||||
.icon.s16.type-audio {
|
||||
background-image: url("../../../images/icons/16/audio.png");
|
||||
}
|
||||
.icon.s16.type-video {
|
||||
background-image: url("../../../images/icons/16/video.png");
|
||||
}
|
||||
.icon.s16.type-image {
|
||||
background-image: url("../../../images/icons/16/image.png");
|
||||
}
|
||||
.icon.s16.type-text {
|
||||
background-image: url("../../../images/icons/16/text.png");
|
||||
}
|
||||
.icon.s16.text {
|
||||
padding: 4px 0px 0px 20px;
|
||||
}
|
||||
|
@ -122,6 +152,21 @@
|
|||
.icon.s22.unlock {
|
||||
background-image: url("../../../images/icons/22/unlock.png");
|
||||
}
|
||||
.icon.s22.type-unkn {
|
||||
background-image: url("../../../images/icons/22/zip.png");
|
||||
}
|
||||
.icon.s22.type-audio {
|
||||
background-image: url("../../../images/icons/22/audio.png");
|
||||
}
|
||||
.icon.s22.type-video {
|
||||
background-image: url("../../../images/icons/22/video.png");
|
||||
}
|
||||
.icon.s22.type-image {
|
||||
background-image: url("../../../images/icons/22/image.png");
|
||||
}
|
||||
.icon.s22.type-text {
|
||||
background-image: url("../../../images/icons/22/text.png");
|
||||
}
|
||||
.icon.s22.text {
|
||||
padding: 10px 0px 0px 25px;
|
||||
}
|
||||
|
@ -159,6 +204,21 @@
|
|||
.icon.s48.unlock {
|
||||
background-image: url("../../../images/icons/48/unlock.png");
|
||||
}
|
||||
.icon.s48.type-unkn {
|
||||
background-image: url("../../../images/icons/48/zip.png");
|
||||
}
|
||||
.icon.s48.type-audio {
|
||||
background-image: url("../../../images/icons/48/audio.png");
|
||||
}
|
||||
.icon.s48.type-video {
|
||||
background-image: url("../../../images/icons/48/video.png");
|
||||
}
|
||||
.icon.s48.type-image {
|
||||
background-image: url("../../../images/icons/48/image.png");
|
||||
}
|
||||
.icon.s48.type-text {
|
||||
background-image: url("../../../images/icons/48/text.png");
|
||||
}
|
||||
/* global */
|
||||
body {
|
||||
font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
|
||||
|
@ -564,6 +624,35 @@ aside #profiles-menu {
|
|||
widht: 48px;
|
||||
height: 58px;
|
||||
}
|
||||
/* mail view */
|
||||
.mail-conv-sender, .mail-conv-detail {
|
||||
float: left;
|
||||
}
|
||||
.mail-conv-detail {
|
||||
margin-left: 20px;
|
||||
width: 500px;
|
||||
}
|
||||
.mail-conv-subject {
|
||||
font-size: 1.4em;
|
||||
margin: 10px 0;
|
||||
}
|
||||
.mail-conv-outside-wrapper-end {
|
||||
clear: both;
|
||||
}
|
||||
.mail-conv-outside-wrapper {
|
||||
margin-top: 30px;
|
||||
}
|
||||
.mail-conv-delete-wrapper {
|
||||
float: right;
|
||||
margin-right: 30px;
|
||||
margin-top: 15px;
|
||||
}
|
||||
.mail-conv-break {
|
||||
clear: both;
|
||||
}
|
||||
.mail-conv-delete-icon {
|
||||
border: none;
|
||||
}
|
||||
/* group member */
|
||||
#contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper {
|
||||
float: right;
|
||||
|
|
|
@ -317,6 +317,41 @@ aside {
|
|||
img { widht: 48px; height: 58px; }
|
||||
}
|
||||
}
|
||||
/* mail view */
|
||||
.mail-conv-sender,
|
||||
.mail-conv-detail {
|
||||
float: left;
|
||||
}
|
||||
.mail-conv-detail {
|
||||
margin-left: 20px;
|
||||
width: 500px;
|
||||
}
|
||||
|
||||
.mail-conv-subject {
|
||||
font-size: 1.4em;
|
||||
margin: 10px 0;
|
||||
}
|
||||
|
||||
.mail-conv-outside-wrapper-end {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.mail-conv-outside-wrapper {
|
||||
margin-top: 30px;
|
||||
}
|
||||
|
||||
.mail-conv-delete-wrapper {
|
||||
float: right;
|
||||
margin-right: 30px;
|
||||
margin-top: 15px;
|
||||
}
|
||||
.mail-conv-break {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.mail-conv-delete-icon {
|
||||
border: none;
|
||||
}
|
||||
|
||||
/* group member */
|
||||
#contact-edit-drop-link,
|
||||
|
|
|
@ -624,6 +624,35 @@ aside #profiles-menu {
|
|||
widht: 48px;
|
||||
height: 58px;
|
||||
}
|
||||
/* mail view */
|
||||
.mail-conv-sender, .mail-conv-detail {
|
||||
float: left;
|
||||
}
|
||||
.mail-conv-detail {
|
||||
margin-left: 20px;
|
||||
width: 500px;
|
||||
}
|
||||
.mail-conv-subject {
|
||||
font-size: 1.4em;
|
||||
margin: 10px 0;
|
||||
}
|
||||
.mail-conv-outside-wrapper-end {
|
||||
clear: both;
|
||||
}
|
||||
.mail-conv-outside-wrapper {
|
||||
margin-top: 30px;
|
||||
}
|
||||
.mail-conv-delete-wrapper {
|
||||
float: right;
|
||||
margin-right: 30px;
|
||||
margin-top: 15px;
|
||||
}
|
||||
.mail-conv-break {
|
||||
clear: both;
|
||||
}
|
||||
.mail-conv-delete-icon {
|
||||
border: none;
|
||||
}
|
||||
/* group member */
|
||||
#contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper {
|
||||
float: right;
|
||||
|
|
Ładowanie…
Reference in New Issue