Merge remote branch 'upstream/master'

8 files changed, 46 insertions, 21 deletions

diff --git a/view/match.tpl b/view/match.tpl
index 5f2fc7a30..b052845ae 100644
--- a/view/match.tpl
+++ b/view/match.tpl
@@ -13,4 +13,4 @@
 	<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
 	{{ endif }}
 
-</div>
\ No newline at end of file
+</div>
diff --git a/view/remote_friends_common.tpl b/view/remote_friends_common.tpl
new file mode 100644
index 000000000..a5a36b137
--- /dev/null
+++ b/view/remote_friends_common.tpl
@@ -0,0 +1,21 @@
+<div id="remote-friends-in-common" class="bigwidget">
+	<div id="rfic-desc">$desc</div>
+	{{ if $items }}
+	{{ for $items as $item }}
+	<div class="profile-match-wrapper">
+		<div class="profile-match-photo">
+			<a href="$item.url">
+				<img src="$item.photo" width="80" height="80" alt="$item.name" title="$item.name" />
+			</a>
+		</div>
+		<div class="profile-match-break"></div>
+		<div class="profile-match-name">
+			<a href="$itemurl" title="$item.name">$item.name</a>
+		</div>
+		<div class="profile-match-end"></div>
+	</div>
+	{{ endfor }}
+	{{ endif }}
+	<div id="rfic-end" class="clear"></div>
+</div>
+
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl
index 982e2bd26..f2f8b4d5e 100755
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/communityhome.tpl
@@ -53,9 +53,6 @@ $nv.search
 {{ endif }}
 </div>
 
-<div id="twitter">
-</div>
-
 <div id="close_lastusers">
 {{ if $lastusers_title }}
 <h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>
@@ -96,4 +93,7 @@ $nv.search
 {{ endfor }}
 </ul>
 {{ endif }}
+</div>
+
+<div id="twitter">
 </div>
\ No newline at end of file
diff --git a/view/theme/diabook/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css
index 8a7083d9d..43541d266 100644
--- a/view/theme/diabook/diabook-dark/style-network.css
+++ b/view/theme/diabook/diabook-dark/style-network.css
@@ -1597,9 +1597,10 @@ transition: all 0.2s ease-in-out;
   width: 99%;
   font-size: 15px;
   color: #eec;
-  border: 1px solid #444;
+  border: 1px solid #eec;
   padding: 0.3em;
   margin-bottom: 10px;
+  background: #444
 }
 .grey
 {
diff --git a/view/theme/diabook/diabook-dark/style.css b/view/theme/diabook/diabook-dark/style.css
index b59ab5dc1..f00973085 100644
--- a/view/theme/diabook/diabook-dark/style.css
+++ b/view/theme/diabook/diabook-dark/style.css
@@ -547,7 +547,7 @@ code {
   float: right;
 }
 .tool a {
-  color: #3465a4;
+  color: #88a9d2;
 }
 .tool a:hover {
   text-decoration: none;
@@ -594,7 +594,7 @@ header #banner a:active,
 header #banner a:visited,
 header #banner a:link,
 header #banner a:hover {
-  color: #2e2f2e;
+  color: #eec;
   text-decoration: none;
   outline: none;
   vertical-align: middle;
@@ -806,7 +806,7 @@ nav .nav-menu-icon:hover {
 }
 
 nav .nav-menu-icon.selected {
-  background-color: #fff;
+  background-color: #308dbf;
 }
 nav .nav-menu-icon img {
   width: 22px;
@@ -929,7 +929,7 @@ ul.menu-popup {
 }
 ul.menu-popup a {
   display: block;
-  color: #2e302e;
+  color: #eec;
   padding: 5px 10px;
   text-decoration: none;
 }
@@ -1923,6 +1923,7 @@ body .pageheader{
     margin: 0 0 5px;
     width: 60%;
     border: 1px solid #d2d2d2;
+    background: #444;
 }
 #profile-jot-form #jot-title:-webkit-input-placeholder {
   font-weight: normal;
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 945c3f36b..07fef7d7c 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -195,9 +195,9 @@ function diabook_community_info(){
    
    //Community Page
    if(local_user()) {
-   $page = '<div id="page-sidebar-right_aside" >
+   $page = '<div id="" >
 			<h3 style="margin-top:0px;">'.t("Community Pages").'<a id="close_pages_icon"  onClick="close_pages()" class="icon close_box" title="close"></a></h3></div>
-			<div id="sidebar-page-list"><ul>';
+			<div id=""><ul style="margin-left: 7px;margin-top: 0px;padding-left: 0px;padding-top: 0px;">';
 
 	$pagelist = array();
 
@@ -218,7 +218,7 @@ function diabook_community_info(){
 	$contacts = $pageD;
 
 	foreach($contacts as $contact) {
-		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
+		$page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px; word-wrap: break-word; width: 132px;" title="' . $contact['url'] . '" class="label" target="external-link">'.
 				$contact["name"]."</a></li>";
 	}
 	$page .= '</ul></div></div>';
diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css
index 8fc48a80f..19ae9b6e8 100644
--- a/view/theme/dispy/light/style.css
+++ b/view/theme/dispy/light/style.css
@@ -2,10 +2,10 @@ article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display
 audio,canvas,video,time{display:inline-block;*display:inline;*zoom:1;}
 audio:not([controls]),[hidden]{display:none;}
 html{font-size:100%;overflow-y:scroll;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
-body{margin:0;font-size:16px;line-height:1.1em;font-family:sans-serif;color:#222;background-color:#e8e8e8;}
-button,input,select,textarea{font-family:sans-serif;color:#222;background-color:#e8e8e8;}
-select{border:1px #555 dotted;padding:3px;margin:3px;color:#222;background:#e8e8e8;}
-option{padding:3px;color:#222;background:#e8e8e8;}option[selected="selected"]{color:#111;background:#cca;}
+body{margin:0;font-size:16px;line-height:1.1em;font-family:sans-serif;color:#111;background-color:#eee;}
+button,input,select,textarea{font-family:sans-serif;color:#222;background-color:#eee;}
+select{border:1px #555 dotted;padding:3px;margin:3px;color:#222;background:#eee;}
+option{padding:3px;color:#222;background:#eee;}option[selected="selected"]{color:#111;background:#cca;}
 ul,ol{padding:0;}
 :focus{outline:0;}
 [disabled="disabled"]{background:#ddd;color:#333;}
diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
index 57b40351b..8968da42e 100644
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@@ -13,6 +13,8 @@
 /* from html5boilerplate */
 /* these are to tell browsers they should be displayed a certain way */
 
+//@import "_base.less";
+
 article, aside, details, figcaption, figure, footer, header, hgroup, nav, section {
   display: block; }
 
@@ -44,25 +46,25 @@ body {
   font-size: 16px;
   line-height: 1.1em;
   font-family: sans-serif;
-  color: #222;
-  background-color: #e8e8e8; }
+  color: #111;
+  background-color: #eee; }
 
 button, input, select, textarea {
   font-family: sans-serif;
   color: #222;
-  background-color: #e8e8e8; }
+  background-color: #eee; }
 
 select {
   border: 1px #555 dotted;
   padding: 3px;
   margin: 3px;
   color: #222;
-  background: #e8e8e8; }
+  background: #eee; }
 
 option {
   padding: 3px;
   color: #222;
-  background: #e8e8e8;
+  background: #eee;
   &[selected="selected"] {
     color: #111;
     background: #cca; } }