nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'pull'

Browse source
This commit is contained in:
friendica 2011-11-29 01:19:43 -08:00
parent aa73d38845 f6ff4e582f
commit 3bf192ba08
3 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
view/nav.tpl
View file

@ -15,7 +15,7 @@
{{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }} {{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
{{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }} {{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
{{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }} {{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}
</ul> </ul>
</li> </li>
{{ endif }} {{ endif }}
@ -51,6 +51,8 @@
<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a> <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
<ul id="nav-site-menu" class="menu-popup"> <ul id="nav-site-menu" class="menu-popup">
{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}
{{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }} {{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
{{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }} {{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}

15
view/theme/quattro/quattro.less
View file

@ -348,7 +348,13 @@ section {
width: 60px; width: 60px;
.wall-item-photo-wrapper { position: relative; } .wall-item-photo-wrapper { position: relative; }
.wall-item-photo { width: 48px; height: 48px; } .wall-item-photo {
width: 48px; height: 48px;
overflow: hidden;
text-indent: -9999px;
display: block;
background: url(../../../images/icons/48/user.png) no-repeat center center;
}
.wall-item-photo-menu-button { .wall-item-photo-menu-button {
display: none; display: none;
@ -400,7 +406,9 @@ section {
.wall-item-container.comment { .wall-item-container.comment {
/*margin-top: 50px;*/ /*margin-top: 50px;*/
.wall-item-photo { width: 32px; height: 32px; margin-left: 16px;} .wall-item-photo { width: 32px; height: 32px; margin-left: 16px;
background: url(../../../images/icons/22/user.png) no-repeat center center;
}
.wall-item-photo-menu-button { .wall-item-photo-menu-button {
top: 13px !important; top: 13px !important;
left: 10px !important; left: 10px !important;
@ -425,6 +433,9 @@ section {
} }
} }
.wall-item-tags { padding-top: 5px; }
.tag { .tag {
background: url("../../../images/tag_b.png") no-repeat center left; background: url("../../../images/tag_b.png") no-repeat center left;
color: @TagColor; color: @TagColor;

8
view/theme/quattro/style.css
View file

@ -643,6 +643,10 @@ section {
.wall-item-container .wall-item-info .wall-item-photo { .wall-item-container .wall-item-info .wall-item-photo {
width: 48px; width: 48px;
height: 48px; height: 48px;
overflow: hidden;
text-indent: -9999px;
display: block;
background: url(../../../images/icons/48/user.png) no-repeat center center;
} }
.wall-item-container .wall-item-info .wall-item-photo-menu-button { .wall-item-container .wall-item-info .wall-item-photo-menu-button {
display: none; display: none;
@ -722,6 +726,7 @@ section {
width: 32px; width: 32px;
height: 32px; height: 32px;
margin-left: 16px; margin-left: 16px;
background: url(../../../images/icons/22/user.png) no-repeat center center;
} }
.wall-item-container.comment .wall-item-photo-menu-button { .wall-item-container.comment .wall-item-photo-menu-button {
top: 13px !important; top: 13px !important;
@ -750,6 +755,9 @@ section {
color: #2d2d2d; color: #2d2d2d;
border: 1px solid #2d2d2d; border: 1px solid #2d2d2d;
} }
.wall-item-tags {
padding-top: 5px;
}
.tag { .tag {
background: url("../../../images/tag_b.png") no-repeat center left; background: url("../../../images/tag_b.png") no-repeat center left;
color: #ffffff; color: #ffffff;