clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #118 from tomtom84/master 

fixes in diabook-derivates
This commit is contained in:
tomtom84 2012-03-10 04:24:49 -08:00
parent 1e37477fdc 0f3255467e
commit c79cb57e1e
9 changed files with 52 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
view/theme/diabook-blue/icons/notifications.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 795 B

After

Width:  |  Height:  |  Size: 727 B

29
view/theme/diabook-blue/style.css
View File

@ -652,6 +652,17 @@ nav .nav-menu-icon {
-webkit-border-radius: 5px 5px 0 0;
border-radius: 5px 5px 0 0;
}
nav .nav-menu-icon:hover {
background-color: #308dbf;
position: relative;
height: 22px;
padding: 5px;
margin: 0px 7px;
-moz-border-radius: 5px 5px 0 0;
-webkit-border-radius: 5px 5px 0 0;
border-radius: 5px 5px 0 0;
}
nav .nav-menu-icon.selected {
background-color: #fff;
}
@ -1037,13 +1048,22 @@ section {
width: 800px;
padding: 0px 0px 0px 12px;
}
#id_username {
width: 173px;
}
#id_password {
width: 173px;
}
#id_openid_url {
width: 173px;
}
#contact-edit-end {
margin-top: 140%;
}
.pager {
padding: 10px;
text-align: center;
font-size: 1.0em;
margin-top: 140%;
}
.tabs {
@ -1075,6 +1095,10 @@ section {
margin-bottom: 0px;
width: 775px;
}
.tread-wrapper a{
color: #1872A2;
}
.wall-item-decor {
position: absolute;
left: 790px;
@ -1118,6 +1142,7 @@ section {
}
.wall-item-container .wall-item-location {
padding-right: 40px;
display: table-cell;
}
.wall-item-container .wall-item-ago {
word-wrap: break-word;
@ -1173,6 +1198,7 @@ section {
.wall-item-container .wall-item-actions-social {
float: left;
margin-bottom: 1px;
display: table-cell;
}
.wall-item-container .wall-item-actions-social a {
margin-right: 1em;
@ -1183,6 +1209,7 @@ section {
.wall-item-container .wall-item-actions-tools {
float: right;
width: 80px;
display: table-cell;done
}
.wall-item-container .wall-item-actions-tools a {
float: right;

4
view/theme/diabook-blue/wall_item.tpl
View File

@ -46,7 +46,7 @@
</div>
<div class="wall-item-actions">
<div class="wall-item-location">$item.location&nbsp;</div>
<div class="wall-item-actions-social">
@ -82,7 +82,7 @@
<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
{{ endif }}
</div>
<div class="wall-item-location">$item.location&nbsp;</div>
</div>
</div>
<div class="wall-item-bottom">

4
view/theme/diabook-blue/wallwall_item.tpl
View File

@ -52,7 +52,7 @@
</div>
<div class="wall-item-actions">
<div class="wall-item-location">$item.location&nbsp;</div>
<div class="wall-item-actions-social">
@ -88,7 +88,7 @@
<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
{{ endif }}
</div>
<div class="wall-item-location">$item.location&nbsp;</div>
</div>
</div>
<div class="wall-item-bottom">

BIN
view/theme/diabook/icons/notifications.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 758 B

After

Width:  |  Height:  |  Size: 714 B

15
view/theme/diabook/style.css
View File

@ -1036,13 +1036,23 @@ section {
width: 800px;
padding: 0px 0px 0px 12px;
}
#id_username {
width: 173px;
}
#id_password {
width: 173px;
}
#id_openid_url {
width: 173px;
}
#contact-edit-end {
margin-top: 140%;
}
.pager {
padding: 10px;
text-align: center;
font-size: 1.0em;
margin-top: 140%;
}
.tabs {
@ -1116,6 +1126,7 @@ section {
}
.wall-item-container .wall-item-location {
padding-right: 40px;
display: table-cell;
}
.wall-item-container .wall-item-ago {
word-wrap: break-word;
@ -1171,6 +1182,7 @@ section {
.wall-item-container .wall-item-actions-social {
float: left;
margin-bottom: 1px;
display: table-cell;
}
.wall-item-container .wall-item-actions-social a {
margin-right: 1em;
@ -1181,6 +1193,7 @@ section {
.wall-item-container .wall-item-actions-tools {
float: right;
width: 80px;
display: table-cell;
}
.wall-item-container .wall-item-actions-tools a {
float: right;

3
view/theme/diabook/theme.php
View File

@ -13,6 +13,7 @@ $a->theme_info = array(
$a->page['htmlhead'] .= <<< EOT
<script>
//contacts
$('html').click(function() {
$('#nav-contacts-linkmenu').removeClass('selected');
@ -62,5 +63,5 @@ $('html').click(function() {
$('#nav-site-linkmenu').click(function(event){
event.stopPropagation();
});
</script>
</script>
EOT;

4
view/theme/diabook/wall_item.tpl
View File

@ -46,7 +46,7 @@
</div>
<div class="wall-item-actions">
<div class="wall-item-location">$item.location&nbsp;</div>
<div class="wall-item-actions-social">
@ -82,7 +82,7 @@
<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
{{ endif }}
</div>
<div class="wall-item-location">$item.location&nbsp;</div>
</div>
</div>
<div class="wall-item-bottom">

4
view/theme/diabook/wallwall_item.tpl
View File

@ -52,7 +52,7 @@
</div>
<div class="wall-item-actions">
<div class="wall-item-location">$item.location&nbsp;</div>
<div class="wall-item-actions-social">
@ -88,7 +88,7 @@
<a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
{{ endif }}
</div>
<div class="wall-item-location">$item.location&nbsp;</div>
</div>
</div>
<div class="wall-item-bottom">