Merge branch 'pull'
This commit is contained in:
commit
ca31aed490
12 changed files with 37 additions and 22 deletions
2
view/contact_edit.tpl
Executable file → Normal file
2
view/contact_edit.tpl
Executable file → Normal file
|
@ -63,7 +63,7 @@
|
|||
|
||||
<div id="contact-edit-info-wrapper">
|
||||
<h4>$lbl_info1</h4>
|
||||
<textarea id="contact-edit-info" rows=8 cols=72 name="info" >$info</textarea>
|
||||
<textarea id="contact-edit-info" rows="8" cols="60" name="info">$info</textarea>
|
||||
<input class="contact-edit-submit" type="submit" name="submit" value="$submit" />
|
||||
</div>
|
||||
<div id="contact-edit-info-end"></div>
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
</div>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $lastusers_title }}
|
||||
{{ if $page }}
|
||||
<div>$page</div>
|
||||
{{ endif }}
|
||||
|
||||
|
|
BIN
view/theme/diabook-blue/screenshot.png
Normal file
BIN
view/theme/diabook-blue/screenshot.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 272 KiB |
|
@ -18,7 +18,7 @@ $cssFile = null;
|
|||
/**
|
||||
* prints last community activity
|
||||
*/
|
||||
function diabook_community_info(){
|
||||
function diabook_blue_community_info(){
|
||||
$a = get_app();
|
||||
//right_aside at networkpages
|
||||
|
||||
|
@ -170,6 +170,7 @@ function diabook_community_info(){
|
|||
if (sizeof($contacts) > 0)
|
||||
|
||||
$aside['$page'] = $page;
|
||||
|
||||
//END Community Page
|
||||
|
||||
|
||||
|
@ -214,7 +215,7 @@ if ($a->argv[0] === "network" && local_user()){
|
|||
}
|
||||
|
||||
// COMMUNITY
|
||||
diabook_community_info();
|
||||
diabook_blue_community_info();
|
||||
|
||||
// CUSTOM CSS
|
||||
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-network.css";
|
||||
|
@ -227,7 +228,7 @@ if ($a->argv[0] === "network" && local_user()){
|
|||
if ($a->argv[0] === "profile"){
|
||||
|
||||
// COMMUNITY
|
||||
diabook_community_info();
|
||||
diabook_blue_community_info();
|
||||
|
||||
// CUSTOM CSS
|
||||
$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-profile.css";
|
||||
|
|
|
@ -46,7 +46,7 @@
|
|||
</div>
|
||||
{{ endif }}
|
||||
|
||||
{{ if $lastusers_title }}
|
||||
{{ if $page }}
|
||||
<div>$page</div>
|
||||
{{ endif }}
|
||||
|
||||
|
|
BIN
view/theme/diabook/screenshot.png
Normal file
BIN
view/theme/diabook/screenshot.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 270 KiB |
|
@ -111,6 +111,7 @@
|
|||
.icon.language { background-image: url("../../../view/theme/diabook/icons/language.png");}
|
||||
|
||||
|
||||
|
||||
.camera { background-image: url("../../../view/theme/diabook/icons/camera.png");
|
||||
display: block; width: 28px; height: 28px; background-repeat: no-repeat;
|
||||
}
|
||||
|
@ -1169,6 +1170,12 @@ 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: 30px;}
|
||||
#page-sidebar-right_aside ul {margin-top: 0px;}
|
||||
.icon.expand {
|
||||
background-image: url("../../../view/theme/diabook/icons/expand.png");
|
||||
float: right;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
/* wall item */
|
||||
.tread-wrapper {
|
||||
border-bottom: 1px solid #D2D2D2;
|
||||
|
|
|
@ -252,13 +252,6 @@ $a->page['htmlhead'] .= <<< EOT
|
|||
$('a.lightbox').fancybox(); // Select all links with lightbox class
|
||||
});
|
||||
|
||||
$(document).ready(function ()
|
||||
$('iframe').each(function()
|
||||
var url = $(this).attr("src");
|
||||
$(this).attr("src",url+"?wmode=transparent");
|
||||
);
|
||||
);
|
||||
|
||||
</script>
|
||||
EOT;
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{{ if $lastusers_title }}
|
||||
{{ if $page }}
|
||||
<h3>PostIt to Friendica</h3>
|
||||
<div style="padding-left: 8px;"><span >Post to Friendica from anywhere by bookmarking this <a href="$fostitJS" title="PostIt">Link</a>.</span></div>
|
||||
{{ endif }}
|
||||
|
|
|
@ -491,13 +491,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
|
|||
background: transparent url(icons.png) -190px -60px no-repeat;
|
||||
}
|
||||
.search-box {
|
||||
margin: 5px;
|
||||
width: 65%;
|
||||
display: inline-block;
|
||||
height: 40px;
|
||||
z-index: 100;
|
||||
margin: 12px 0 0 -3px;
|
||||
position: relative;
|
||||
right: -12px;
|
||||
top: 17px;
|
||||
width: 0;
|
||||
}
|
||||
#search-text {
|
||||
border: 1px #2e2f2e solid;
|
||||
background: #2e2f2e;
|
||||
color: #eec;
|
||||
}
|
||||
.nav-ajax-update, .nav-ajax-left {
|
||||
width: 30px;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{{ if $lastusers_title }}
|
||||
{{ if $page }}
|
||||
<h3>PostIt to Friendica</h3>
|
||||
<div style="padding-left: 8px;"><span >Post to Friendica from anywhere by bookmarking this <a href="$fostitJS" title="PostIt">Link</a>.</span></div>
|
||||
{{ endif }}
|
||||
|
|
|
@ -199,6 +199,10 @@ input[type=submit] {
|
|||
.action {
|
||||
margin: 5px 0;
|
||||
}
|
||||
.tool {
|
||||
margin: 5px 0;
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
|
@ -483,13 +487,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
|
|||
background: transparent url(icons.png) -190px -60px no-repeat;
|
||||
}
|
||||
.search-box {
|
||||
margin: 5px;
|
||||
width: 65%;
|
||||
display: inline-block;
|
||||
height: 40px;
|
||||
z-index: 100;
|
||||
margin: 12px 0 0 -3px;
|
||||
position: relative;
|
||||
right: -12px;
|
||||
top: 17px;
|
||||
width: 0;
|
||||
}
|
||||
#search-text {
|
||||
border: 1px #eec solid;
|
||||
background: #eec;
|
||||
color: #e2e33436;
|
||||
}
|
||||
.nav-ajax-update, .nav-ajax-left {
|
||||
width: 30px;
|
||||
|
|
Loading…
Reference in a new issue