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

6 files changed, 13 insertions, 26 deletions

diff --git a/view/en/profile_advanced.php b/view/en/profile_advanced.php
index 82c66adec..9aee6c262 100644
--- a/view/en/profile_advanced.php
+++ b/view/en/profile_advanced.php
@@ -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>';
diff --git a/view/it/profile_advanced.php b/view/it/profile_advanced.php
index 50bb0dd28..899fd56b2 100644
--- a/view/it/profile_advanced.php
+++ b/view/it/profile_advanced.php
@@ -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>';
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index fd14c6bdd..d9e93bbe6 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -1979,5 +1979,5 @@ a.mail-list-link {
 }
 
 #birthday-wrapper {
-	margin-bottom: 15px;
+	margin-bottom: 20px;
 }
diff --git a/view/theme/duepuntozero/shiny.jpg b/view/theme/duepuntozero/shiny.jpg
deleted file mode 100644
index 17c978816..000000000
--- a/view/theme/duepuntozero/shiny.jpg
+++ /dev/null
diff --git a/view/theme/duepuntozero/shiny.png b/view/theme/duepuntozero/shiny.png
new file mode 100644
index 000000000..994c0d05d
--- /dev/null
+++ b/view/theme/duepuntozero/shiny.png
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 37670df01..b2bdb6e87 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -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;
 }