bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge branch 'master' of git://github.com/friendika/friendika

Browse source
This commit is contained in:
Tobias Diekershoff 2011-01-18 11:05:18 +01:00
commit 8b99779181
17 changed files with 97 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

4
view/en/profile_advanced.php
View file

@ -39,8 +39,8 @@ EOT;
$o .= '<div id="advanced-profile-dob">'
. ((intval($a->profile['dob']))
? datetime_convert('UTC',date_default_timezone_get(),$a->profile['dob'],'j F, Y')
: datetime_convert('UTC',date_default_timezone_get(),'2001-' . substr($a->profile['dob'],6),'j F'))
? day_translate(datetime_convert('UTC',date_default_timezone_get(),$a->profile['dob'],'j F, Y'))
: day_translate(datetime_convert('UTC',date_default_timezone_get(),'2001-' . substr($a->profile['dob'],6),'j F')))
. "</div>\r\n</div>";
$o .= '<div id="advanced-profile-dob-end"></div>';

4
view/it/profile_advanced.php
View file

@ -39,8 +39,8 @@ EOT;
$o .= '<div id="advanced-profile-dob">'
. ((intval($a->profile['dob']))
? datetime_convert('UTC',date_default_timezone_get(),$a->profile['dob'],'j F, Y')
: datetime_convert('UTC',date_default_timezone_get(),'2001-' . substr($a->profile['dob'],6),'j F'))
? day_translate(datetime_convert('UTC',date_default_timezone_get(),$a->profile['dob'],'j F, Y'))
: day_translate(datetime_convert('UTC',date_default_timezone_get(),'2001-' . substr($a->profile['dob'],6),'j F')))
. "</div>\r\n</div>";
$o .= '<div id="advanced-profile-dob-end"></div>';

2
view/theme/default/style.css
View file

@ -1979,5 +1979,5 @@ a.mail-list-link {
}
#birthday-wrapper {
margin-bottom: 15px;
margin-bottom: 20px;
}

BIN
view/theme/duepuntozero/shiny.jpg
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 338 B

BIN
view/theme/duepuntozero/shiny.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 362 B

29
view/theme/duepuntozero/style.css
View file

@ -3,23 +3,10 @@
* Fabio Comuni <fabrix.xm@gmail.com>
*/
@font-face {
font-family: FreeSans;
font-style: normal;
font-weight: bold;
src: local('FreeSansBold'), url('FreeSansBold.otf');
}
@font-face {
font-family: FreeSans;
font-style: normal;
font-weight: normal;
src: local('FreeSans'), url('FreeSans.otf');
}
/* generals */
body {
font-family: /*FreeSans,*/ helvetica,arial,clean,sans-serif;
font-family: helvetica,arial,freesans,clean,sans-serif;
font-size: 12px;
background-color: #ffffff;
background-image: url(head.jpg);
@ -209,10 +196,10 @@ footer {
}
.shiny {
background-image: url(shiny.jpg);
background-repeat: repeat-x;
background-position: left bottom;
div.wall-item-content-wrapper.shiny {
background-image: url('shiny.png');
background-position: -5px 30px;
background-repeat:no-repeat;
}
/* from defautlt */
@ -801,7 +788,7 @@ input#dfrn-url {
.wall-item-content-wrapper.comment {
margin-left: 50px;
background: #CCCCCC;
background: #EEEEEE;
}
.wall-item-photo-wrapper {
@ -879,7 +866,7 @@ input#dfrn-url {
.comment-edit-wrapper {
margin-top: 15px;
background: #CCCCCC;
background: #f3f3f3;
margin-left: 50px;
}
@ -1876,5 +1863,5 @@ a.mail-list-link {
}
#birthday-wrapper {
margin-bottom: 15px;
margin-bottom: 20px;
}