friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #229 from tomtom84/master 

fixes in theme diabook
This commit is contained in:
tomtom84 2012-04-12 08:39:32 -07:00
parent 73487989c0 3a8e6cbacb
commit 2669a13378
12 changed files with 106 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 680 B

After

Width:  |  Height:  |  Size: 774 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 663 B

After

Width:  |  Height:  |  Size: 723 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 722 B

After

Width:  |  Height:  |  Size: 706 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 664 B

After

Width:  |  Height:  |  Size: 637 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 739 B

After

Width:  |  Height:  |  Size: 764 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 710 B

After

Width:  |  Height:  |  Size: 664 B

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 781 B

After

Width:  |  Height:  |  Size: 688 B

10
view/theme/diabook/nets.tpl Normal file
View File

@ -0,0 +1,10 @@
<div id="nets-sidebar" class="widget">
<h3>$title</h3>
<div id="nets-desc">$desc</div>
<a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
<ul class="nets-ul">
{{ for $nets as $net }}
<li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
{{ endfor }}
</ul>
</div>

14
view/theme/diabook/profile_side.tpl
View File

@ -7,13 +7,13 @@
</div> </div>
<ul id="profile-side-menu" class="menu-profile-side"> <ul id="profile-side-menu" class="menu-profile-side">
<li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li> <li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></a></li>
<li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li> <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1<span class="menu-profile-icon photos"></span></a></li>
<li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li> <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1<span class="menu-profile-icon pscontacts"></span></a></li>
<li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li> <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1<span class="menu-profile-icon events"></span></a></li>
<li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li> <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1<span class="menu-profile-icon notes"></span></a></li>
<li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li> <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1<span class="menu-profile-icon foren"></span></a></li>
<li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li> <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1<span class="menu-profile-icon com_side"></span></a></li>
</ul> </ul>
</div> </div>

54
view/theme/diabook/style-network.css
View File

@ -484,8 +484,9 @@ code {
} }
#saved-search-ul .tool:hover, #saved-search-ul .tool:hover,
#nets-sidebar .tool:hover, #nets-sidebar .tool:hover,
#sidebar-group-list .tool:hover { #sidebar-group-list .tool:hover,
background: #EEE; #fileas-sidebar .tool:hover {
background: #E7F2F7;
} }
.tool .label { .tool .label {
float: left; float: left;
@ -898,44 +899,57 @@ ul.menu-popup .empty {
} }
.menu-profile-list{ .menu-profile-list{
height: auto; height: auto;
overflow: auto; overflow: auto;
padding-top: 3px;
padding-bottom: 3px;
padding-left: 16px;
min-height: 16px; min-height: 16px;
list-style: none; list-style: none;
} }
.menu-profile-list:hover{ .menu-profile-list:hover{
background: #EEE; background: #E7F2F7;
} }
.menu-profile-list-item{ .menu-profile-list-item{
padding-left: 5px; padding-left: 5px;
vertical-align: middle;
} }
.menu-profile-list-item:hover{ .menu-profile-list-item:hover{
text-decoration: none; text-decoration: none;
} }
/*http://prothemedesign.com/circular-icons/*/ /*http://prothemedesign.com/circular-icons/*/
.menu-profile-list.home{ .menu-profile-icon.home{
background: url("../../../view/theme/diabook/icons/home.png") no-repeat; background: url("../../../view/theme/diabook/icons/home.png") no-repeat;
float: left;
height: 22px;
width: 22px;
} }
.menu-profile-list.photos{ .menu-profile-icon.photos{
background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat; background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat;
} float: left;
.menu-profile-list.events{ height: 22px;
width: 22px;}
.menu-profile-icon.events{
background: url("../../../view/theme/diabook/icons/events.png") no-repeat; background: url("../../../view/theme/diabook/icons/events.png") no-repeat;
} float: left;
.menu-profile-list.notes{ height: 22px;
width: 22px;}
.menu-profile-icon.notes{
background: url("../../../view/theme/diabook/icons/notes.png") no-repeat; background: url("../../../view/theme/diabook/icons/notes.png") no-repeat;
} float: left;
.menu-profile-list.foren{ height: 22px;
width: 22px;}
.menu-profile-icon.foren{
background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat; background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat;
} float: left;
.menu-profile-list.com_side{ height: 22px;
width: 22px;}
.menu-profile-icon.com_side{
background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat; background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat;
} float: left;
.menu-profile-list.pscontacts{ height: 22px;
width: 22px;}
.menu-profile-icon.pscontacts{
background: url("../../../view/theme/diabook/icons/pscontacts.png") no-repeat; background: url("../../../view/theme/diabook/icons/pscontacts.png") no-repeat;
} float: left;
height: 22px;
width: 22px;}
/* aside */ /* aside */
aside { aside {

32
view/theme/diabook/style-profile.css
View File

@ -483,8 +483,9 @@ code {
} }
#saved-search-ul .tool:hover, #saved-search-ul .tool:hover,
#nets-sidebar .tool:hover, #nets-sidebar .tool:hover,
#sidebar-group-list .tool:hover { #sidebar-group-list .tool:hover,
background: #EEE; #fileas-sidebar .tool:hover{
background: #E7F2F7;
} }
.tool .label { .tool .label {
float: left; float: left;
@ -897,8 +898,6 @@ ul.menu-popup .empty {
.menu-profile-list{ .menu-profile-list{
height: auto; height: auto;
overflow: auto; overflow: auto;
padding-top: 3px;
padding-bottom: 3px;
padding-left: 16px; padding-left: 16px;
min-height: 16px; min-height: 16px;
list-style: none; list-style: none;
@ -908,28 +907,29 @@ ul.menu-popup .empty {
} }
.menu-profile-list-item{ .menu-profile-list-item{
padding-left: 5px; padding-left: 5px;
vertical-align: middle;
} }
.menu-profile-list-item:hover{ .menu-profile-list-item:hover{
text-decoration: none; text-decoration: none;
} }
/*http://prothemedesign.com/circular-icons/*/ /*http://prothemedesign.com/circular-icons/*/
.menu-profile-list.home{ .menu-profile-icon.home{
background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat; background: url("../../../view/theme/diabook/icons/home.png") no-repeat;
} }
.menu-profile-list.photos{ .menu-profile-icon.photos{
background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat; background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat;
} }
.menu-profile-list.events{ .menu-profile-icon.events{
background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat; background: url("../../../view/theme/diabook/icons/events.png") no-repeat;
} }
.menu-profile-list.notes{ .menu-profile-icon.notes{
background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat; background: url("../../../view/theme/diabook/icons/notes.png") no-repeat;
} }
.menu-profile-list.foren{ .menu-profile-icon.foren{
background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat; background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat;
} }
.menu-profile-list.com_side{ .menu-profile-icon.com_side{
background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat; background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat;
} }
/* aside */ /* aside */

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

@ -529,8 +529,9 @@ code {
} }
#saved-search-ul .tool:hover, #saved-search-ul .tool:hover,
#nets-sidebar .tool:hover, #nets-sidebar .tool:hover,
#sidebar-group-list .tool:hover { #sidebar-group-list .tool:hover,
background: #EEE; #fileas-sidebar .tool:hover {
background: #E7F2F7;
} }
.tool .label { .tool .label {
float: left; float: left;
@ -1023,43 +1024,56 @@ ul.menu-popup .empty {
.menu-profile-list{ .menu-profile-list{
height: auto; height: auto;
overflow: auto; overflow: auto;
padding-top: 3px;
padding-bottom: 3px;
padding-left: 16px;
min-height: 16px; min-height: 16px;
list-style: none; list-style: none;
} }
.menu-profile-list:hover{ .menu-profile-list:hover{
background: #EEE; background: #E7F2F7;
} }
.menu-profile-list-item{ .menu-profile-list-item{
padding-left: 5px; padding-left: 5px;
vertical-align: middle;
} }
.menu-profile-list-item:hover{ .menu-profile-list-item:hover{
text-decoration: none; text-decoration: none;
} }
/*http://prothemedesign.com/circular-icons/*/ /*http://prothemedesign.com/circular-icons/*/
.menu-profile-list.home{ .menu-profile-icon.home{
background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat; background: url("../../../view/theme/diabook/icons/home.png") no-repeat;
float: left;
height: 22px;
width: 22px;
} }
.menu-profile-list.photos{ .menu-profile-icon.photos{
background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat; background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat;
} float: left;
.menu-profile-list.events{ height: 22px;
background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat; width: 22px;}
} .menu-profile-icon.events{
.menu-profile-list.notes{ background: url("../../../view/theme/diabook/icons/events.png") no-repeat;
background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat; float: left;
} height: 22px;
.menu-profile-list.foren{ width: 22px;}
background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat; .menu-profile-icon.notes{
} background: url("../../../view/theme/diabook/icons/notes.png") no-repeat;
.menu-profile-list.com_side{ float: left;
background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat; height: 22px;
} width: 22px;}
.menu-profile-list.pscontacts{ .menu-profile-icon.foren{
background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat;
float: left;
height: 22px;
width: 22px;}
.menu-profile-icon.com_side{
background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat;
float: left;
height: 22px;
width: 22px;}
.menu-profile-icon.pscontacts{
background: url("../../../view/theme/diabook/icons/pscontacts.png") no-repeat; background: url("../../../view/theme/diabook/icons/pscontacts.png") no-repeat;
} float: left;
height: 22px;
width: 22px;}
/* aside */ /* aside */
aside { aside {