Merge https://github.com/friendica/friendica into pull
This commit is contained in:
commit
6914bdce17
5 changed files with 13 additions and 11 deletions
Binary file not shown.
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
|
@ -53,9 +53,6 @@ $nv.search
|
||||||
{{ endif }}
|
{{ endif }}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="twitter">
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="close_lastusers">
|
<div id="close_lastusers">
|
||||||
{{ if $lastusers_title }}
|
{{ if $lastusers_title }}
|
||||||
<h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>
|
<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 }}
|
{{ endfor }}
|
||||||
</ul>
|
</ul>
|
||||||
{{ endif }}
|
{{ endif }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="twitter">
|
||||||
</div>
|
</div>
|
|
@ -1597,9 +1597,10 @@ transition: all 0.2s ease-in-out;
|
||||||
width: 99%;
|
width: 99%;
|
||||||
font-size: 15px;
|
font-size: 15px;
|
||||||
color: #eec;
|
color: #eec;
|
||||||
border: 1px solid #444;
|
border: 1px solid #eec;
|
||||||
padding: 0.3em;
|
padding: 0.3em;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
|
background: #444
|
||||||
}
|
}
|
||||||
.grey
|
.grey
|
||||||
{
|
{
|
||||||
|
|
|
@ -547,7 +547,7 @@ code {
|
||||||
float: right;
|
float: right;
|
||||||
}
|
}
|
||||||
.tool a {
|
.tool a {
|
||||||
color: #3465a4;
|
color: #88a9d2;
|
||||||
}
|
}
|
||||||
.tool a:hover {
|
.tool a:hover {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
|
@ -594,7 +594,7 @@ header #banner a:active,
|
||||||
header #banner a:visited,
|
header #banner a:visited,
|
||||||
header #banner a:link,
|
header #banner a:link,
|
||||||
header #banner a:hover {
|
header #banner a:hover {
|
||||||
color: #2e2f2e;
|
color: #eec;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
outline: none;
|
outline: none;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
|
@ -806,7 +806,7 @@ nav .nav-menu-icon:hover {
|
||||||
}
|
}
|
||||||
|
|
||||||
nav .nav-menu-icon.selected {
|
nav .nav-menu-icon.selected {
|
||||||
background-color: #fff;
|
background-color: #308dbf;
|
||||||
}
|
}
|
||||||
nav .nav-menu-icon img {
|
nav .nav-menu-icon img {
|
||||||
width: 22px;
|
width: 22px;
|
||||||
|
@ -929,7 +929,7 @@ ul.menu-popup {
|
||||||
}
|
}
|
||||||
ul.menu-popup a {
|
ul.menu-popup a {
|
||||||
display: block;
|
display: block;
|
||||||
color: #2e302e;
|
color: #eec;
|
||||||
padding: 5px 10px;
|
padding: 5px 10px;
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
|
@ -1923,6 +1923,7 @@ body .pageheader{
|
||||||
margin: 0 0 5px;
|
margin: 0 0 5px;
|
||||||
width: 60%;
|
width: 60%;
|
||||||
border: 1px solid #d2d2d2;
|
border: 1px solid #d2d2d2;
|
||||||
|
background: #444;
|
||||||
}
|
}
|
||||||
#profile-jot-form #jot-title:-webkit-input-placeholder {
|
#profile-jot-form #jot-title:-webkit-input-placeholder {
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
|
|
|
@ -195,9 +195,9 @@ function diabook_community_info(){
|
||||||
|
|
||||||
//Community Page
|
//Community Page
|
||||||
if(local_user()) {
|
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>
|
<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();
|
$pagelist = array();
|
||||||
|
|
||||||
|
@ -218,7 +218,7 @@ function diabook_community_info(){
|
||||||
$contacts = $pageD;
|
$contacts = $pageD;
|
||||||
|
|
||||||
foreach($contacts as $contact) {
|
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>";
|
$contact["name"]."</a></li>";
|
||||||
}
|
}
|
||||||
$page .= '</ul></div></div>';
|
$page .= '</ul></div></div>';
|
||||||
|
|
Loading…
Reference in a new issue