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

Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 

* remotes/upstream/master:
  Added docblox default configuration file.
  fixed apps css

* master:
This commit is contained in:
Simon L'nu 2012-03-03 16:49:22 -05:00
parent da78d8594f 952bcc5158
commit 1bed4010aa
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docblox.dist.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
<docblox>
<parser>
<target>data/output</target>
</parser>
<transformer>
<target>data/output</target>
</transformer>
<files>
<directory>.</directory>
</files>
</docblox>

2
view/theme/diabook/nav.tpl
View File

@ -87,7 +87,7 @@
<li>$ap</li>
{{ endfor }}
</ul>
</li>
</li>
{{ endif }}
{{ if $nav.home }}

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

@ -675,6 +675,13 @@ nav #nav-directory-link{
margin-left: 0px;
margin-right: 0px;
font-weight: bold;
margin: 3px 15px;
}
nav #nav-apps-link{
margin-left: 0px;
margin-right: 0px;
font-weight: bold;
margin: 3px 15px;
}
nav #nav-help-link .menu-popup,
nav #nav-search-link .menu-popup,