diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-03 16:49:22 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-03 16:49:22 -0500 |
| commit | 1bed4010aa5dc711be674b41fac97d1448f4e5cd (patch) | |
| tree | 9df2534f2194b23931ffe27b160481c58789b100 | |
| parent | da78d8594f79792f2c144cdb5b76b561ec03b278 (diff) | |
| parent | 952bcc5158eade15d551a523647d861307a31574 (diff) | |
| download | volse-hubzilla-1bed4010aa5dc711be674b41fac97d1448f4e5cd.tar.gz volse-hubzilla-1bed4010aa5dc711be674b41fac97d1448f4e5cd.tar.bz2 volse-hubzilla-1bed4010aa5dc711be674b41fac97d1448f4e5cd.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
Added docblox default configuration file.
fixed apps css
* master:
| -rw-r--r-- | docblox.dist.xml | 13 | ||||
| -rw-r--r-- | view/theme/diabook/nav.tpl | 2 | ||||
| -rw-r--r-- | view/theme/diabook/style.css | 7 |
3 files changed, 21 insertions, 1 deletions
diff --git a/docblox.dist.xml b/docblox.dist.xml new file mode 100644 index 000000000..a2ea8e2cb --- /dev/null +++ b/docblox.dist.xml @@ -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> + diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index 17df8e652..34a37ad2e 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -87,7 +87,7 @@ <li>$ap</li> {{ endfor }} </ul> - </li> + </li> {{ endif }} {{ if $nav.home }} diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index ecd995d5f..d175a74b3 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -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, |