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:
commit
1bed4010aa
3 changed files with 21 additions and 1 deletions
13
docblox.dist.xml
Normal file
13
docblox.dist.xml
Normal 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>
|
||||||
|
|
|
@ -675,6 +675,13 @@ nav #nav-directory-link{
|
||||||
margin-left: 0px;
|
margin-left: 0px;
|
||||||
margin-right: 0px;
|
margin-right: 0px;
|
||||||
font-weight: bold;
|
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-help-link .menu-popup,
|
||||||
nav #nav-search-link .menu-popup,
|
nav #nav-search-link .menu-popup,
|
||||||
|
|
Loading…
Reference in a new issue