strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'friendica/master'

Browse source
This commit is contained in:
Fabio Comuni 2012-02-23 14:10:32 +01:00
parent edd946bcad c03b5b62c0
commit 6a0c815c1f
3 changed files with 43 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/html2bbcode.php
View file

@ -204,7 +204,7 @@ function html2bbcode($message)
node2bbcode($doc, 'a', array('href'=>'/(.+)/'), '[url=$1]', '[/url]'); node2bbcode($doc, 'a', array('href'=>'/(.+)/'), '[url=$1]', '[/url]');
node2bbcode($doc, 'img', array('src'=>'/(.+)/', 'width'=>'/(\d+)/', 'height'=>'/(\d+)/'), '[img$2x$3]$1', '[/img]'); node2bbcode($doc, 'img', array('src'=>'/(.+)/', 'width'=>'/(\d+)/', 'height'=>'/(\d+)/'), '[img=$2x$3]$1', '[/img]');
node2bbcode($doc, 'img', array('src'=>'/(.+)/'), '[img]$1', '[/img]'); node2bbcode($doc, 'img', array('src'=>'/(.+)/'), '[img]$1', '[/img]');

4
view/theme/quattro-green/colors.less
View file

@ -1,6 +1,7 @@
// Quattro Theme LESS file // Quattro Theme LESS file
// "Echo" palette from Inkscape // "Echo" palette from Inkscape
@Yellow1 : #fce94f;
@Blue1:rgb(25,174,255); @Blue1:rgb(25,174,255);
@Blue2:rgb(0,132,200); @Blue2:rgb(0,132,200);
@Blue3:rgb(0,92,148); @Blue3:rgb(0,92,148);
@ -16,6 +17,7 @@
@Green1:rgb(204,255,66); @Green1:rgb(204,255,66);
@Green2:rgb(154,222,0); @Green2:rgb(154,222,0);
@Green3:rgb(0,145,0); @Green3:rgb(0,145,0);
@Green4:rgb(221,255,221);
@Purple1:rgb(241,202,255); @Purple1:rgb(241,202,255);
@Purple2:rgb(215,108,255); @Purple2:rgb(215,108,255);
@Purple3:rgb(186,0,255); @Purple3:rgb(186,0,255);
@ -71,6 +73,7 @@
@NoticeBackgroundColor: #511919; @NoticeBackgroundColor: #511919;
@ThreadBackgroundColor: #f6f7f8; @ThreadBackgroundColor: #f6f7f8;
@ShinyBorderColor: @Green4;
@CommentBoxEmptyColor: @Grey3; @CommentBoxEmptyColor: @Grey3;
@CommentBoxEmptyBorderColor: @Grey3; @CommentBoxEmptyBorderColor: @Grey3;
@ -91,4 +94,5 @@
@JotPermissionUnlockBackgroundColor: @Grey2; @JotPermissionUnlockBackgroundColor: @Grey2;
@JotPermissionLockBackgroundColor: @Grey4; @JotPermissionLockBackgroundColor: @Grey4;
@JotLoadingBackgroundColor: @Grey1; @JotLoadingBackgroundColor: @Grey1;
@JotPreviewBackgroundColor: @Green4;

60
view/theme/quattro-green/style.css
View file

@ -602,6 +602,8 @@ aside #profiles-menu {
#contact-block { #contact-block {
overflow: auto; overflow: auto;
height: auto; height: auto;
/*.contact-block-div { width:60px; height: 60px; }*/
} }
#contact-block .contact-block-h4 { #contact-block .contact-block-h4 {
float: left; float: left;
@ -613,7 +615,7 @@ aside #profiles-menu {
} }
#contact-block .contact-block-content { #contact-block .contact-block-content {
clear: both; clear: both;
overflow: auto; overflow: idden;
height: auto; height: auto;
} }
#contact-block .contact-block-link { #contact-block .contact-block-link {
@ -622,7 +624,7 @@ aside #profiles-menu {
} }
#contact-block .contact-block-link img { #contact-block .contact-block-link img {
widht: 48px; widht: 48px;
height: 58px; height: 48px;
} }
/* mail view */ /* mail view */
.mail-conv-sender, .mail-conv-detail { .mail-conv-sender, .mail-conv-detail {
@ -675,31 +677,32 @@ aside #profiles-menu {
position: relative; position: relative;
top: -50px; top: -50px;
} }
/*
#group-members { #group-members {
margin-top: 20px; margin-top: 20px;
padding: 10px; padding: 10px;
height: 250px; height: 250px;
overflow: auto; overflow: auto;
border: 1px solid #ddd; border: 1px solid #ddd;
} }
#group-members-end { #group-members-end {
clear: both; clear: both;
} }
#group-all-contacts { #group-all-contacts {
padding: 10px; padding: 10px;
height: 450px; height: 450px;
overflow: auto; overflow: auto;
border: 1px solid #ddd; border: 1px solid #ddd;
} }
#group-all-contacts-end { #group-all-contacts-end {
clear: both; clear: both;
margin-bottom: 10px; margin-bottom: 10px;
} }
.contact-block-div { .contact-block-div {
float: left; float: left;
width: 52px; width: 60px;
height: 52px; height: 60px;
} }*/
/* widget */ /* widget */
.widget { .widget {
margin-bottom: 2em; margin-bottom: 2em;
@ -946,6 +949,12 @@ section {
padding: 0; padding: 0;
margin: 10px 0; margin: 10px 0;
} }
.shiny {
border-right: 10px solid #ddffdd;
}
#jot-preview-content .tread-wrapper {
background-color: #ddffdd;
}
.wall-item-tags { .wall-item-tags {
padding-top: 5px; padding-top: 5px;
} }
@ -985,7 +994,6 @@ section {
bottom: 5px; bottom: 5px;
right: 5px; right: 5px;
} }
/* contacts menu */
.contact-photo-wrapper { .contact-photo-wrapper {
position: relative; position: relative;
} }
@ -1007,9 +1015,14 @@ section {
} }
.contact-wrapper { .contact-wrapper {
float: left; float: left;
width: 90px; width: 300px;
height: 90px; height: 90px;
margin-bottom: 15px; padding-right: 10px;
margin: 0 10px 10px 0px;
}
.contact-wrapper .contact-photo-wrapper {
float: left;
margin-right: 10px;
} }
.contact-wrapper .contact-photo { .contact-wrapper .contact-photo {
width: 80px; width: 80px;
@ -1037,11 +1050,14 @@ section {
height: 175px; height: 175px;
} }
.contact-name { .contact-name {
text-align: center;
font-weight: bold; font-weight: bold;
padding-top: 15px;
} }
.contact-details { .contact-details {
color: #999999; color: #999999;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
/* editor */ /* editor */
.jothidden { .jothidden {