Merge branch 'pull'

4 files changed, 30 insertions, 20 deletions

diff --git a/view/theme/diabook-aerith/communityhome.tpl b/view/theme/diabook-aerith/communityhome.tpl
index cff75cd40..cf8d81335 100755
--- a/view/theme/diabook-aerith/communityhome.tpl
+++ b/view/theme/diabook-aerith/communityhome.tpl
@@ -17,7 +17,7 @@
 <div id="close_services">
 {{ if $lastusers_title }}
 <h3>Connectable Services<a id="close_services_icon" onClick="close_services()" class="icon close_box" title="close"></a></h3>
-<div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;">
+<div id="right_service_icons" style="margin-left: 16px; margin-top: 5px;">
 <a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook-blue/icons/facebook.png" title="Facebook"></a>
 <a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook-blue/icons/StatusNet.png?" title="StatusNet"></a>
 <a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook-blue/icons/livejournal.png?" title="LiveJournal"></a>
diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css
index dd8d62122..b35a70c65 100644
--- a/view/theme/diabook-aerith/style-network.css
+++ b/view/theme/diabook-aerith/style-network.css
@@ -557,13 +557,14 @@ header #banner a:hover {
   outline: none;
   vertical-align: middle;
   font-weight: bolder;
+  margin-left: 3px;
 }
 header #banner #logo-img {
   height: 25px;
   margin-top: 3px;
 }
 header #banner #logo-text {
-  font-size: 21px;
+  font-size: 20px;
   position: absolute;
   top: 10%;
 }
@@ -718,7 +719,7 @@ nav .nav-menu.selected {
 nav .nav-notify {
   display: none;
   position: absolute;
-  background-color: #ff0000;
+  background-color: #fff;
   /* background-color: #19aeff; */
   -moz-border-radius: 5px 5px 5px 5px;
   -webkit-border-radius: 5px 5px 5px 5px;
@@ -730,6 +731,7 @@ nav .nav-notify {
   right: -6px;
   min-width: 10px;
   text-align: center;
+  border: 1px solid black;
 }
 nav .nav-notify.show {
   display: block;
@@ -752,7 +754,7 @@ nav #nav-home-link, #nav-directory-link, #nav-apps-link{
 	margin-right: 0px;
 	font-weight: bold;
 	margin: 3px 5px;
-	font-size: 15px;
+	font-size: 14px;
 	}
 nav #nav-directory-link{
   margin-right: 0px;	
@@ -1037,6 +1039,8 @@ aside #profiles-menu {
 }
 aside #search-text {
 	width: 150px;
+	height: 17px;
+	padding-left: 10px;
 	border-top-left-radius: 15px;
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
@@ -1259,6 +1263,7 @@ right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow:
 right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto;	width: 100%; }
 #page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
 #page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
 right_aside .icon {width: 10px; height: 10px;}
 .close_box		{ 
 		background-image: url("../../../view/theme/diabook-aerith/icons/close_box.png");
@@ -1744,6 +1749,7 @@ transition: all 0.2s ease-in-out;
 #profile-jot-submit {
 	float: right;
 	margin-top: 2px;
+	font-size: 14px;
 	
 }
 #profile-upload-wrapper {
@@ -1796,7 +1802,7 @@ transition: all 0.2s ease-in-out;
 	float: right;
 	margin-left: 10px;
 	margin-top: 2px;
-	font-size: 10px;
+	font-size: 9px;
 	font-weight: bolder;
 	cursor: pointer;
 }
@@ -1809,7 +1815,6 @@ transition: all 0.2s ease-in-out;
 .button.creation1 {
     background-color: #fff;
     border: 1px solid #777777;
-    background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
     cursor: pointer;
@@ -1817,7 +1822,6 @@ transition: all 0.2s ease-in-out;
 }
 .button.creation2 {
     background-color: #3465A4;
-    background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
     border: 1px solid #777777;
     color: white;
     border-radius: 3px 3px 3px 3px;
diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css
index e350db93e..9c9f8b4e6 100644
--- a/view/theme/diabook-aerith/style-profile.css
+++ b/view/theme/diabook-aerith/style-profile.css
@@ -558,13 +558,14 @@ header #banner a:hover {
   outline: none;
   vertical-align: middle;
   font-weight: bolder;
+  margin-left: 3px;
 }
 header #banner #logo-img {
   height: 25px;
   margin-top: 3px;
 }
 header #banner #logo-text {
-  font-size: 21px;
+  font-size: 20px;
   position: absolute;
   top: 10%;
 }
@@ -719,7 +720,7 @@ nav .nav-menu.selected {
 nav .nav-notify {
   display: none;
   position: absolute;
-  background-color: #ff0000;
+  background-color: #fff;
   /* background-color: #19aeff; */
   -moz-border-radius: 5px 5px 5px 5px;
   -webkit-border-radius: 5px 5px 5px 5px;
@@ -731,6 +732,7 @@ nav .nav-notify {
   right: -6px;
   min-width: 10px;
   text-align: center;
+  border: 1px solid black;
 }
 nav .nav-notify.show {
   display: block;
@@ -753,7 +755,7 @@ nav #nav-home-link, #nav-directory-link, #nav-apps-link{
 	margin-right: 0px;
 	font-weight: bold;
 	margin: 3px 5px;
-	font-size: 15px;
+	font-size: 14px;
 	}
 nav #nav-directory-link{
   margin-right: 0px;	
@@ -1036,6 +1038,8 @@ aside #profiles-menu {
 }
 aside #search-text {
 	width: 150px;
+	height: 17px;
+	padding-left: 10px;
 	border-top-left-radius: 15px;
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
@@ -1258,6 +1262,7 @@ right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow:
 right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto;	width: 100%; }
 #page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
 #page-sidebar-right_aside ul {margin-top: 0px;}
+#page-sidebar-right_aside .label {max-width: 128px;}
 right_aside .icon {width: 10px; height: 10px;}
 .close_box		{ 
 		background-image: url("../../../view/theme/diabook-aerith/icons/close_box.png");
@@ -1738,7 +1743,7 @@ transition: all 0.2s ease-in-out;
 #profile-jot-submit {
 	float: right;
 	margin-top: 2px;
-	
+	font-size: 14px;
 }
 #profile-upload-wrapper {
 	float: left;
@@ -1790,7 +1795,7 @@ transition: all 0.2s ease-in-out;
 	float: right;
 	margin-left: 10px;
 	margin-top: 2px;
-	font-size: 10px;
+	font-size: 9px;
 	font-weight: bolder;
 	cursor: pointer;
 }
@@ -1803,7 +1808,6 @@ transition: all 0.2s ease-in-out;
 .button.creation1 {
     background-color: #fff;
     border: 1px solid #777777;
-    background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
  	 font-weight: bolder;
@@ -1811,7 +1815,6 @@ transition: all 0.2s ease-in-out;
 }
 .button.creation2 {
     background-color: #3465A4;
-    background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
     border: 1px solid #777777;
     color: white;
     border-radius: 3px 3px 3px 3px;
diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css
index 9eca0ab4d..fbcca699f 100644
--- a/view/theme/diabook-aerith/style.css
+++ b/view/theme/diabook-aerith/style.css
@@ -555,13 +555,14 @@ header #banner a:hover {
   outline: none;
   vertical-align: middle;
   font-weight: bolder;
+  margin-left: 3px;
 }
 header #banner #logo-img {
   height: 25px;
   margin-top: 3px;
 }
 header #banner #logo-text {
-  font-size: 21px;
+  font-size: 20px;
   position: absolute;
   top: 10%;
 }
@@ -716,7 +717,7 @@ nav .nav-menu.selected {
 nav .nav-notify {
   display: none;
   position: absolute;
-  background-color: #ff0000;
+  background-color: #fff;
   /* background-color: #19aeff; */
   -moz-border-radius: 5px 5px 5px 5px;
   -webkit-border-radius: 5px 5px 5px 5px;
@@ -728,6 +729,7 @@ nav .nav-notify {
   right: -6px;
   min-width: 10px;
   text-align: center;
+  border: 1px solid black;
 }
 nav .nav-notify.show {
   display: block;
@@ -750,7 +752,7 @@ nav #nav-home-link, #nav-directory-link, #nav-apps-link{
 	margin-right: 0px;
 	font-weight: bold;
 	margin: 3px 5px;
-	font-size: 15px;
+	font-size: 14px;
 	}
 nav #nav-directory-link{
   margin-right: 0px;	
@@ -1034,6 +1036,8 @@ aside #profiles-menu {
 }
 aside #search-text {
 	width: 173px;
+	height: 17px;
+	padding-left: 10px;
 	border-top-left-radius: 15px;
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
@@ -1669,6 +1673,7 @@ body .pageheader{
 #profile-jot-submit {
 	float: right;
 	margin-top: 2px;
+	font-size: 14px;
 	
 }
 #profile-upload-wrapper {
@@ -1721,7 +1726,7 @@ body .pageheader{
 	float: right;
 	margin-left: 10px;
 	margin-top: 2px;
-	font-size: 10px;
+	font-size: 9px;
 	font-weight: bolder;
 	cursor: pointer;
 }
@@ -1734,7 +1739,6 @@ body .pageheader{
 .button.creation1 {
     background-color: #fff;
     border: 1px solid #777777;
-    background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
     font-weight: bolder;
@@ -1742,7 +1746,6 @@ body .pageheader{
 }
 .button.creation2 {
     background-color: #3465A4;
-    background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
     border: 1px solid #777777;
     color: white;
     border-radius: 3px 3px 3px 3px;